re-introduce validation for builtin accounts #3338

IQSS · Nov 28, 2016 · 3b29569 · 3b29569
1 parent fc41b85
commit 3b29569
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java
@@ -1,14 +1,17 @@
 package edu.harvard.iq.dataverse.authorization;
 
 import java.util.Objects;
+import org.hibernate.validator.constraints.NotBlank;
 
 /**
  *
  * @author gdurand
  */
 public class AuthenticatedUserDisplayInfo extends RoleAssigneeDisplayInfo {
-
+
+    @NotBlank(message = "Please enter your last name.")
     private String lastName;
+    @NotBlank(message = "Please enter your first name.")
     private String firstName;
     private String position;
 

diff --git a/...main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/...main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
@@ -9,6 +9,7 @@
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.EMailValidator;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.PermissionsWrapper;
 import edu.harvard.iq.dataverse.RoleAssignment;
@@ -203,6 +204,14 @@ public void validateUserName(FacesContext context, UIComponent toValidate, Objec
 
     public void validateUserEmail(FacesContext context, UIComponent toValidate, Object value) {
         String userEmail = (String) value;
+        boolean emailValid = EMailValidator.isEmailValid(userEmail, null);
+        if (!emailValid) {
+            ((UIInput) toValidate).setValid(false);
+            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("oauth2.newAccount.emailInvalid"), null);
+            context.addMessage(toValidate.getClientId(context), message);
+            logger.info("Email is not valid: " + userEmail);
+            return;
+        }
         boolean userEmailFound = false;
         AuthenticatedUser aUser = authenticationService.getAuthenticatedUserByEmail(userEmail);
         if (editMode == EditMode.CREATE) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java
@@ -22,6 +22,7 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.NotBlank;
 
 @NamedQueries({
     @NamedQuery( name="AuthenticatedUser.findAll",
@@ -72,7 +73,9 @@ public class AuthenticatedUser implements User, Serializable {
     private String email;
     private String affiliation;
     private String position;
+    @NotBlank(message = "Please enter your last name.")
     private String lastName;
+    @NotBlank(message = "Please enter your first name.")
     private String firstName;
     @Column(nullable = true)
     private Timestamp emailConfirmed;