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 f103c3471dbf5fc032509ed8f8741d22c8d6312d..4e1d2f02fbfb611f550e9682ef5b0dedd7224d66 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java +++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java @@ -25,7 +25,6 @@ package de.ozgcloud.operator.keycloak.user; import java.util.Arrays; import java.util.Optional; -import java.util.logging.Level; import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.Keycloak; @@ -36,16 +35,11 @@ import org.keycloak.representations.idm.UserRepresentation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - import de.ozgcloud.operator.keycloak.KeycloakException; import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService; import de.ozgcloud.operator.keycloak.KeycloakResultParser; -import lombok.extern.java.Log; @Component -@Log class KeycloakUserRemoteService { @Autowired @@ -76,12 +70,6 @@ class KeycloakUserRemoteService { public void updateUser(UserRepresentation user, String namespace) { var realmResource = getRealm(namespace); - try { - log.info("Updating user " + new ObjectMapper().writeValueAsString(user)); - } catch (JsonProcessingException e) { - // TODO Auto-generated catch block - log.log(Level.WARNING, "", e); - } realmResource.users().get(user.getId()).update(user); addClientRoles(user.getId(), realmResource, namespace, user); 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 1de912a8c4c6ded8120fa512f554c359c3ebdff1..e1db8b21157e6a7252b493011127dd603819afed 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java +++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java @@ -29,10 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import lombok.extern.java.Log; - @Component -@Log class KeycloakUserService { @Autowired @@ -48,13 +45,9 @@ class KeycloakUserService { if (userHasNoPassword(userSpec, namespace)) { var secret = userSecretService.getOrCreateClusterSecret(userSpec, namespace); - log.info("Setting generated password " + userSecretService.getPasswordFromSecret(secret) + " for user " - + userSpec.getKeycloakUser().getUsername()); userSpec.getKeycloakUser().setPassword(userSecretService.getPasswordFromSecret(secret)); } - log.info("Userpw2 " + userSpec.getKeycloakUser().getPassword()); - remoteService.getUserByName(userSpec.getKeycloakUser().getUsername(), namespace) .ifPresentOrElse(existingUser -> remoteService.updateUser(userMapper.update(existingUser, userSpec), namespace), () -> remoteService.createUser(userMapper.map(userSpec), namespace));