From 4775631ed4ef679d1b25a75e5f345aa5fbfabe80 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 12 Jul 2016 15:18:25 -0400 Subject: Revert "Login error messages fix (#3525)" This reverts commit 2e513c8fd4c6b1b428b83044c017836b0011d32b. --- api/user.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'api/user.go') diff --git a/api/user.go b/api/user.go index 6ed2939d1..a3c2faf6a 100644 --- a/api/user.go +++ b/api/user.go @@ -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 } -- cgit v1.2.3-1-g7c22