Changes the Datastructure to make compatible

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>
eclipse-basyx · Oct 24, 2024 · d61663f · d61663f
1 parent b7fdb62
commit d61663f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.../src/main/java/org/eclipse/digitaltwin/basyx/authorization/rbac/KeycloakRoleProvider.java b/.../src/main/java/org/eclipse/digitaltwin/basyx/authorization/rbac/KeycloakRoleProvider.java
@@ -69,7 +69,7 @@ public List<String> getRoles() {
 		validateJwt(jwt);
 
 		Map<String, Collection<String>> realmAccess = new HashMap<>();
-		Map<String, Collection<String>> resourceAccess = new HashMap<>();
+		Map<String, Map<String, Collection<String>>> resourceAccess = new HashMap<>();
 
 		if (jwt.hasClaim(CLAIM_REALM_ACCESS))
 			realmAccess = jwt.getClaim(CLAIM_REALM_ACCESS);
@@ -80,7 +80,7 @@ public List<String> getRoles() {
 		return extractRolesFromClaims(realmAccess, resourceAccess);
 	}
 
-	private List<String> extractRolesFromClaims(Map<String, Collection<String>> realmAccess, Map<String, Collection<String>> resourceAccess) {
+	private List<String> extractRolesFromClaims(Map<String, Collection<String>> realmAccess, Map<String, Map<String, Collection<String>>> resourceAccess) {
 		if (realmAccess.isEmpty() && resourceAccess.isEmpty())
 			return new ArrayList<>();
 
@@ -91,8 +91,9 @@ private List<String> extractRolesFromClaims(Map<String, Collection<String>> real
         if (realmRoles != null && !realmRoles.isEmpty())
             roles.addAll(realmRoles);
 
-        for (Map.Entry<String, Collection<String>> entry : resourceAccess.entrySet()) {
-            Collection<String> clientRoles = entry.getValue();
+        for (Map.Entry<String, Map<String, Collection<String>>> entry : resourceAccess.entrySet()) {
+            Map<String, Collection<String>> clientRolesMap = entry.getValue();
+            Collection<String> clientRoles = clientRolesMap.get(CLAIM_ROLES); 
 
             if (clientRoles != null)
                 roles.addAll(clientRoles);