Skip to content

Commit

Permalink
fix: re-use existing connection's transaction in emailChangeVerify (s…
Browse files Browse the repository at this point in the history
…upabase#424)

This aligns the connection handling behaviour with the rest of the
functions in `api/verify.go`.

This looks like it might have been a leftover bug during refactoring in
PR supabase#379.
  • Loading branch information
bnjmnt4n authored Mar 23, 2022
1 parent 7580d61 commit 7c29f5c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions api/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ func (a *API) emailChangeVerify(ctx context.Context, conn *storage.Connection, p
config := a.getConfig(ctx)

if config.Mailer.SecureEmailChangeEnabled && user.EmailChangeConfirmStatus == zeroConfirmation && user.GetEmail() != "" {
err := a.db.Transaction(func(tx *storage.Connection) error {
err := conn.Transaction(func(tx *storage.Connection) error {
user.EmailChangeConfirmStatus = singleConfirmation
if params.Token == user.EmailChangeTokenCurrent {
user.EmailChangeTokenCurrent = ""
Expand All @@ -307,7 +307,7 @@ func (a *API) emailChangeVerify(ctx context.Context, conn *storage.Connection, p
}

// one email is confirmed at this point
err := a.db.Transaction(func(tx *storage.Connection) error {
err := conn.Transaction(func(tx *storage.Connection) error {
var terr error

if terr = models.NewAuditLogEntry(tx, instanceID, user, models.UserModifiedAction, nil); terr != nil {
Expand Down

0 comments on commit 7c29f5c

Please sign in to comment.