summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-04-08 18:04:23 -0300
committerCorey Hulen <corey@hulen.com>2016-04-08 14:04:23 -0700
commitdf77179eccffbb77f684abde45cac743f5d0b414 (patch)
tree524312a7033c11a4daeb9fa2b4aa2283765bdd9d /store
parent77ee1ce7fee698847e211dc15d4673300901aa48 (diff)
downloadchat-df77179eccffbb77f684abde45cac743f5d0b414.tar.gz
chat-df77179eccffbb77f684abde45cac743f5d0b414.tar.bz2
chat-df77179eccffbb77f684abde45cac743f5d0b414.zip
Fix email verification process (#2664)
- Fix email verification URL in login view - Fix URL in email being sent for verification - Add Email Verification on password reset - Fix display of email in reset password - Fix URL en team_signup_password_page - Fix typo in webapp en loc - Add missing es locs - Removed extra es, fr and pt locs
Diffstat (limited to 'store')
-rw-r--r--store/sql_user_store.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index 957921b9e..767892056 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -281,7 +281,7 @@ func (us SqlUserStore) UpdatePassword(userId, hashedPassword string) StoreChanne
updateAt := model.GetMillis()
- if _, err := us.GetMaster().Exec("UPDATE Users SET Password = :Password, LastPasswordUpdate = :LastPasswordUpdate, UpdateAt = :UpdateAt, AuthData = '', AuthService = '', FailedAttempts = 0 WHERE Id = :UserId", map[string]interface{}{"Password": hashedPassword, "LastPasswordUpdate": updateAt, "UpdateAt": updateAt, "UserId": userId}); err != nil {
+ if _, err := us.GetMaster().Exec("UPDATE Users SET Password = :Password, LastPasswordUpdate = :LastPasswordUpdate, UpdateAt = :UpdateAt, AuthData = '', AuthService = '', EmailVerified = 1, FailedAttempts = 0 WHERE Id = :UserId", map[string]interface{}{"Password": hashedPassword, "LastPasswordUpdate": updateAt, "UpdateAt": updateAt, "UserId": userId}); err != nil {
result.Err = model.NewLocAppError("SqlUserStore.UpdatePassword", "store.sql_user.update_password.app_error", nil, "id="+userId+", "+err.Error())
} else {
result.Data = userId