diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java index 82e2ebe07788b96acd5123ca5e48485f068c1daa..eca8fbe736f702eb1a8c5952c3d6c3d88f84f7d4 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java @@ -72,8 +72,13 @@ class KeycloakRealmService { Optional.of(realm) .map(mapper::map) .map(realmRepresentation -> addRealmName(realmRepresentation, realmName)) + // TODO dieser Filter kann vermutlich gelöscht werden, die Prüfung auf + // realmExists passiert bereits vorher .filter(realmRepresentation -> !keycloakGenericRemoteService.realmExists(realmName)) - .ifPresent(remoteService::createRealm); + .ifPresent(realmRepresentation -> { + remoteService.createRealm(realmRepresentation); + addUserProfileAttributes(realmRepresentation); + }); } void addOrUpdateRealmRoles(OzgCloudKeycloakRealmSpec spec, String realm) { diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java index 8d413c5891726be28f7b4aefb5fa98e2108ac321..49184fb5a7f6d74ba0100e9cbf6dbed74e56af87 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java @@ -95,13 +95,13 @@ class KeycloakRealmServiceTest { verify(keycloakGenericRemoteService).getRealmRepresentation(REALM_NAME); } + @Test void shouldCallAddOrUpdateRealmRoles() { service.createOrUpdateRealm(REALM, REALM_NAME); verify(service).addOrUpdateRealmRoles(REALM, REALM_NAME); } - } @DisplayName("Update Realm") @@ -129,7 +129,6 @@ class KeycloakRealmServiceTest { verify(mapper).update(realmRepresentation, REALM); } - @Test void createRealmShouldCallAddAttributes() { service.updateRealm(realmRepresentation, REALM);