user fixed

CeON · Jan 8, 2025 · 94993b5 · 94993b5
1 parent b15e199
commit 94993b5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 22 deletions.
diff --git a/...ersistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java b/...ersistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.persistence.user;
 
-import edu.harvard.iq.dataverse.persistence.DvObject;
 import edu.harvard.iq.dataverse.persistence.JpaEntity;
 import edu.harvard.iq.dataverse.persistence.config.LocaleConverter;
 import edu.harvard.iq.dataverse.persistence.config.ValidateEmail;
@@ -195,16 +194,6 @@ public List<AcceptedConsent> getAcceptedConsents() {
     public boolean isSuperuser() {
         return superuser;
     }
-
-    @Override
-    public boolean isAnonymized() {
-        return false;
-    }
-
-    @Override
-    public boolean isAllowedToView(final DvObject object) {
-        return object.getReleaseUser().equals(this);
-    }
 
     public AuthenticatedUserLookup getAuthenticatedUserLookup() {
         return authenticatedUserLookup;

diff --git a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/GuestUser.java b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/GuestUser.java
@@ -36,11 +36,6 @@ public boolean isAuthenticated() {
     public boolean isSuperuser() {
         return false;
     }
-
-    @Override
-    public boolean isAnonymized() {
-        return false;
-    }
 
     @Override
     public boolean equals(Object o) {

diff --git a/...e-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/PrivateUrlUser.java b/...e-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/PrivateUrlUser.java
@@ -59,8 +59,6 @@ public boolean isSuperuser() {
     public String getIdentifier() {
         return PREFIX + this.datasetId;
     }
-
-    @Override
     public boolean isAnonymized() {
         return this.anonymized;
     }

diff --git a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/User.java b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/User.java
@@ -11,7 +11,5 @@ public interface User extends RoleAssignee, Serializable {
 
     boolean isAuthenticated();
 
-    boolean isSuperuser();
-
-    boolean isAnonymized();  
+    boolean isSuperuser(); 
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
@@ -97,7 +97,12 @@ public boolean isViewedFromPrivateUrl(final DvObject dataset) {
     }
 
     public boolean isViewedFromAnonymizedPrivateUrl(final DvObject dataset) {
-        return getUser().isAnonymized() && isViewedFromPrivateUrl(dataset);
+        if(getUser() instanceof PrivateUrlUser) {
+            final PrivateUrlUser user = (PrivateUrlUser)getUser();
+            return user.isAnonymized() && user.isAllowedToView(dataset);
+        } else {
+            return false;
+        }
     }