Merge pull request traccar#3445 from tsmgeek/login_auth_trim

Trim email field on auth
cyaconi · Aug 15, 2017 · 5606c72 · 5606c72
2 parents 8012240 + b2c8c67
commit 5606c72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
@@ -297,7 +297,7 @@ private void initDatabaseSchema() throws SQLException, LiquibaseException {
 
     public User login(String email, String password) throws SQLException {
         User user = QueryBuilder.create(dataSource, getQuery("database.loginUser"))
-                .setString("email", email)
+                .setString("email", email.trim())
                 .executeQuerySingle(User.class);
         if (user != null && user.isPasswordValid(password)) {
             return user;

diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
@@ -43,7 +43,7 @@ public String getEmail() {
     }
 
     public void setEmail(String email) {
-        this.email = email;
+        this.email = email.trim();
     }
 
     private String phone;