Address 2FA PR feedback

Author: DJAndries

controllers/accounts.go

@@ -395,7 +395,7 @@ func (ac *AccountsController) SetupPasswordFinalize2FA(w http.ResponseWriter, r
 		return
 	}
 
-	if err := ac.twoFAService.ProcessAuthRequest(registrationState, &requestData); err != nil {
+	if err := ac.twoFAService.ProcessChallenge(registrationState, &requestData); err != nil {
 		if errors.Is(err, util.ErrBadTOTPCode) || errors.Is(err, util.ErrBadRecoveryKey) {
 			util.RenderErrorResponse(w, r, http.StatusUnauthorized, err)
 			return

controllers/auth.go

@@ -460,7 +460,7 @@ func (ac *AuthController) LoginFinalize2FA(w http.ResponseWriter, r *http.Reques
 	}
 
 	// Process the 2FA authentication request
-	if err := ac.twoFAService.ProcessAuthRequest(loginState, &requestData); err != nil {
+	if err := ac.twoFAService.ProcessChallenge(loginState, &requestData); err != nil {
 		if errors.Is(err, util.ErrBadTOTPCode) || errors.Is(err, util.ErrBadRecoveryKey) || errors.Is(err, util.ErrTOTPCodeAlreadyUsed) {
 			util.RenderErrorResponse(w, r, http.StatusUnauthorized, err)
 			return
@@ -469,11 +469,6 @@ func (ac *AuthController) LoginFinalize2FA(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	if err := ac.ds.DeleteInterimPasswordState(loginState.ID); err != nil {
-		util.RenderErrorResponse(w, r, http.StatusInternalServerError, err)
-		return
-	}
-
 	// Create a session and return an auth token
 	authToken, err := ac.createSessionAndToken(*loginState.AccountID, r.UserAgent())
 	if err != nil {

services/twofa.go

@@ -101,8 +101,8 @@ func (t *TwoFAService) DisableTwoFA(accountID uuid.UUID) error {
 	return nil
 }
 
-// ProcessAuthRequest verifies either TOTP code or recovery key for an account
-func (t *TwoFAService) ProcessAuthRequest(loginState *datastore.InterimPasswordState, req *TwoFAAuthRequest) error {
+// ProcessChallenge verifies either TOTP code or recovery key for an account
+func (t *TwoFAService) ProcessChallenge(loginState *datastore.InterimPasswordState, req *TwoFAAuthRequest) error {
 	// Verify either TOTP code or recovery key
 	if req.TOTPCode != nil {
 		// Verify TOTP code
@@ -119,6 +119,10 @@ func (t *TwoFAService) ProcessAuthRequest(loginState *datastore.InterimPasswordS
 		}
 	}
 
+	if err := t.ds.DeleteInterimPasswordState(loginState.ID); err != nil {
+		return err
+	}
+
 	return nil
 }