Adding a bit more refactor

Author: tnylea

app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -8,6 +8,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -30,17 +31,16 @@ public function create(Request $request): Response
      */
     public function store(LoginRequest $request): RedirectResponse
     {
-        // Find user by email
         $user = User::where('email', $request->email)->first();
 
-        // If user exists, password is correct, and 2FA is enabled, redirect to challenge
-        if ($user && $user->two_factor_confirmed_at && \Illuminate\Support\Facades\Hash::check($request->password, $user->password)) {
+        // If this user exists, password is correct, and 2FA is enabled, we want to redirect to the 2FA challenge
+        if ($user && $user->two_factor_confirmed_at && Hash::check($request->password, $user->password)) {
             $request->session()->put('login.id', $user->getKey());
             // Optionally clear any previous errors
             return redirect()->route('two-factor.challenge');
         }
 
-        // Proceed with normal authentication (this will handle errors and login)
+        // Otherwise, proceed with normal authentication
         $request->authenticate();
         $request->session()->regenerate();
 

app/Http/Controllers/Auth/TwoFactorAuthChallengeController.php

@@ -21,6 +21,7 @@ class TwoFactorAuthChallengeController extends Controller
      */
     public function create(Request $request)
     {
+        dd('here');
         // Session check is now handled by the EnsureTwoFactorChallengeSession middleware
         return Inertia::render('auth/two-factor-challenge');
     }
@@ -84,17 +85,17 @@ protected function authenticateUsingCode(Request $request, User $user)
     protected function authenticateUsingRecoveryCode(Request $request, User $user)
     {
         $recoveryCodes = json_decode(decrypt($user->two_factor_recovery_codes), true);
-        $provided = $request->recovery_code;
-        $match = collect($recoveryCodes)->first(function ($code) use ($provided) {
-            return hash_equals($code, $provided);
+        $providedRecoveryCode = $request->recovery_code;
+        $matchedRecoveryCode = collect($recoveryCodes)->first(function ($code) use ($providedRecoveryCode) {
+            return hash_equals($code, $providedRecoveryCode);
         });
 
-        if (! $match) {
+        if (! $matchedRecoveryCode) {
             return back()->withErrors(['recovery_code' => __('The provided two factor authentication recovery code was invalid.')]);
         }
 
         // Remove used recovery code using the ProcessRecoveryCode action
-        $updatedCodes = app(ProcessRecoveryCode::class)($recoveryCodes, $match);
+        $updatedCodes = app(ProcessRecoveryCode::class)($recoveryCodes, $matchedRecoveryCode);
         if ($updatedCodes === false) {
             return back()->withErrors(['recovery_code' => __('The provided two factor authentication recovery code was invalid.')]);
         }

routes/auth.php

@@ -58,8 +58,6 @@
 
 // Two-factor challenge routes with the ensure-two-factor-challenge-session middleware
 Route::middleware('ensure-two-factor-challenge-session')->group(function () {
-    Route::get('two-factor-challenge', [TwoFactorAuthChallengeController::class, 'create'])
-            ->name('two-factor.challenge');
-
+    Route::inertia('two-factor-challenge', 'auth/two-factor-challenge')->name('two-factor.challenge');
     Route::post('two-factor-challenge', [TwoFactorAuthChallengeController::class, 'store']);
 });