add publicProject and userPermission to Project

packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ProjectController.java

@@ -48,15 +48,14 @@ public ResponseEntity<List<Project>> getProjects(
 		if (projects == null) {
 			return ResponseEntity.noContent().build();
 		}
-
+		RebacUser rebacUser = new RebacUser(currentUserService.getToken().getSubject(), reBACService);
 		// Remove non-active (soft-deleted) projects
-
 		projects = projects
 			.stream()
 			.filter(Project::getActive)
 			.filter(project -> {
 				try {
-					return new RebacUser(currentUserService.getToken().getSubject(), reBACService).canRead(new RebacProject(project.getProjectID(), reBACService));
+					return rebacUser.canRead(new RebacProject(project.getProjectID(), reBACService));
 				} catch (Exception e) {
 					log.error("Error getting user's permissions for project", e);
 					return false;
@@ -68,6 +67,10 @@ public ResponseEntity<List<Project>> getProjects(
 			try {
 				List<AssetType> assetTypes = Arrays.asList(AssetType.datasets, AssetType.models, AssetType.publications);
 
+				RebacProject rebacProject = new RebacProject(project.getProjectID(), reBACService);
+				project.setPublicProject(rebacProject.isPublic());
+				project.setUserPermission(rebacUser.getPermissionFor(rebacProject));
+
 				Assets assets = proxy.getAssets(project.getProjectID(), assetTypes).getBody();
 				Map<String, String> metadata = new HashMap<>();
 				metadata.put("datasets-count", assets.getDatasets() == null ? "0" : String.valueOf(assets.getDatasets().size()));
@@ -90,11 +93,14 @@ public ResponseEntity<List<Project>> getProjects(
 	public ResponseEntity<Project> getProject(
 		@PathVariable("id") final String id
 	) {
-
 		try {
+			RebacUser rebacUser = new RebacUser(currentUserService.getToken().getSubject(), reBACService);
 			RebacProject rebacProject = new RebacProject(id, reBACService);
-			if (new RebacUser(currentUserService.getToken().getSubject(), reBACService).canRead(rebacProject)) {
-				return ResponseEntity.ok(proxy.getProject(id).getBody());
+			if (rebacUser.canRead(rebacProject)) {
+				Project project = proxy.getProject(id).getBody();
+				project.setPublicProject(rebacProject.isPublic());
+				project.setUserPermission(rebacUser.getPermissionFor(rebacProject));
+				return ResponseEntity.ok(project);
 			}
 			return ResponseEntity.notFound().build();
 		} catch (Exception e) {

packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/permissions/GroupsController.java

@@ -43,7 +43,6 @@ public ResponseEntity<PermissionGroup> getGroup(
 	) {
 		try {
 			RebacGroup rebacGroup = new RebacGroup(groupId, reBACService);
-			PermissionGroup permissionGroup = reBACService.getGroup(groupId);
 			if (new RebacUser(currentUserService.getToken().getSubject(), reBACService).canRead(rebacGroup)) {
 				List<RebacPermissionRelationship> relationships = reBACService.getRelationships(rebacGroup.getSchemaObject());
 
@@ -53,9 +52,12 @@ public ResponseEntity<PermissionGroup> getGroup(
 						permissions.addUser(permissionRelationship.getSubjectId(), permissionRelationship.getRelationship());
 					} else if (permissionRelationship.getSubjectType().equals(Schema.Type.GROUP)) {
 						permissions.addGroup(permissionRelationship.getSubjectId(), permissionRelationship.getRelationship());
+					} else if (permissionRelationship.getSubjectType().equals(Schema.Type.PROJECT)) {
+						permissions.addProject(permissionRelationship.getSubjectId(), permissionRelationship.getRelationship());
 					}
 				}
 
+				PermissionGroup permissionGroup = reBACService.getGroup(groupId);
 				return ResponseEntity.ok(permissionGroup);
 			}
 			return ResponseEntity.notFound().build();

packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Project.java

@@ -51,6 +51,12 @@ public class Project implements Serializable {
 	@TSOptional
 	private List<Document> relatedDocuments;
 
+	@TSOptional
+	private Boolean publicProject;
+
+	@TSOptional
+	private String userPermission;
+
 	@Override
 	public String toString() {
 		return "Project: { id: " + this.projectID +

packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/permission/PermissionRelationships.java

@@ -8,6 +8,7 @@
 public class PermissionRelationships {
 	private List<Group> groups = new ArrayList<>();
 	private List<User> users = new ArrayList<>();
+	private List<Project>projects = new ArrayList<>();
 
 	public void addUser(String id, Schema.Relationship relationship) {
 		users.add(new User(id, relationship.toString()));
@@ -17,11 +18,19 @@ public void addGroup(String id, Schema.Relationship relationship) {
 		groups.add(new Group(id, relationship.toString()));
 	}
 
+	public void addProject(String id, Schema.Relationship relationship) {
+		projects.add(new Project(id, relationship.toString()));
+	}
+
 	public List<Group> getGroups() {
 		return groups;
 	}
 
 	public List<User> getUsers() {
 		return users;
 	}
+
+	public List<Project> getProjects() {
+		return projects;
+	}
 }

packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/permission/Project.java

@@ -0,0 +1,20 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.permission;
+
+public class Project {
+	private String id;
+	private String relationship;
+
+	public Project(String id, String relationship) {
+		this.id = id;
+		this.relationship = relationship;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getRelationship() {
+		return relationship;
+	}
+
+}

packages/server/src/main/java/software/uncharted/terarium/hmiserver/utils/rebac/ReBACFunctions.java

@@ -119,18 +119,18 @@ public String removeRelationship(String subjectType, String subjectId, String re
 	}
 
 	public List<RebacPermissionRelationship> getRelationship(SchemaObject resource, Consistency consistency) throws Exception {
-		return getRelationship(resource.type.toString(), resource.id, consistency);
-	}
-
-	public List<RebacPermissionRelationship> getRelationship(String resourceType, String resourceId, Consistency consistency) throws Exception {
-		List<RebacPermissionRelationship> relationships = new ArrayList<>();
 		PermissionService.ReadRelationshipsRequest request = PermissionService.ReadRelationshipsRequest.newBuilder()
 			.setConsistency(consistency)
 			.setRelationshipFilter(
 				RelationshipFilter.newBuilder()
-					.setResourceType(resourceType)
-					.setOptionalResourceId(resourceId))
+					.setResourceType(resource.type.toString())
+					.setOptionalResourceId(resource.id))
 			.build();
+		return getRelationship(request);
+	}
+
+	public List<RebacPermissionRelationship> getRelationship(PermissionService.ReadRelationshipsRequest request) throws Exception {
+		List<RebacPermissionRelationship> relationships = new ArrayList<>();
 
 		Iterator<ReadRelationshipsResponse> iter = permissionsService.readRelationships(request);
 
@@ -143,4 +143,22 @@ public List<RebacPermissionRelationship> getRelationship(String resourceType, St
 		}
 		return relationships;
 	}
+
+	public boolean hasRelationship(SchemaObject who, Schema.Relationship relationship, SchemaObject what, Consistency consistency) throws Exception {
+		PermissionService.ReadRelationshipsRequest request = PermissionService.ReadRelationshipsRequest.newBuilder()
+			.setConsistency(consistency)
+			.setRelationshipFilter(
+				RelationshipFilter.newBuilder()
+					.setResourceType(what.type.toString())
+					.setOptionalResourceId(what.id)
+					.setOptionalRelation(relationship.toString()))
+			.build();
+		List<RebacPermissionRelationship> relationships = getRelationship(request);
+		for (RebacPermissionRelationship permissionRelationship: relationships) {
+			if (Schema.Type.USER.equals(permissionRelationship.getSubjectType()) && who.id.equals(permissionRelationship.getSubjectId())) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

packages/server/src/main/java/software/uncharted/terarium/hmiserver/utils/rebac/ReBACService.java

@@ -54,9 +54,9 @@ public class ReBACService {
 	private final SchemaManager schemaManager = new SchemaManager();
 
 	public static final String PUBLIC_GROUP_NAME = "Public";
-	public static String PUBLIC_GROUP_ID;
+	public String PUBLIC_GROUP_ID;
 	public static final String ASKEM_ADMIN_GROUP_NAME = "ASKEM Admins";
-	public static String ASKEM_ADMIN_GROUP_ID;
+	public String ASKEM_ADMIN_GROUP_ID;
 
 
 	@PostConstruct
@@ -142,7 +142,7 @@ void startup() throws Exception {
 	private String getGroupId(String name) {
 		List<GroupRepresentation> groups = keycloak.realm(REALM_NAME).groups().groups(name, true, 0, Integer.MAX_VALUE, true);
 		for (GroupRepresentation group : groups) {
-			if (group.getName().equals(group.getPath())) {
+			if (group.getPath().equals("/" + name)) {
 				return group.getId();
 			}
 		}
@@ -262,6 +262,12 @@ public boolean canAdministrate(SchemaObject who, SchemaObject what) throws Excep
 		return rebac.checkPermission(who, Schema.Permission.ADMINISTRATE, what, full);
 	}
 
+	public boolean isCreator(SchemaObject who, SchemaObject what) throws Exception {
+		Consistency full = Consistency.newBuilder().setFullyConsistent(true).build();
+		ReBACFunctions rebac = new ReBACFunctions(channel, spiceDbBearerToken);
+		return rebac.hasRelationship(who, Schema.Relationship.CREATOR, what, full);
+	}
+
 	public void createRelationship(SchemaObject who, SchemaObject what, Schema.Relationship relationship) throws Exception, RelationshipAlreadyExistsException {
 		ReBACFunctions rebac = new ReBACFunctions(channel, spiceDbBearerToken);
 		rebac.createRelationship(who, relationship, what);

packages/server/src/main/java/software/uncharted/terarium/hmiserver/utils/rebac/askem/RebacProject.java

@@ -33,4 +33,16 @@ public void removePermissionRelationships(RebacObject who, String relationship)
 		Schema.Relationship relationshipEnum = Schema.Relationship.valueOf(relationship.toUpperCase());
 		reBACService.removeRelationship(who.getSchemaObject(), getSchemaObject(), relationshipEnum);
 	}
+
+	public boolean isPublic() throws Exception {
+		List<RebacPermissionRelationship> relationships = reBACService.getRelationships(getSchemaObject());
+		for (RebacPermissionRelationship relationship : relationships) {
+			if (relationship.getSubjectType().equals(Schema.Type.GROUP) && relationship.getSubjectId().equals(reBACService.PUBLIC_GROUP_ID)) {
+				if (relationship.getRelationship().equals(Schema.Relationship.READER) || relationship.getRelationship().equals(Schema.Relationship.WRITER)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 }

packages/server/src/main/java/software/uncharted/terarium/hmiserver/utils/rebac/askem/RebacUser.java

@@ -39,4 +39,17 @@ public PermissionGroup addGroup(String name) throws Exception, RelationshipAlrea
 		reBACService.createRelationship(getSchemaObject(), new SchemaObject(Schema.Type.GROUP, group.getId()), Schema.Relationship.CREATOR);
 		return group;
 	}
+
+	public String getPermissionFor(RebacObject rebacObject) throws Exception {
+		if (reBACService.isCreator(getSchemaObject(), rebacObject.getSchemaObject())) {
+			return Schema.Relationship.CREATOR.toString();
+		} else if (canAdministrate(rebacObject)) {
+			return Schema.Relationship.ADMIN.toString();
+		} else if (canWrite(rebacObject)) {
+			return Schema.Relationship.WRITER.toString();
+		} else if (canRead(rebacObject)) {
+			return Schema.Relationship.READER.toString();
+		}
+		return "none";
+	}
 }