feat: re-revert refactor on mfa code

supabase · Feb 24, 2024 · e1530c2 · e1530c2
1 parent 7c1b130
commit e1530c2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/internal/api/token.go b/internal/api/token.go
@@ -430,9 +430,18 @@ 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)