fix: revert refactor on updateMFASessionsAndClaims (#1413)

## What kind of change does this PR introduce? Temporarily reverts a refactor of `updateMFASessionsAndClaims`. This will be addressed in a separate PR Co-authored-by: joel <[email protected]>
supabase · Feb 9, 2024 · 279c241 · 279c241
1 parent 18cf8cd
commit 279c241
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/internal/api/token.go b/internal/api/token.go
@@ -433,9 +433,17 @@ func (a *API) updateMFASessionAndClaims(r *http.Request, tx *storage.Connection,
 	var tokenString string
 	var expiresAt int64
 	var refreshToken *models.RefreshToken
-	session := getSession(ctx)
-	err := tx.Transaction(func(tx *storage.Connection) error {
-		if terr := models.AddClaimToSession(tx, session.ID, authenticationMethod); terr != nil {
+	currentClaims := getClaims(ctx)
+	sessionId, err := uuid.FromString(currentClaims.SessionId)
+	if err != nil {
+		return nil, internalServerError("Cannot read SessionId claim as UUID").WithInternalError(err)
+	}
+	err = tx.Transaction(func(tx *storage.Connection) error {
+		if terr := models.AddClaimToSession(tx, sessionId, authenticationMethod); terr != nil {
+			return terr
+		}
+		session, terr := models.FindSessionByID(tx, sessionId, false)
+		if terr != nil {
 			return terr
 		}
 		currentToken, terr := models.FindTokenBySessionID(tx, &session.ID)
@@ -458,8 +466,8 @@ func (a *API) updateMFASessionAndClaims(r *http.Request, tx *storage.Connection,
 		if err := session.UpdateAssociatedAAL(tx, aal); err != nil {
 			return err
 		}
+		tokenString, expiresAt, terr = a.generateAccessToken(ctx, tx, user, &sessionId, models.TOTPSignIn)
 
-		tokenString, expiresAt, terr = a.generateAccessToken(ctx, tx, user, &session.ID, models.TOTPSignIn)
 		if terr != nil {
 			httpErr, ok := terr.(*HTTPError)
 			if ok {