Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make email's uniqueness enforcement by oxTrust optional #1371 #1375

Merged
merged 1 commit into from Nov 30, 2018
Merged

Make email's uniqueness enforcement by oxTrust optional #1371 #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/gluu/oxtrust/action/RegisterPersonAction.java
View file
Open in desktop
Expand Up @@ -485,7 +485,7 @@ public void validateEmail(FacesContext context, UIComponent component, Object va
}

GluuCustomPerson gluuCustomPerson = personService.getPersonByEmail(email);
if (gluuCustomPerson != null) {
if (gluuCustomPerson != null && appConfiguration.getEnforceEmailUniqueness()) {
FacesMessage message = new FacesMessage("Email Address Already Registered.");
message.setSeverity(FacesMessage.SEVERITY_ERROR);
throw new ValidatorException(message);
Expand Down
25 changes: 17 additions & 8 deletions server/src/main/java/org/gluu/oxtrust/action/UpdatePersonAction.java
View file
Open in desktop
Expand Up @@ -353,26 +353,35 @@ public String save() throws Exception {
return OxTrustConstants.RESULT_FAILURE;
}
if (!update) {

if (!userNameIsUniqAtCreationTime(this.person.getUid())) {
facesMessages.add(FacesMessage.SEVERITY_ERROR, "#{msg['UpdatePersonAction.faileAddUserUidExist']} %s",
this.person.getUid());
return OxTrustConstants.RESULT_FAILURE;
}
if (!userEmailIsUniqAtCreationTime(this.person.getAttribute(MAIL))) {
facesMessages.add(FacesMessage.SEVERITY_ERROR,
"#{msg['UpdatePersonAction.faileUpdateUserMailidExist']} %s", this.person.getAttribute(MAIL));
return OxTrustConstants.RESULT_FAILURE;
if (appConfiguration.getEnforceEmailUniqueness()) {
if (!userEmailIsUniqAtCreationTime(this.person.getAttribute(MAIL))) {
facesMessages.add(FacesMessage.SEVERITY_ERROR,
"#{msg['UpdatePersonAction.faileUpdateUserMailidExist']} %s",
this.person.getAttribute(MAIL));
return OxTrustConstants.RESULT_FAILURE;
}
}

} else {

if (!userNameIsUniqAtEditionTime(this.person.getUid())) {
facesMessages.add(FacesMessage.SEVERITY_ERROR, "#{msg['UpdatePersonAction.faileAddUserUidExist']} %s",
this.person.getUid());
return OxTrustConstants.RESULT_FAILURE;
}
if (!userEmailIsUniqAtEditionTime(this.person.getAttribute(MAIL))) {
facesMessages.add(FacesMessage.SEVERITY_ERROR,
"#{msg['UpdatePersonAction.faileUpdateUserMailidExist']} %s", this.person.getAttribute(MAIL));
return OxTrustConstants.RESULT_FAILURE;
if (appConfiguration.getEnforceEmailUniqueness()) {
if (!userEmailIsUniqAtEditionTime(this.person.getAttribute(MAIL))) {
facesMessages.add(FacesMessage.SEVERITY_ERROR,
"#{msg['UpdatePersonAction.faileUpdateUserMailidExist']} %s",
this.person.getAttribute(MAIL));
return OxTrustConstants.RESULT_FAILURE;
}
}
}

Expand Down
13 changes: 8 additions & 5 deletions server/src/main/java/org/gluu/oxtrust/action/UserProfileAction.java
View file
Open in desktop
Expand Up @@ -151,10 +151,12 @@ public String show() {

public String update() {
try {
if (!userEmailIsUniqAtEditionTime(this.person.getAttribute("mail"))) {
facesMessages.add(FacesMessage.SEVERITY_ERROR,
"#{msg['UpdatePersonAction.faileUpdateUserMailidExist']} %s", person.getMail());
return OxTrustConstants.RESULT_FAILURE;
if (appConfiguration.getEnforceEmailUniqueness()) {
if (!userEmailIsUniqAtEditionTime(this.person.getAttribute("mail"))) {
facesMessages.add(FacesMessage.SEVERITY_ERROR,
"#{msg['UpdatePersonAction.faileUpdateUserMailidExist']} %s", person.getMail());
return OxTrustConstants.RESULT_FAILURE;
}
}
if (this.imapData != null) {
List<GluuCustomAttribute> customAttributes = this.person.getCustomAttributes();
Expand All @@ -175,7 +177,8 @@ public String update() {
externalUpdateUserService.executeExternalUpdateUserMethods(this.person);
}
personService.updatePerson(this.person);
oxTrustAuditService.audit(this.person.getInum()+ " **"+this.person.getDisplayName()+"** PROFILE UPDATED",
oxTrustAuditService.audit(
this.person.getInum() + " **" + this.person.getDisplayName() + "** PROFILE UPDATED",
identity.getUser(),
(HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest());
if (runScript) {
Expand Down
8 changes: 7 additions & 1 deletion static/src/main/resources/META-INF/resources/schema/oxtrust.properties.json
View file
Open in desktop
Expand Up @@ -627,6 +627,11 @@
"id": "authenticationRecaptchaEnabled",
"description": "Boolean value specifying whether to enable Recaptcha on authentication.",
"type": "boolean"
},
"enforceEmailUniqueness": {
"id": "enforceEmailUniqueness",
"description": "Boolean value specifying whether to enforce email uniqueness on oxtrust side.",
"type": "boolean"
}
},
"required": [
Expand Down Expand Up @@ -726,6 +731,7 @@
"disableJdkLogger",
"cleanServiceInterval",
"passwordResetRequestExpirationTime",
"authenticationRecaptchaEnabled"
"authenticationRecaptchaEnabled",
"enforceEmailUniqueness"
]
}