From 646a61b971f185fc4c927e15f6a0463b436c4704 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 21 Jul 2023 08:57:03 +0200
Subject: [PATCH] OZG-3961 OZG-4082 always create an secret and set password
temporary(PoC)
---
.../keycloak/user/KeycloakUserService.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java
index a66d409..4493b8c 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
import lombok.extern.java.Log;
@@ -43,13 +42,17 @@ class KeycloakUserService {
private KeycloakUserMapper userMapper;
public void createOrUpdateUser(OzgKeycloakUserSpec userSpec, String namespace) {
- if (!StringUtils.hasLength(userSpec.getKeycloakUser().getPassword())) {
- log.log(Level.INFO, "User has no password, create secret...");
- var password = remoteService.createSecret(userSpec, namespace);
- log.log(Level.INFO, "set password: " + password + " to user...");
- userSpec.getKeycloakUser().setPassword(password);
- }
+ // PoC
+// if (!StringUtils.hasLength(userSpec.getKeycloakUser().getPassword())) {
+ log.log(Level.INFO, "createOrUpdateUser createSecret for credentials...");
+ log.log(Level.INFO, "Old password: " + userSpec.getKeycloakUser().getPassword());
+// log.log(Level.INFO, "User has no password, create secret...");
+ var password = remoteService.createSecret(userSpec, namespace);
+ log.log(Level.INFO, "New password: " + password);
+ userSpec.getKeycloakUser().setPassword(password);
+// }
log.log(Level.INFO, "proceed");
+ //
remoteService.getUserByName(userSpec.getKeycloakUser().getUsername(), namespace)
.ifPresentOrElse(existingUser -> remoteService.updateUser(userMapper.update(existingUser, userSpec), namespace),
() -> remoteService.createUser(userMapper.map(userSpec), namespace));
--
GitLab