Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix bug for get user by email (#18834)

Browse source 
Backport #18833

Fix #18830
This commit is contained in:
Lunny Xiao 2022-02-22 02:34:22 +08:00 committed by GitHub
parent 039eb66c8c
commit 86c3481eff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
models/user/user.go
View file

@ -1104,19 +1104,9 @@ func GetUserByEmailContext(ctx context.Context, email string) (*User, error) {
} }
email = strings.ToLower(email) email = strings.ToLower(email)
// First try to find the user by primary email
user := &User{Email: email}
has, err := db.GetEngine(ctx).Get(user)
if err != nil {
return nil, err
}
if has {
return user, nil
}
// Otherwise, check in alternative list for activated email addresses // Otherwise, check in alternative list for activated email addresses
emailAddress := &EmailAddress{Email: email, IsActivated: true} emailAddress := &EmailAddress{LowerEmail: email, IsActivated: true}
has, err = db.GetEngine(ctx).Get(emailAddress) has, err := db.GetEngine(ctx).Get(emailAddress)
if err != nil { if err != nil {
return nil, err return nil, err
} }