Revert "feat: Users added through LDAP cannot log in using the set password (…"

This reverts commit 973a1df6c279218342fa086d8d28c756f59fe372.
This commit is contained in:
Yang Luo 2024-09-07 20:54:51 +08:00 committed by GitHub
parent 973a1df6c2
commit f352e7e8ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -354,8 +354,8 @@ func CheckUserPassword(organization string, username string, password string, la
}
}
if user.Ldap != "" && (isSigninViaLdap || user.Password == "") {
if !isPasswordWithLdapEnabled {
if user.Ldap != "" {
if !isSigninViaLdap && !isPasswordWithLdapEnabled {
return nil, fmt.Errorf(i18n.Translate(lang, "check:password or code is incorrect"))
}