From 128e4f984ad565297ab1c7b8921d877d3a9c8f03 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 12 Jul 2016 10:08:54 -0400 Subject: [PATCH] Letting email not validated error message through login. Changing invalid credentials error. (#3546) --- api/user.go | 6 +++++- i18n/en.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/user.go b/api/user.go index 84906eece3..bb2f1c794c 100644 --- a/api/user.go +++ b/api/user.go @@ -472,7 +472,11 @@ 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()) - c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "") + 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, "") + } return } diff --git a/i18n/en.json b/i18n/en.json index 04305774a6..19c97bc953 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1781,7 +1781,7 @@ }, { "id": "api.user.login.invalid_credentials", - "translation": "User ID or password incorrect." + "translation": "Your login credentials are incorrect." }, { "id": "api.user.login.not_provided.app_error",