Skip to content
Snippets Groups Projects
Commit 646a61b9 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3961 OZG-4082 always create an secret and set password temporary(PoC)

parent f9f81fde
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,6 @@ import java.util.logging.Level; ...@@ -28,7 +28,6 @@ import java.util.logging.Level;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import lombok.extern.java.Log; import lombok.extern.java.Log;
...@@ -43,13 +42,17 @@ class KeycloakUserService { ...@@ -43,13 +42,17 @@ class KeycloakUserService {
private KeycloakUserMapper userMapper; private KeycloakUserMapper userMapper;
public void createOrUpdateUser(OzgKeycloakUserSpec userSpec, String namespace) { public void createOrUpdateUser(OzgKeycloakUserSpec userSpec, String namespace) {
if (!StringUtils.hasLength(userSpec.getKeycloakUser().getPassword())) { // PoC
log.log(Level.INFO, "User has no password, create secret..."); // 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); var password = remoteService.createSecret(userSpec, namespace);
log.log(Level.INFO, "set password: " + password + " to user..."); log.log(Level.INFO, "New password: " + password);
userSpec.getKeycloakUser().setPassword(password); userSpec.getKeycloakUser().setPassword(password);
} // }
log.log(Level.INFO, "proceed"); log.log(Level.INFO, "proceed");
//
remoteService.getUserByName(userSpec.getKeycloakUser().getUsername(), namespace) remoteService.getUserByName(userSpec.getKeycloakUser().getUsername(), namespace)
.ifPresentOrElse(existingUser -> remoteService.updateUser(userMapper.update(existingUser, userSpec), namespace), .ifPresentOrElse(existingUser -> remoteService.updateUser(userMapper.update(existingUser, userSpec), namespace),
() -> remoteService.createUser(userMapper.map(userSpec), namespace)); () -> remoteService.createUser(userMapper.map(userSpec), namespace));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment