Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

https://gitlab.com/jottyfan/camporganizer2/-/issues/26

Browse Source
This commit is contained in:
Jottyfan 2022-12-10 21:10:43 +01:00
parent 521eaa583d
commit b3cf057c05
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java
View File

@ -1,6 +1,9 @@
package de.jottyfan.camporganizer.module.registration; package de.jottyfan.camporganizer.module.registration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
@ -11,6 +14,7 @@ import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;
import org.keycloak.OAuth2Constants; import org.keycloak.OAuth2Constants;
import org.keycloak.admin.client.KeycloakBuilder; import org.keycloak.admin.client.KeycloakBuilder;
import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.admin.client.resource.UsersResource;
import org.keycloak.models.UserModel;
import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserRepresentation;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -91,6 +95,7 @@ public class KeycloakRepository {
user.setLastName(surname); user.setLastName(surname);
user.setEmail(email); user.setEmail(email);
user.setCredentials(Collections.singletonList(passwordCredentials)); user.setCredentials(Collections.singletonList(passwordCredentials));
user.setRequiredActions(Arrays.asList(UserModel.RequiredAction.VERIFY_EMAIL.toString()));
user.setEnabled(true); user.setEnabled(true);
return user; return user;
@ -144,14 +149,4 @@ public class KeycloakRepository {
return getKeycloak(url, realm, admin, password, clientId).build().realm(realm).users(); return getKeycloak(url, realm, admin, password, clientId).build().realm(realm).users();
} }
/**
* send a verification link for newly registered users
*
* @param userId the ID of the user
*/
public void sendVerificationLink(String userId) {
getUsersResource(keycloakUrl, keycloakRealm, keycloakAdminName, keycloakAdminPassword, keycloakClientId).get(userId)
.sendVerifyEmail();
}
} }

2
src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationBean.java
View File

@ -37,7 +37,7 @@ public class RegistrationBean implements Serializable {
private String zip; private String zip;
@NotBlank(message = "Bitte gib den Ort deines Wohnsitzes an.") @NotBlank(message = "Bitte gib den Ort deines Wohnsitzes an.")
private String city; private String city;
@Email(message = "Bitte gib eine gültige E-Mail-Adresse an (oder gar keine).") @Email(message = "Bitte gib eine gültige E-Mail-Adresse an (oder gar keine, falls du dich ohne Login anmelden möchtest).")
private String email; private String email;
private String phone; private String phone;
private String comment; private String comment;

7
src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationService.java
View File

@ -46,13 +46,6 @@ public class RegistrationService {
Boolean result = gateway.register(bean); Boolean result = gateway.register(bean);
if (result && bean.getRegisterInKeycloak()) { if (result && bean.getRegisterInKeycloak()) {
keycloak.register(bean.getForename(), bean.getSurname(), bean.getLogin(), bean.getPassword(), bean.getEmail()); keycloak.register(bean.getForename(), bean.getSurname(), bean.getLogin(), bean.getPassword(), bean.getEmail());
if (bean.getEmail() != null && !bean.getEmail().isBlank()) {
try {
keycloak.sendVerificationLink(bean.getLogin());
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
}
} }
return result; return result;
} }