wip

keeps · May 6, 2024 · 5aa2dbc · 5aa2dbc
1 parent 0de3f7f
commit 5aa2dbc
Show file tree

Hide file tree

Showing 20 changed files with 850 additions and 427 deletions.
diff --git a/roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/user/Group.java b/roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/user/Group.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import org.roda.core.data.common.RodaConstants;
 
@@ -31,6 +32,8 @@ public class Group extends RodaPrincipal {
 
   private static final long serialVersionUID = -4051946961307715630L;
 
+  private String type = "Group";
+
   /** Users that belong to this group. */
   private Set<String> users = new HashSet<>();
 
@@ -41,6 +44,14 @@ public Group() {
     super();
   }
 
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
   /**
    * Constructs a new Group with the given name.
    *

diff --git a/roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/user/User.java b/roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/user/User.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import org.roda.core.data.common.RodaConstants;
 
@@ -37,6 +38,7 @@ public class User extends RodaPrincipal {
   /** Groups this user belongs to. */
   private Set<String> groups = new HashSet<>();
 
+  private String type = "User";
   /** Email address. */
   private String email;
   /** Is a guest user? */
@@ -93,10 +95,18 @@ public User(final String id, final String name, final String email, final boolea
     this(id, name, email, guest, ipAddress, allRoles, directRoles, groups, null, null, null, null);
   }
 
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
   public User(final String id, final String name, final String email, final boolean guest, final String ipAddress,
-    final Set<String> allRoles, final Set<String> directRoles, final Set<String> groups,
-    final String resetPasswordToken, final String resetPasswordTokenExpirationDate, final String emailConfirmationToken,
-    final String emailConfirmationTokenExpirationDate) {
+              final Set<String> allRoles, final Set<String> directRoles, final Set<String> groups,
+              final String resetPasswordToken, final String resetPasswordTokenExpirationDate, final String emailConfirmationToken,
+              final String emailConfirmationTokenExpirationDate) {
     this(id, name, name, true, allRoles, directRoles, groups, email, guest, ipAddress, null, resetPasswordToken,
       resetPasswordTokenExpirationDate, emailConfirmationToken, emailConfirmationTokenExpirationDate);
   }

diff --git a/...-common/roda-common-data/src/main/java/org/roda/core/data/v2/user/api/v2/UserUpdater.java b/...-common/roda-common-data/src/main/java/org/roda/core/data/v2/user/api/v2/UserUpdater.java
@@ -0,0 +1,7 @@
+package org.roda.core.data.v2.user.api.v2;
+
+/**
+ * @author António Lindo <alindo@keep.pt>
+ */
+public class UserUpdater {
+}
diff --git a/roda-core/roda-core/src/main/resources/config/roda-roles.properties b/roda-core/roda-core/src/main/resources/config/roda-roles.properties
@@ -426,4 +426,10 @@ core.roles.org.roda.wui.api.v2.JobsResource.getJobReport(IndexedReport) = job.ma
 core.roles.org.roda.wui.api.v2.JobsResource.getJobReport = job.manage
 core.roles.org.roda.wui.api.v2.JobReportResource.findByUuid(TransferredResource) = job.read
 core.roles.org.roda.wui.api.v2.JobsResource.retrieveJobAttachment = job.read
-core.roles.org.roda.wui.api.v2.services.IndexService.find(RODAMember) = member.read
+core.roles.org.roda.wui.api.v2.services.IndexService.find(RODAMember) = member.read
+core.roles.org.roda.wui.api.v2.controller.MembersController.getUser = member.read
+core.roles.org.roda.wui.api.v2.controller.MembersController.getGroup = member.read
+core.roles.org.roda.wui.api.v2.controller.MembersController.deleteMultipleMembers = member.manage
+core.roles.org.roda.wui.api.v2.controller.MembersController.createGroup = member.manage
+core.roles.org.roda.wui.api.v2.controller.MembersController.updateGroup = member.manage
+core.roles.org.roda.wui.api.v2.controller.MembersController.createUser = member.manage