Fixes #286

OpenConext · Aug 23, 2024 · 2bef72f · 2bef72f
1 parent a285a25
commit 2bef72f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/server/src/main/java/access/profile/ProfileController.java b/server/src/main/java/access/profile/ProfileController.java
@@ -48,7 +48,7 @@ public ResponseEntity<List<UserRoleProfile>> roles(@RequestParam("collabPersonId
         Optional<User> optionalUser = userRepository.findBySubIgnoreCase(collabPersonId);
         Set<UserRole> userRoles = optionalUser.map(User::getUserRoles).orElse(Collections.emptySet());
         List<Role> roles = userRoles.stream()
-                .filter(userRole -> userRole.getAuthority().equals(Authority.GUEST))
+                .filter(userRole -> userRole.getAuthority().equals(Authority.GUEST) || userRole.isGuestRoleIncluded())
                 .map(UserRole::getRole).toList();
         return ResponseEntity.ok(
                 manage.addManageMetaData(roles).stream().

diff --git a/server/src/test/java/access/profile/ProfileControllerTest.java b/server/src/test/java/access/profile/ProfileControllerTest.java
@@ -45,6 +45,22 @@ void roles() {
     }
 
     @Test
+    void rolesGuestRoleIncluded() {
+        stubForManagerProvidersByIdIn(EntityType.SAML20_SP, List.of("1"));
+
+        List<UserRoleProfile> roles = given()
+                .when()
+                .auth().preemptive().basic("profile", "secret")
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .queryParam("collabPersonId", MANAGE_SUB)
+                .get("/api/profile")
+                .as(new TypeRef<>() {
+                });
+        assertEquals(1, roles.size());
+    }
+
+        @Test
     void rolesNotExistentUser() {
         List<UserRoleProfile> roles = given()
                 .when()