From 7226ea7dfbf21860a5eb2fe0997a8363df4a4dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 17 Sep 2018 14:12:07 +0200 Subject: MM-12045: Fix MFA for ldap accounts (#9420) --- app/login.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/login.go') 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 } } -- cgit v1.2.3-1-g7c22