wip

Author: pushpak1300

app/Http/Controllers/Settings/TwoFactorAuthenticationController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Settings;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -14,21 +15,16 @@ class TwoFactorAuthenticationController extends Controller
      */
     public function show(Request $request): Response
     {
+        /** @var User $user */
         $user = $request->user();
 
         $confirmed = filled($user->two_factor_confirmed_at);
-        $hasSecret = filled($user->two_factor_secret);
-        $showSetup = ! $confirmed && $hasSecret;
-
-        $recoveryCodes = $hasSecret && filled($user->two_factor_recovery_codes)
-            ? (json_decode(decrypt($user->two_factor_recovery_codes), true) ?: [])
-            : [];
 
         return Inertia::render('settings/TwoFactor', [
             'confirmed' => $confirmed,
-            'recoveryCodes' => $recoveryCodes,
-            'qrCodeSvg' => $showSetup ? $user->twoFactorQrCodeSvg() : null,
-            'secretKey' => $showSetup ? decrypt($user->two_factor_secret) : null,
+            'recoveryCodes' => filled($user->two_factor_secret) ? json_decode(decrypt($user->two_factor_recovery_codes)) : [],
+            'qrCodeSvg' => !$confirmed && filled($user->two_factor_secret) ? $user->twoFactorQrCodeSvg() : null,
+            'secretKey' => !$confirmed && filled($user->two_factor_secret) ? decrypt($user->two_factor_secret) : null,
         ]);
     }
 }

app/Providers/FortifyServiceProvider.php

@@ -6,7 +6,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
 use Inertia\Inertia;
 use Laravel\Fortify\Fortify;
 
@@ -25,12 +24,6 @@ public function boot(): void
             return Inertia::render('auth/ConfirmPassword');
         });
 
-        RateLimiter::for('login', function (Request $request) {
-            $throttleKey = Str::transliterate(Str::lower((string) $request->string(Fortify::username())).'|'.$request->ip());
-
-            return Limit::perMinute(5)->by($throttleKey);
-        });
-
         RateLimiter::for('two-factor', function (Request $request) {
             return Limit::perMinute(5)->by($request->session()->get('login.id'));
         });