multipleof4/ntfy
1
0
Fork 0
mirror of https://github.com/multipleof4/ntfy.git synced 2026-10-16 16:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make more readable

Browse Source
This commit is contained in:
binwiederhier
2026-06-21 11:47:14 -04:00
parent 1979dbc7c3
commit 954fae44dc
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/manager.go
+10 -8
View File
@@ -1681,6 +1681,7 @@ func (a *Manager) VerifyEmail(rawToken string) (*MagicLink, error) {
if _, err := tx.Exec(a.queries.insertEmailIgnore, m.UserID, m.Email); err != nil { if _, err := tx.Exec(a.queries.insertEmailIgnore, m.UserID, m.Email); err != nil {
return err return err
} }
// Must stay before the promotion block; covered by TestUser_MagicLink_VerifyEmail_ProvisionedNoPrimary
if u.Provisioned { if u.Provisioned {
return nil // Provisioned users don't get a primary (recovery) email return nil // Provisioned users don't get a primary (recovery) email
} }
@@ -1695,16 +1696,17 @@ func (a *Manager) VerifyEmail(rawToken string) (*MagicLink, error) {
if primary.String != "" { if primary.String != "" {
return nil // User already has a primary -- leave it return nil // User already has a primary -- leave it
} }
var owner string // If the address is already another account's primary, leave it a verified secondary here
err = tx.QueryRow(a.queries.selectUserIDByPrimary, m.Email).Scan(&owner) var ownerUserID string
if errors.Is(err, sql.ErrNoRows) { if err = tx.QueryRow(a.queries.selectUserIDByPrimary, m.Email).Scan(&ownerUserID); err == nil {
if _, err := tx.Exec(a.queries.updateEmailSetPrimary, m.UserID, m.Email); err != nil { return nil // Address is primary elsewhere -> not promoted
return err } else if !errors.Is(err, sql.ErrNoRows) {
} return err // Real query error
} else if err != nil { }
// Address is globally free -> promote it to this user's primary
if _, err := tx.Exec(a.queries.updateEmailSetPrimary, m.UserID, m.Email); err != nil {
return err return err
} }
// owner found -> address is primary elsewhere -> stays a verified secondary
return nil return nil
}) })
if err != nil { if err != nil {