Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix login with email for ldap users (#18800) #18836

Merged
merged 7 commits into from
Feb 22, 2022
Merged

Fix login with email for ldap users (#18800) #18836

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ddcf2e7
Fix login with email for ldap users (#18800)
lunny Feb 20, 2022
63049a5
Merge branch 'release/v1.16' into lunny/fix_login_email_ldap2
lunny Feb 21, 2022
5a8b32b
Merge branch 'release/v1.16' into lunny/fix_login_email_ldap2
lunny Feb 21, 2022
35fe728
Merge branch 'release/v1.16' into lunny/fix_login_email_ldap2
lunny Feb 22, 2022
4f319e0
Merge branch 'release/v1.16' into lunny/fix_login_email_ldap2
lunny Feb 22, 2022
563e779
Merge branch 'release/v1.16' into lunny/fix_login_email_ldap2
lunny Feb 22, 2022
a51b4dd
Merge branch 'release/v1.16' into lunny/fix_login_email_ldap2
techknowlogick Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/auth/signin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func UserSignIn(username, password string) (*user_model.User, *auth.Source, erro
return nil, nil, smtp.ErrUnsupportedLoginType
}

user, err := authenticator.Authenticate(user, username, password)
user, err := authenticator.Authenticate(user, user.LoginName, password)
if err != nil {
return nil, nil, err
}
Expand Down