IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Letting email not validated error message through login. Changing invalid credentials error. (#3546)"

Browse Source 
This reverts commit 128e4f984a.
This commit is contained in:
Christopher Speller
2016-07-12 15:17:46 -04:00
parent c377605906
commit 7c8654171e
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/user.go
View File

@@ -472,11 +472,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
if user, err = authenticateUser(user, password, mfaToken); err != nil {
c.LogAuditWithUserId(user.Id, "failure")
//c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, err.Error())
if err.Id == "api.user.login.not_verified.app_error" {
c.Err = err
} else {
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
}
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
return
}

2
i18n/en.json
View File

@@ -1781,7 +1781,7 @@
},
{
"id": "api.user.login.invalid_credentials",
"translation": "Your login credentials are incorrect."
"translation": "User ID or password incorrect."
},
{
"id": "api.user.login.not_provided.app_error",