From f37e4498e85647f5294eb2cd4b744b80edcff66b Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Tue, 6 Dec 2022 22:10:08 +0100 Subject: [PATCH] trials, but not yet finished --- .classpath | 16 +++--- .settings/org.eclipse.buildship.core.prefs | 11 ---- .settings/org.eclipse.wst.common.component | 4 +- .../registration/KeycloakRepository.java | 50 ++++++++----------- .../registration/RegistrationService.java | 8 +-- .../registration/TestKeycloakRepository.java | 2 + 6 files changed, 38 insertions(+), 53 deletions(-) diff --git a/.classpath b/.classpath index 12704c5..c5c4c5b 100644 --- a/.classpath +++ b/.classpath @@ -6,24 +6,26 @@ - + + + + + + + - - - - - + - + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index e479558..e889521 100644 --- a/.settings/org.eclipse.buildship.core.prefs +++ b/.settings/org.eclipse.buildship.core.prefs @@ -1,13 +1,2 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 -gradle.user.home= -java.home= -jvm.arguments= -offline.mode=false -override.workspace.settings=false -show.console.view=false -show.executions.view=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 116cc89..31a62d0 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ - + - + diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java b/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java index 5c1a638..694fb23 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java +++ b/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java @@ -17,7 +17,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Repository; - /** * * @author henkej @@ -56,50 +55,43 @@ public class KeycloakRepository { /** * register the login in keycloak * - * @param login the username + * @param login the username * @param password the password - * @param email the email + * @param email the email * @return true or false */ public boolean register(String login, String password, String email) { CredentialRepresentation passwordCredentials = new CredentialRepresentation(); - passwordCredentials.setTemporary(false); - passwordCredentials.setType(CredentialRepresentation.PASSWORD); - passwordCredentials.setValue(password); + passwordCredentials.setTemporary(false); + passwordCredentials.setType(CredentialRepresentation.PASSWORD); + passwordCredentials.setValue(password); - UserRepresentation user = new UserRepresentation(); - user.setUsername(login); - user.setEmail(email); - user.setCredentials(Collections.singletonList(passwordCredentials)); - user.setEnabled(true); + UserRepresentation user = new UserRepresentation(); + user.setUsername(login); + user.setEmail(email); + user.setCredentials(Collections.singletonList(passwordCredentials)); + user.setEnabled(true); - UsersResource instance = getInstance(); - Response response = instance.create(user); - boolean result = Status.OK.equals(response.getStatusInfo()); - sendVerificationLink(login); - return result; + UsersResource instance = getInstance(); + Response response = instance.create(user); + boolean result = Status.OK.equals(response.getStatusInfo()); + sendVerificationLink(login); + return result; } public Client getClient() { - return new ResteasyClientBuilderImpl() - .connectionPoolSize(10) - .build(); + return new ResteasyClientBuilderImpl().connectionPoolSize(10).build(); } public KeycloakBuilder getKeycloak() { - return KeycloakBuilder.builder() - .serverUrl(keycloakUrl) - .realm(keycloakRealm) - .grantType(OAuth2Constants.PASSWORD) - .username(keycloakAdminName) - .password(keycloakAdminPassword) - .clientId(keycloakClientId) - .resteasyClient(getClient()); + return KeycloakBuilder.builder().serverUrl(keycloakUrl).realm(keycloakRealm).grantType(OAuth2Constants.PASSWORD) + .username(keycloakAdminName).password(keycloakAdminPassword).clientId(keycloakClientId) + .resteasyClient(getClient()); } public UsersResource getInstance() { - return getKeycloak().build().realm(keycloakRealm).users(); - } + return getKeycloak().build().realm(keycloakRealm).users(); + } /** * send a verification link for newly registered users diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationService.java b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationService.java index d098465..f155f24 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationService.java +++ b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationService.java @@ -13,7 +13,7 @@ public class RegistrationService { @Autowired private RegistrationGateway gateway; - + @Autowired private KeycloakRepository keycloak; @@ -29,14 +29,14 @@ public class RegistrationService { /** * register the person for a camp; if registerInKeycloak, do so also - * + * * @param bean the bean - * @return true if successful, false otherwise + * @return true if successful, false otherwise */ public Boolean register(RegistrationBean bean) { Boolean result = gateway.register(bean); if (result && bean.getRegisterInKeycloak()) { - keycloak.register(bean.getLogin(), bean.getPassword()); + keycloak.register(bean.getLogin(), bean.getPassword(), bean.getEmail()); } return result; } diff --git a/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java b/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java index 00d6514..621b9bf 100644 --- a/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java +++ b/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java @@ -5,6 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; /** *