see #48
This commit is contained in:
@@ -21,6 +21,7 @@ import de.jottyfan.camporganizer.module.registration.validate.UnusedUsername;
|
||||
*/
|
||||
@UnusedUsername(field = "login", message = "Dieses Login ist leider bereits vergeben. Bitte wähle ein anderes.")
|
||||
@TeacherAgeCheck(field = "birthDate", fkCamp = "fkCamp", campRole = "campRole", message = "Als Mitarbeiter bist Du leider zu jung für diese Freizeit.")
|
||||
// TODO: registration completeness annotation; in case of registerInKeycloak == true, force login, password, kcForename, kcSurname and kcEmail not to be blank
|
||||
public class RegistrationBean implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -50,6 +51,9 @@ public class RegistrationBean implements Serializable {
|
||||
private Boolean registerInKeycloak;
|
||||
private String login;
|
||||
private String password;
|
||||
private String kcForename;
|
||||
private String kcSurname;
|
||||
private String kcEmail;
|
||||
|
||||
/**
|
||||
* @return forename + surname, separated by a space
|
||||
@@ -267,4 +271,46 @@ public class RegistrationBean implements Serializable {
|
||||
public void setCampRole(EnumCamprole campRole) {
|
||||
this.campRole = campRole;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the kcForename
|
||||
*/
|
||||
public String getKcForename() {
|
||||
return kcForename;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param kcForename the kcForename to set
|
||||
*/
|
||||
public void setKcForename(String kcForename) {
|
||||
this.kcForename = kcForename;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the kcSurname
|
||||
*/
|
||||
public String getKcSurname() {
|
||||
return kcSurname;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param kcSurname the kcSurname to set
|
||||
*/
|
||||
public void setKcSurname(String kcSurname) {
|
||||
this.kcSurname = kcSurname;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the kcEmail
|
||||
*/
|
||||
public String getKcEmail() {
|
||||
return kcEmail;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param kcEmail the kcEmail to set
|
||||
*/
|
||||
public void setKcEmail(String kcEmail) {
|
||||
this.kcEmail = kcEmail;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class RegistrationService {
|
||||
}
|
||||
Boolean result = gateway.register(bean);
|
||||
if (result && bean.getRegisterInKeycloak()) {
|
||||
keycloak.register(bean.getForename(), bean.getSurname(), bean.getLogin(), bean.getPassword(), bean.getEmail());
|
||||
keycloak.register(bean.getKcForename(), bean.getKcSurname(), bean.getLogin(), bean.getPassword(), bean.getKcEmail());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user