From 2fc27a410ee3ce28ac6aec0ca19808be7a3dff33 Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Wed, 23 Mar 2022 15:52:07 +0800 Subject: [PATCH] fix: re-use existing connection's transaction in `emailChangeVerify` 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 #379. --- api/verify.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/verify.go b/api/verify.go index 5150cde95..be721c155 100644 --- a/api/verify.go +++ b/api/verify.go @@ -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 = "" @@ -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 {