diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-09-17 14:12:07 +0200 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2018-09-17 09:12:07 -0300 |
| commit | 7226ea7dfbf21860a5eb2fe0997a8363df4a4dd6 (patch) | |
| tree | e4af04335e02846712510aea4c13c36f3fbb0a5e /app/login.go | |
| parent | 517faccc332ce48de43e597d1b2d29a3961241e7 (diff) | |
| download | chat-7226ea7dfbf21860a5eb2fe0997a8363df4a4dd6.tar.gz chat-7226ea7dfbf21860a5eb2fe0997a8363df4a4dd6.tar.bz2 chat-7226ea7dfbf21860a5eb2fe0997a8363df4a4dd6.zip | |
MM-12045: Fix MFA for ldap accounts (#9420)
Diffstat (limited to 'app/login.go')
| -rw-r--r-- | app/login.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/login.go b/app/login.go index 4897ae171..5099a3e7a 100644 --- a/app/login.go +++ b/app/login.go @@ -116,8 +116,11 @@ func (a *App) GetUserForLogin(id, loginId string) (*model.User, *model.AppError) // Try to get the user with LDAP if enabled if *a.Config().LdapSettings.Enable && a.Ldap != nil { - if user, err := a.Ldap.GetUser(loginId); err == nil { - return user, nil + if ldapUser, err := a.Ldap.GetUser(loginId); err == nil { + if user, err := a.GetUserByAuth(ldapUser.AuthData, model.USER_AUTH_SERVICE_LDAP); err == nil { + return user, nil + } + return ldapUser, nil } } |