summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/authentication.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/api/authentication.go b/api/authentication.go
index d30fc0a1f..42a395253 100644
--- a/api/authentication.go
+++ b/api/authentication.go
@@ -56,9 +56,12 @@ func checkLdapUserPasswordAndAllCriteria(ldapId *string, password string, mfaTok
user = ldapUser
}
- if err := checkUserAdditionalAuthenticationCriteria(user, mfaToken); err != nil {
- err.StatusCode = http.StatusUnauthorized
- return user, err
+ if err := checkUserMfa(user, mfaToken); err != nil {
+ return nil, err
+ }
+
+ if err := checkUserNotDisabled(user); err != nil {
+ return nil, err
}
// user successfully authenticated