diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-04-13 14:31:27 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-04-13 11:31:27 -0700 |
| commit | a9bd9843d41a2c3b8d0893b30c0c7d0754ba5dbf (patch) | |
| tree | 3537dd79a5c202262f527b2059e04a8e7f373541 /store | |
| parent | 158596deb8461df89024498ec5d7f7e1b1951c3c (diff) | |
| download | chat-a9bd9843d41a2c3b8d0893b30c0c7d0754ba5dbf.tar.gz chat-a9bd9843d41a2c3b8d0893b30c0c7d0754ba5dbf.tar.bz2 chat-a9bd9843d41a2c3b8d0893b30c0c7d0754ba5dbf.zip | |
Lower case email before database queries (#2689)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_team_store.go | 3 | ||||
| -rw-r--r-- | store/sql_user_store.go | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go index 1893268c8..8a345bfa0 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -6,6 +6,7 @@ package store import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" + "strings" ) type SqlTeamStore struct { @@ -223,6 +224,8 @@ func (s SqlTeamStore) GetTeamsForEmail(email string) StoreChannel { go func() { result := StoreResult{} + email = strings.ToLower(email) + var data []*model.Team if _, err := s.GetReplica().Select(&data, "SELECT Teams.* FROM Teams, Users WHERE Teams.Id = Users.TeamId AND Users.Email = :Email", map[string]interface{}{"Email": email}); err != nil { result.Err = model.NewLocAppError("SqlTeamStore.GetTeamsForEmail", "store.sql_team.get_teams_for_email.app_error", nil, "email="+email+", "+err.Error()) diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 767892056..2b52dfbd7 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -320,6 +320,8 @@ func (us SqlUserStore) UpdateAuthData(userId, service, authData, email string) S go func() { result := StoreResult{} + email = strings.ToLower(email) + updateAt := model.GetMillis() query := ` @@ -508,6 +510,8 @@ func (us SqlUserStore) GetByEmail(teamId string, email string) StoreChannel { go func() { result := StoreResult{} + email = strings.ToLower(email) + user := model.User{} if err := us.GetReplica().SelectOne(&user, "SELECT * FROM Users WHERE TeamId = :TeamId AND Email = :Email", map[string]interface{}{"TeamId": teamId, "Email": email}); err != nil { @@ -666,7 +670,7 @@ func (us SqlUserStore) PermanentDelete(userId string) StoreChannel { result := StoreResult{} if _, err := us.GetMaster().Exec("DELETE FROM Users WHERE Id = :UserId", map[string]interface{}{"UserId": userId}); err != nil { - result.Err = model.NewLocAppError("SqlUserStore.GetByEmail", "store.sql_user.permanent_delete.app_error", nil, "userId="+userId+", "+err.Error()) + result.Err = model.NewLocAppError("SqlUserStore.PermanentDelete", "store.sql_user.permanent_delete.app_error", nil, "userId="+userId+", "+err.Error()) } storeChannel <- result |