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

Login error messages fix (#3525)

Browse Source
This commit is contained in:
Christopher Speller
2016-07-08 09:17:14 -04:00
committed by Harrison Healey
parent 59d5ae40ab
commit 2e513c8fd4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/user.go
View File

@@ -449,8 +449,8 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
if result := <-Srv.Store.User().Get(id); result.Err != nil {
c.LogAuditWithUserId(user.Id, "failure")
c.Err = result.Err
c.Err.StatusCode = http.StatusBadRequest
//c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, result.Err.Error())
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
return
} else {
user = result.Data.(*model.User)
@@ -460,7 +460,8 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
if user, err = getUserForLogin(loginId, ldapOnly); err != nil {
c.LogAudit("failure")
c.Err = err
//c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, err.Error())
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
return
}
@@ -470,7 +471,8 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
// and then authenticate them
if user, err = authenticateUser(user, password, mfaToken); err != nil {
c.LogAuditWithUserId(user.Id, "failure")
c.Err = err
//c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, err.Error())
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
return
}

4
i18n/en.json
View File

@@ -1771,6 +1771,10 @@
"id": "api.user.login.blank_pwd.app_error",
"translation": "Password field must not be blank"
},
{
"id": "api.user.login.invalid_credentials",
"translation": "User ID or password incorrect."
},
{
"id": "api.user.login.inactive.app_error",
"translation": "Login failed because your account has been set to inactive. Please contact an administrator."