diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-07-12 15:17:46 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-07-12 15:17:46 -0400 |
| commit | 7c8654171e893d827fcfdbe7864ab1712888b46a (patch) | |
| tree | 7be22f6fcf5d6e6070c6a2378be4b8de3cd8a68c /api/user.go | |
| parent | c377605906fc7eeb9dcaf75e66732efd3b4fe7fc (diff) | |
| download | chat-7c8654171e893d827fcfdbe7864ab1712888b46a.tar.gz chat-7c8654171e893d827fcfdbe7864ab1712888b46a.tar.bz2 chat-7c8654171e893d827fcfdbe7864ab1712888b46a.zip | |
Revert "Letting email not validated error message through login. Changing invalid credentials error. (#3546)"
This reverts commit 128e4f984ad565297ab1c7b8921d877d3a9c8f03.
Diffstat (limited to 'api/user.go')
| -rw-r--r-- | api/user.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/api/user.go b/api/user.go index 7dd26efd6..6ed2939d1 100644 --- a/api/user.go +++ b/api/user.go @@ -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 } |