Merge branch 'v1.3' of https://github.com/doecode/server into v1.3

Author: nensor

src/main/java/gov/osti/entity/DOECodeMetadata.java

@@ -613,6 +613,7 @@ public String getOwner() {
 	}
 
 	public void setOwner(String owner) {
+                owner = owner != null ? owner.toLowerCase() : owner;
 		this.owner = owner;
 	}
 

src/main/java/gov/osti/entity/Site.java

@@ -15,7 +15,7 @@
 @Entity
 @Table(name="sites")
 @NamedQueries ({
-    @NamedQuery (name = "Site.findByDomain", query = "SELECT s FROM Site s JOIN s.emailDomains d WHERE d = :domain")
+    @NamedQuery (name = "Site.findByDomain", query = "SELECT s FROM Site s JOIN s.emailDomains d WHERE d = lower(:domain)")
 })
 public class Site implements Serializable {
 

src/main/java/gov/osti/entity/User.java

@@ -24,7 +24,7 @@
 @Table(name="users")
 @NamedQueries ({
     @NamedQuery (name = "User.findAllUsers", query = "SELECT u FROM User u ORDER BY u.lastName"),
-    @NamedQuery (name = "User.findUser", query = "SELECT u FROM User u WHERE u.email=:email")
+    @NamedQuery (name = "User.findUser", query = "SELECT u FROM User u WHERE u.email=lower(:email)")
 })
 public class User implements Serializable {
 
@@ -38,7 +38,7 @@ public User() {
     public User(String email, String password, String apiKey, String confirmationCode) {
             this.password = password;
             this.apiKey = apiKey;
-            this.email = email;
+            this.setEmail(email);
             this.confirmationCode = confirmationCode;
             // new users are blank slate
             this.failedCount = 0;
@@ -125,6 +125,7 @@ public String getEmail() {
     }
 
     public void setEmail(String email) {
+            email = email != null ? email.toLowerCase() : email;
             this.email = email;
     }
 

src/main/java/gov/osti/security/BasicAuthenticationFilter.java

@@ -58,7 +58,7 @@ protected AuthenticationToken createToken(ServletRequest request, ServletRespons
                 EntityManager em = DoeServletContextListener.createEntityManager();
 
                 try {
-                    TypedQuery<User> getUserByLogin = em.createQuery("SELECT u FROM User u WHERE u.email=:email", User.class)
+                    TypedQuery<User> getUserByLogin = em.createQuery("SELECT u FROM User u WHERE u.email=lower(:email)", User.class)
                             .setParameter("email", parts[0]);
                     User user = getUserByLogin.getSingleResult();
 

src/main/java/gov/osti/services/Metadata.java

@@ -464,7 +464,7 @@ public Response listProjects(
                         .setParameter("site", rolecode);
             } else {
                 // no roles, you see only YOUR OWN projects
-                query = em.createQuery("SELECT md FROM DOECodeMetadata md WHERE md.owner = :owner", DOECodeMetadata.class)
+                query = em.createQuery("SELECT md FROM DOECodeMetadata md WHERE md.owner = lower(:owner)", DOECodeMetadata.class)
                         .setParameter("owner", user.getEmail());
             }
 

src/main/java/gov/osti/services/UserServices.java

@@ -227,7 +227,7 @@ public Response logout() {
      * 403 - forbidden access
      * 500 - internal system error, unable to read JSON, etc.
      * 
-     * JSON returns email address, XSRF token, hasSite indiciating whether or not
+     * JSON returns email address, XSRF token, hasSite indicating whether or not
      * user is a lab site user, and first/last names if present.
      * 
      * @param object JSON containing "email" and "password" to authenticate.
@@ -1196,6 +1196,7 @@ public EmailRequest() {
         }
 
         public void setEmail(String email) {
+            email = email != null ? email.toLowerCase() : email;
             this.email = email;
         }
 
@@ -1257,6 +1258,7 @@ public String getEmail() {
          * @param email the email to set
          */
         public void setEmail(String email) {
+            email = email != null ? email.toLowerCase() : email;
             this.email = email;
         }
 
@@ -1322,6 +1324,7 @@ public String getEmail() {
          * @param email the email to set
          */
         public void setEmail(String email) {
+            email = email != null ? email.toLowerCase() : email;
             this.email = email;
         }