[v10.4.x] Auth: Removal of conflicting users check upon creation (#89104)

fix for v10.4.0, use caseinsensitive before checking userConflict
This commit is contained in:
Eric Leijonmarck
2024-06-12 16:35:22 +02:00
committed by GitHub
parent 245297028e
commit 7b0f62330c
+5 -8
View File
@@ -291,7 +291,6 @@ func (ss *sqlStore) LoginConflict(ctx context.Context, login, email string, case
}
func (ss *sqlStore) loginConflict(ctx context.Context, sess *db.Session, login, email string, caseInsensitive bool) error {
users := make([]user.User, 0)
where := "email=? OR login=?"
if caseInsensitive {
where = "LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)"
@@ -306,13 +305,11 @@ func (ss *sqlStore) loginConflict(ctx context.Context, sess *db.Session, login,
if exists {
return user.ErrUserAlreadyExists
}
if err := sess.Where("LOWER(email)=LOWER(?) OR LOWER(login)=LOWER(?)",
email, login).Find(&users); err != nil {
return err
}
if len(users) > 1 {
return &user.ErrCaseInsensitiveLoginConflict{Users: users}
if caseInsensitive {
err := ss.userCaseInsensitiveLoginConflict(ctx, sess, login, email)
if err != nil {
return err
}
}
return nil
}