Skip to content

Commit 4a03afc

Browse files
committed
follow suggestions
1 parent 05f64ef commit 4a03afc

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

models/user/email_address.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,10 @@ func ActivateUserEmail(ctx context.Context, userID int64, email string, activate
486486

487487
// Activate/deactivate a user's primary email address and account
488488
if addr.IsPrimary {
489-
user, exist, err := db.Get[User](ctx, builder.Eq{"id": userID, "email": strings.ToLower(email)})
489+
user, exist, err := db.Get[User](ctx, builder.Eq{"id": userID})
490490
if err != nil {
491491
return err
492-
} else if !exist {
492+
} else if !exist || !strings.EqualFold(user.Email, email) {
493493
return fmt.Errorf("no user with ID: %d and Email: %s", userID, email)
494494
}
495495

models/user/user.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,6 @@ func createUser(ctx context.Context, u *User, meta *Meta, createdByAdmin bool, o
728728

729729
u.LowerName = strings.ToLower(u.Name)
730730
u.AvatarEmail = u.Email
731-
u.Email = strings.ToLower(u.Email)
732731
if u.Rands, err = GetUserSalt(); err != nil {
733732
return err
734733
}

0 commit comments

Comments
 (0)