fix: delete old auth token upon replacing primary email

This commit is contained in:
Gusted 2025-08-25 02:33:36 +02:00 committed by Earl Warren
commit 5ce1b564dc
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00

View file

@ -9,6 +9,7 @@ import (
"errors"
"strings"
auth_model "forgejo.org/models/auth"
"forgejo.org/models/db"
user_model "forgejo.org/models/user"
"forgejo.org/modules/setting"
@ -171,6 +172,11 @@ func ReplaceInactivePrimaryEmail(ctx context.Context, oldEmail string, email *us
return err
}
// Delete previous activation token.
if err := auth_model.DeleteAuthTokenByUser(ctx, user.ID); err != nil {
return err
}
return DeleteEmailAddresses(ctx, user, []string{oldEmail})
}