Skip to content

Commit 86c3481

Browse files
authored
Fix bug for get user by email (#18834)
Backport #18833 Fix #18830
1 parent 039eb66 commit 86c3481

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

models/user/user.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,19 +1104,9 @@ func GetUserByEmailContext(ctx context.Context, email string) (*User, error) {
11041104
}
11051105

11061106
email = strings.ToLower(email)
1107-
// First try to find the user by primary email
1108-
user := &User{Email: email}
1109-
has, err := db.GetEngine(ctx).Get(user)
1110-
if err != nil {
1111-
return nil, err
1112-
}
1113-
if has {
1114-
return user, nil
1115-
}
1116-
11171107
// Otherwise, check in alternative list for activated email addresses
1118-
emailAddress := &EmailAddress{Email: email, IsActivated: true}
1119-
has, err = db.GetEngine(ctx).Get(emailAddress)
1108+
emailAddress := &EmailAddress{LowerEmail: email, IsActivated: true}
1109+
has, err := db.GetEngine(ctx).Get(emailAddress)
11201110
if err != nil {
11211111
return nil, err
11221112
}

0 commit comments

Comments
 (0)