Pass username from principal to PrivateCollectionsProvider, resolve #231

clarin-eric · Nov 1, 2024 · d51fd27 · d51fd27
1 parent 610d618
commit d51fd27
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/...java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java b/...java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java
@@ -13,7 +13,7 @@ public class BrowsePrivateCollectionsPage extends BasePage {
 
     public BrowsePrivateCollectionsPage() {
         final BrowseEditableCollectionsPanel pnl =
-                new BrowseEditableCollectionsPanel("collections", new PrivateCollectionsProvider(getSession()), getPageReference());
+                new BrowseEditableCollectionsPanel("collections", new PrivateCollectionsProvider(getUser()), getPageReference());
         pnl.setOutputMarkupId(true);
         add(pnl);
     }

diff --git a/...a/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/submission/MergeCollectionsPage.java b/...a/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/submission/MergeCollectionsPage.java
@@ -103,7 +103,7 @@ public MergeCollectionsPage(PageParameters params) throws VirtualCollectionRegis
             throw new RestartResponseException(ErrorPage.class);
         }
 
-        this.provider = new PrivateCollectionsProvider(getSession());
+        this.provider = new PrivateCollectionsProvider(getUser());
 
         addLabel(this, "heading_submitted_collection");
         addLabel(this, "heading_actions");

diff --git a/...n/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PrivateCollectionsProvider.java b/...n/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PrivateCollectionsProvider.java
@@ -1,8 +1,8 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.table;
 
 import eu.clarin.cmdi.virtualcollectionregistry.QueryOptions;
-import eu.clarin.cmdi.virtualcollectionregistry.gui.ApplicationSession;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+import java.security.Principal;
 
 /**
  *
@@ -11,18 +11,21 @@
 @SuppressWarnings("serial")
 public class PrivateCollectionsProvider extends CollectionsProvider {
 
-    private final ApplicationSession session;
+    private final String authenticatedUsername;
 
-    public PrivateCollectionsProvider(final ApplicationSession session) {
-        this.session = session;
+    public PrivateCollectionsProvider(final Principal authenticatedPrincipal) {
+        this(authenticatedPrincipal.getName());
+    }
+
+    public PrivateCollectionsProvider(final String authenticatedUsername) {
+        this.authenticatedUsername = authenticatedUsername;
     }
 
     @Override
     protected void addSpaceFilter(QueryOptions.Filter filter) {
-        //ApplicationSession session = ApplicationSession.get();
         filter.add(QueryOptions.Property.VC_OWNER,
                 QueryOptions.Relation.EQ,
-                session.getUser());
+                authenticatedUsername);
     }
 
     protected void addTypeFilter(QueryOptions.Filter filter, VirtualCollection.Type type) {