From eb49713c96e6db7b42babac345f1257aa830a637 Mon Sep 17 00:00:00 2001 From: Daniel Schalla Date: Fri, 15 Mar 2019 16:09:17 +0100 Subject: [PATCH] Fix MFA prompt not being shown for hardened mode (#10455) --- api4/user.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api4/user.go b/api4/user.go index 51eb1f846c..acedcf262c 100644 --- a/api4/user.go +++ b/api4/user.go @@ -1109,9 +1109,10 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) { } func login(c *Context, w http.ResponseWriter, r *http.Request) { - // For hardened mode, translate all login errors to generic. + // For hardened mode, translate all login errors to generic. MFA error being an exception, since it's required for + // the login flow itself. defer func() { - if *c.App.Config().ServiceSettings.ExperimentalEnableHardenedMode && c.Err != nil { + if *c.App.Config().ServiceSettings.ExperimentalEnableHardenedMode && c.Err != nil && c.Err.Id != "mfa.validate_token.authenticate.app_error" { c.Err = model.NewAppError("login", "api.user.login.invalid_credentials", nil, "", http.StatusUnauthorized) } }()