From 776553f6d2975fc2c5de0b9315db66bfe0c3c7a0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 17 Sep 2024 12:58:17 +0200
Subject: [PATCH] OZG-6472 readd accidently removed code while merging
---
.../operator/keycloak/realm/KeycloakRealmService.java | 7 ++++++-
.../operator/keycloak/realm/KeycloakRealmServiceTest.java | 3 +--
2 files changed, 7 insertions(+), 3 deletions(-)
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 82e2ebe..eca8fbe 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 8d413c5..49184fb 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);
--
GitLab