Skip to content
This repository was archived by the owner on Oct 6, 2023. It is now read-only.

Commit d76276d

Browse files
committed
Merge branch 'v1.3' of https://github.com/doecode/server into v1.3
2 parents a891016 + 3557b0b commit d76276d

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ public String getOwner() {
613613
}
614614

615615
public void setOwner(String owner) {
616+
owner = owner != null ? owner.toLowerCase() : owner;
616617
this.owner = owner;
617618
}
618619

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@Entity
1616
@Table(name="sites")
1717
@NamedQueries ({
18-
@NamedQuery (name = "Site.findByDomain", query = "SELECT s FROM Site s JOIN s.emailDomains d WHERE d = :domain")
18+
@NamedQuery (name = "Site.findByDomain", query = "SELECT s FROM Site s JOIN s.emailDomains d WHERE d = lower(:domain)")
1919
})
2020
public class Site implements Serializable {
2121

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@Table(name="users")
2525
@NamedQueries ({
2626
@NamedQuery (name = "User.findAllUsers", query = "SELECT u FROM User u ORDER BY u.lastName"),
27-
@NamedQuery (name = "User.findUser", query = "SELECT u FROM User u WHERE u.email=:email")
27+
@NamedQuery (name = "User.findUser", query = "SELECT u FROM User u WHERE u.email=lower(:email)")
2828
})
2929
public class User implements Serializable {
3030

@@ -38,7 +38,7 @@ public User() {
3838
public User(String email, String password, String apiKey, String confirmationCode) {
3939
this.password = password;
4040
this.apiKey = apiKey;
41-
this.email = email;
41+
this.setEmail(email);
4242
this.confirmationCode = confirmationCode;
4343
// new users are blank slate
4444
this.failedCount = 0;
@@ -125,6 +125,7 @@ public String getEmail() {
125125
}
126126

127127
public void setEmail(String email) {
128+
email = email != null ? email.toLowerCase() : email;
128129
this.email = email;
129130
}
130131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected AuthenticationToken createToken(ServletRequest request, ServletRespons
5858
EntityManager em = DoeServletContextListener.createEntityManager();
5959

6060
try {
61-
TypedQuery<User> getUserByLogin = em.createQuery("SELECT u FROM User u WHERE u.email=:email", User.class)
61+
TypedQuery<User> getUserByLogin = em.createQuery("SELECT u FROM User u WHERE u.email=lower(:email)", User.class)
6262
.setParameter("email", parts[0]);
6363
User user = getUserByLogin.getSingleResult();
6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ public Response listProjects(
464464
.setParameter("site", rolecode);
465465
} else {
466466
// no roles, you see only YOUR OWN projects
467-
query = em.createQuery("SELECT md FROM DOECodeMetadata md WHERE md.owner = :owner", DOECodeMetadata.class)
467+
query = em.createQuery("SELECT md FROM DOECodeMetadata md WHERE md.owner = lower(:owner)", DOECodeMetadata.class)
468468
.setParameter("owner", user.getEmail());
469469
}
470470

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public Response logout() {
227227
* 403 - forbidden access
228228
* 500 - internal system error, unable to read JSON, etc.
229229
*
230-
* JSON returns email address, XSRF token, hasSite indiciating whether or not
230+
* JSON returns email address, XSRF token, hasSite indicating whether or not
231231
* user is a lab site user, and first/last names if present.
232232
*
233233
* @param object JSON containing "email" and "password" to authenticate.
@@ -1196,6 +1196,7 @@ public EmailRequest() {
11961196
}
11971197

11981198
public void setEmail(String email) {
1199+
email = email != null ? email.toLowerCase() : email;
11991200
this.email = email;
12001201
}
12011202

@@ -1257,6 +1258,7 @@ public String getEmail() {
12571258
* @param email the email to set
12581259
*/
12591260
public void setEmail(String email) {
1261+
email = email != null ? email.toLowerCase() : email;
12601262
this.email = email;
12611263
}
12621264

@@ -1322,6 +1324,7 @@ public String getEmail() {
13221324
* @param email the email to set
13231325
*/
13241326
public void setEmail(String email) {
1327+
email = email != null ? email.toLowerCase() : email;
13251328
this.email = email;
13261329
}
13271330

0 commit comments

Comments
 (0)