Fixed tests

AAFC-BICoE · Feb 14, 2025 · 4c8e322 · 4c8e322
1 parent 3d3c207
commit 4c8e322
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/dina-base-api/src/main/java/ca/gc/aafc/dina/security/KeycloakClaimParser.java b/dina-base-api/src/main/java/ca/gc/aafc/dina/security/KeycloakClaimParser.java
@@ -22,6 +22,12 @@ public final class KeycloakClaimParser {
   private KeycloakClaimParser() {
   }
 
+  /**
+   * Parses a set of roles from Keycloak.
+   * If the role is admin-based, it is added to adminRoles. Otherwise, the role is ignored.
+   * @param roles
+   * @return
+   */
   public static Set<DinaRole> parseAdminRoles(Set<String> roles) {
     if (CollectionUtils.isEmpty(roles)) {
       return Collections.emptySet();

diff --git a/dina-base-api/src/test/java/ca/gc/aafc/dina/security/auth/DinaAdminOnlyAuthTest.java b/dina-base-api/src/test/java/ca/gc/aafc/dina/security/auth/DinaAdminOnlyAuthTest.java
@@ -82,7 +82,7 @@ public void create_WhenNotAdmin_AccessDenied() {
   }
 
   @Test
-  @WithMockKeycloakUser(groupRole = {"CNC:DINA_ADMIN"})
+  @WithMockKeycloakUser(adminRole = {"DINA_ADMIN"})
   void update_WhenAdmin_AccessAccepted() {
     assertDoesNotThrow(() -> testRepo.save(ItemDto.builder().uuid(persisted.getUuid()).build()));
   }
@@ -95,7 +95,7 @@ public void update_WhenNotAdmin_AccessDenied() {
   }
 
   @Test
-  @WithMockKeycloakUser(groupRole = {"CNC:DINA_ADMIN"})
+  @WithMockKeycloakUser(adminRole = {"DINA_ADMIN"})
   public void delete_WhenAdmin_AccessAccepted() {
     assertDoesNotThrow(() -> testRepo.delete(persisted.getUuid()));
   }