Adding a bit of refactoring

Author: tnylea

app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
+use App\Models\User;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -30,7 +31,7 @@ public function create(Request $request): Response
     public function store(LoginRequest $request): RedirectResponse
     {
         // Find user by email
-        $user = \App\Models\User::where('email', $request->email)->first();
+        $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)) {

app/Http/Controllers/Auth/TwoFactorAuthenticatedSessionController.php

@@ -3,14 +3,11 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
-use Laravel\Fortify\Actions\ConfirmTwoFactorAuthentication;
-use Laravel\Fortify\Actions\DisableTwoFactorAuthentication;
-use Laravel\Fortify\Actions\EnableTwoFactorAuthentication;
-use Laravel\Fortify\Actions\GenerateNewRecoveryCodes;
-use Laravel\Fortify\Features;
+
 
 class TwoFactorAuthenticatedSessionController extends Controller
 {
@@ -43,7 +40,7 @@ public function store(Request $request)
         ]);
 
         $userId = $request->session()->get('login.id');
-        $user = \App\Models\User::find($userId);
+        $user = User::find($userId);
 
         if (! $user) {
             return redirect()->route('login');
@@ -79,12 +76,21 @@ public function store(Request $request)
             }
             $user->two_factor_recovery_codes = encrypt(json_encode($updatedCodes));
             $user->save();
-            Auth::login($user, $request->session()->get('login.remember', false));
-            $request->session()->regenerate();
-            $request->session()->forget(['login.id', 'login.remember']);
-            return redirect()->intended(route('dashboard', absolute: false));
+            return $this->completeLogin($request, $user);
         }
 
         return back()->withErrors(['code' => __('Please provide a valid two factor authentication code.')]);
     }
+
+    /**
+     * Complete login and session management after successful 2FA.
+     */
+    private function completeLogin(Request $request, $user)
+    {
+        Auth::login($user, $request->session()->get('login.remember', false));
+        $request->session()->regenerate();
+        $request->session()->forget(['login.id', 'login.remember']);
+        return redirect()->intended(route('dashboard', absolute: false));
+    }
 }
+

app/Http/Controllers/Settings/TwoFactorAuthController.php

@@ -22,12 +22,10 @@ class TwoFactorAuthController extends Controller
      */
     public function edit(Request $request)
     {
-
-        
         return Inertia::render('settings/two-factor', [
-            'enabled' => !is_null($request->user()->two_factor_secret),
+            'enabled' => $this->twoFactorEnabled($request->user()),
             'confirmed' => !is_null($request->user()->two_factor_confirmed_at),
-            'recoveryCodes' => $request->user()->two_factor_secret ? json_decode(decrypt($request->user()->two_factor_recovery_codes)) : [],
+            'recoveryCodes' => $this->getRecoveryCodes($request->user()),
         ]);
     }
 
@@ -149,15 +147,33 @@ public function qrCode(Request $request)
      */
     public function recoveryCodes(Request $request)
     {
-        if (empty($request->user()->two_factor_secret)) {
+        if (!$this->twoFactorEnabled($request->user())) {
             return response('', 404);
         }
 
         return response()->json([
-            'recoveryCodes' => json_decode(decrypt($request->user()->two_factor_recovery_codes)),
+            'recoveryCodes' => $this->getRecoveryCodes($request->user()),
         ]);
     }
 
+    /**
+     * Helper to check if 2FA is enabled for a user.
+     */
+    private function twoFactorEnabled($user)
+    {
+        return !is_null($user->two_factor_secret);
+    }
+
+    /**
+     * Helper to get recovery codes for a user, or empty array if not enabled.
+     */
+    private function getRecoveryCodes($user)
+    {
+        return $this->twoFactorEnabled($user)
+            ? json_decode(decrypt($user->two_factor_recovery_codes))
+            : [];
+    }
+
     /**
      * Generate new recovery codes for the user.
      *