A couple of user handling improvements and bugfixes

src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java

@@ -203,7 +203,7 @@ public class UserController extends HttpServlet {
                         
                         // Standard form validation
                         FormValidation formValidation = FormValidator.validateForm("userForm",request,getServletContext());
-                        // If new user: check if username already exists
+                        // If new user: check if username or email already exists
                         if(userId <= 0)
                         {
                             try
@@ -220,6 +220,24 @@ public class UserController extends HttpServlet {
                             {
                                 // All is well, proceed...
                             }
+                            
+                            // Extra check: That user's email is not already in use
+                            FormField emailField = formValidation.getFormField("email");
+                            Boolean emailAlreadyInUse = false;
+                            try
+                            {
+                                VipsLogicUser foundUser = userBean.getUserByEmail(emailField.getWebValue());
+                                emailAlreadyInUse = (foundUser != null);
+                            }
+                            catch(NonUniqueResultException ex)
+                            {
+                                emailAlreadyInUse = true;
+                            }
+                            if(emailAlreadyInUse)
+                            {
+                                emailField.setValid(false);
+                                emailField.setValidationMessage(SessionLocaleUtil.getI18nText(request, "emailAddressIsAlreadyInUse"));
+                            }
                         }
                         if(formValidation.isValid())
                         {
@@ -282,6 +300,7 @@ public class UserController extends HttpServlet {
                         }
                         else
                         {
+                            viewUser.setOrganizationId(user.getOrganizationId());
                             request.setAttribute("formValidation", formValidation);
                             request.setAttribute("viewUser", viewUser);
                             request.setAttribute("organizations", em.createNamedQuery("Organization.findAll").getResultList());
@@ -465,7 +484,17 @@ public class UserController extends HttpServlet {
                                                 );
                 // Extra check: That user's email is not already in use
                 FormField emailField = formValidation.getFormField("email");
-                if(userBean.getUserByEmail(emailField.getWebValue()) != null)
+                Boolean emailAlreadyInUse = false;
+                try
+                {
+                    VipsLogicUser foundUser = userBean.getUserByEmail(emailField.getWebValue());
+                    emailAlreadyInUse = (foundUser != null);
+                }
+                catch(NonUniqueResultException ex)
+                {
+                    emailAlreadyInUse = true;
+                }
+                if(emailAlreadyInUse)
                 {
                     emailField.setValid(false);
                     emailField.setValidationMessage(SessionLocaleUtil.getI18nText(request, "emailAddressIsAlreadyInUse"));

src/main/java/no/nibio/vips/logic/controller/session/UserBean.java

@@ -50,6 +50,7 @@ import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
+import javax.persistence.NonUniqueResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import no.nibio.vips.logic.authenticate.PasswordValidationException;
@@ -220,7 +221,7 @@ public class UserBean {
      * @param email
      * @return The user, or null if no user with given email is registered
      */
-    public VipsLogicUser getUserByEmail(String email)
+    public VipsLogicUser getUserByEmail(String email) throws NonUniqueResultException
     {
         Query q = em.createNamedQuery("VipsLogicUser.findByEmail",VipsLogicUser.class);
         q.setParameter("email", email);