WIP for policies

Author: oharsta

server/src/main/java/access/api/InviteController.java

@@ -4,9 +4,7 @@
 import access.exception.UserRestrictionException;
 import access.invite.InviteClient;
 import access.manage.Manage;
-import access.manage.ManageData;
 import access.model.User;
-import access.repository.OrganizationRepository;
 import access.repository.UserRepository;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -73,7 +71,7 @@ public ResponseEntity<List<Map<String, Object>>> rolesPerOrganizationInviteAppli
             if (StringUtils.hasText(idpInstitutionGUID)) {
                 organizationGUID = idpInstitutionGUID;
             } else {
-                LOG.warn("Not fetching invite roles as there is no institution GUID for IdP: "+user.getAuthenticatingAuthority());
+                LOG.warn("Not fetching invite roles as there is no institution GUID for IdP: " + user.getAuthenticatingAuthority());
                 return ResponseEntity.ok(List.of());
             }
         }
@@ -85,4 +83,16 @@ public ResponseEntity<List<Map<String, Object>>> rolesPerOrganizationInviteAppli
         List<Map<String, Object>> inviteRoles = this.inviteClient.rolesPerOrganizationApplicationId(organizationGUID, applicationManageId);
         return ResponseEntity.ok(inviteRoles);
     }
+
+
+    @GetMapping("/roles-summary")
+    public ResponseEntity<List<Map<String, Object>>> rolesSummary(User user) {
+        LOG.debug("/rolesSummary called by: " + user.getEmail());
+
+        confirmInstitutionAdmin(user);
+
+        List<Map<String, Object>> inviteRoles = this.inviteClient.rolesSummary();
+        return ResponseEntity.ok(inviteRoles);
+    }
+
 }

server/src/main/java/access/api/UserAccessRights.java

@@ -54,11 +54,8 @@ default void confirmApplicationWriteAccess(User user, Application application, A
                     String.format("User %s is not allowed to access application %s",
                             user.getEmail(), application.getName()));
         }
-
-
     }
 
-
     default void confirmApplicationDeleteAccess(User user, Application application) {
         if (user.isSuperUser()) {
             return;

server/src/main/java/access/invite/InviteClient.java

@@ -36,4 +36,12 @@ public List<Map<String, Object>> rolesPerOrganizationApplicationId(String organi
                 organizationGUID,
                 applicationManageId);
     }
+
+    public List<Map<String, Object>> rolesSummary() {
+        if (!enabled) {
+            return List.of();
+        }
+        return restTemplate.getForObject(
+                url + "/api/external/v1/internal/invite/roles-summary", List.class);
+    }
 }

server/src/test/java/access/api/InviteControllerTest.java

@@ -207,4 +207,30 @@ void rolesPerOrganizationInviteApplicationServerSideRequestForgery() {
                 .statusCode(HttpStatus.BAD_REQUEST.value());
     }
 
+    @SneakyThrows
+    @Test
+    void rolesSummary() {
+        List<Map<String, Object>> rolesMock = objectMapper.readValue(new ClassPathResource("/invite/roles_summary.json").getInputStream(),
+                new TypeReference<>() {
+                });
+        stubFor(get(urlPathMatching("/api/external/v1/internal/invite/roles-summary"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(objectMapper.writeValueAsString(rolesMock))));
+
+        AccessCookieFilter accessCookieFilter = openIDConnectFlow("/api/v1/users/me", SUPER_SUB);
+
+        List<Map<String, String>> roles = given()
+                .when()
+                .filter(accessCookieFilter.cookieFilter())
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .get("/api/v1/invite/roles-summary")
+                .as(new TypeRef<>() {
+                });
+
+        assertEquals(2, roles.size());
+    }
+
+
 }

server/src/test/resources/invite/roles_summary.json

@@ -0,0 +1,12 @@
+[
+  {
+    "name": "Test Role Profile",
+    "description": "Test Role Profile",
+    "urn": "urn:mace:surf.nl:invite.test2.surfconext.nl:f5b477df-6af9-46f8-b0fa-8e7a8695afb0:test_role_profile"
+  },
+  {
+    "name": "Test Role Profile II ",
+    "description": "Test Role Profile Description",
+    "urn": "urn:mace:surf.nl:invite.test2.surfconext.nl:f5b477df-6af9-46f8-b0fa-8e7a8695afb0:test_role2_profile"
+  }
+]