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 "Login error messages fix (#3525)"

Browse Source 
This reverts commit 2e513c8fd4.
This commit is contained in:
Christopher Speller
2016-07-12 15:18:25 -04:00
parent 7c8654171e
commit 4775631ed4
1 changed files with 4 additions and 6 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 = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, result.Err.Error())
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
c.Err = result.Err
c.Err.StatusCode = http.StatusBadRequest
return
} else {
user = result.Data.(*model.User)
@@ -460,8 +460,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
if user, err = getUserForLogin(loginId, ldapOnly); err != nil {
c.LogAudit("failure")
//c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, err.Error())
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
c.Err = err
return
}
@@ -471,8 +470,7 @@ 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 = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, err.Error())
c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
c.Err = err
return
}