keycloak-uncached

KEYCLOAK-8783 also checked admin roles when realm admin client …

11/13/2018 4:36:18 AM

is specified

Gideon Caranzo

Commit: 39bf08e

Tree: bb518ce

Parents: 9f88abb

Changes

services/src/main/java/org/keycloak/services/managers/RealmManager.java 2(+1 -1)

Details

services/src/main/java/org/keycloak/services/managers/RealmManager.java 2(+1 -1)

diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
index 798cd9a..e866ba6 100755
--- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
@@ -531,7 +531,7 @@ public class RealmManager {
             setupMasterAdminManagement(realm);
         }
 
-        if (rep.getRoles() != null) {
+        if (rep.getRoles() != null || hasRealmAdminManagementClient(rep)) {
         	// Assert all admin roles are available once import took place. This is needed due to import from previous version where JSON file may not contain all admin roles
         	checkMasterAdminManagementRoles(realm);
         	checkRealmAdminManagementRoles(realm);