diff --git a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java b/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java index 8a92e32ac943a5d05850ff5d0d38a5358c7a0e96..c20d68429f5bfe58bf89bd3037ee2da7b0bf73ce 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java +++ b/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java @@ -24,6 +24,7 @@ package de.ozgcloud.operator.keycloak; import java.util.Base64; +import java.util.logging.Level; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; @@ -35,7 +36,9 @@ import org.springframework.context.annotation.Scope; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.Resource; +import lombok.extern.java.Log; +@Log @Configuration public class KeycloakClient { @@ -73,6 +76,9 @@ public class KeycloakClient { } String decodeBase64(String base64String) { - return new String(Base64.getDecoder().decode(base64String)); + log.log(Level.INFO, "base64String to decode: " + base64String); + var decoded = Base64.getDecoder().decode(base64String); + log.log(Level.INFO, "decoded string: " + decoded); + return new String(decoded); } } diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java index edb1b79da3c553ed42461a5f16751e7cbe571c1b..48966b25505d6ec6da13f89161976767d1f9654a 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java +++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java @@ -143,20 +143,25 @@ class KeycloakUserRemoteService { return kubernetesClient.secrets().inNamespace(namespace).withName(secretName); } - private Secret buildSecret(String name) { + Secret buildSecret(String name) { var metadata = new ObjectMeta(); metadata.setName(name); metadata.setGenerateName(name); metadata.setNamespace("keycloak"); - metadata.setAdditionalProperty("passwordMeta", Base64.getEncoder().encodeToString("Y9nk43yrQ_zzIPpfFU-I".getBytes())); + return new SecretBuilder() .withType("Opaque") .withMetadata(metadata) - .addToData(SECRET_PASSWORD_FIELD, Base64.getEncoder().encodeToString("Y9nk43yrQ_zzIPpfFU-I".getBytes())) - .addToData(SECRET_NAME_FIELD, name) +// .addToStringData(SECRET_PASSWORD_FIELD, encodeString("Y9nk43yrQ_zzIPpfFU-I")) + .addToStringData(SECRET_PASSWORD_FIELD, "123Test") + .addToStringData(SECRET_NAME_FIELD, name) .build(); } + public String encodeString(String str) { + return new String(Base64.getEncoder().encodeToString(str.getBytes())); + } + private String getPassword(Resource<Secret> secret) { return secret.get().getData().get(SECRET_PASSWORD_FIELD); }