formating

pushpak1300 · pushpak1300 · commit db3dc9719fe9 · 2025-09-09T00:36:48.000+05:30
diff --git a/resources/js/components/two-factor-recovery-codes.tsx b/resources/js/components/two-factor-recovery-codes.tsx
@@ -61,8 +61,7 @@ export default function TwoFactorRecoveryCodes({ recoveryCodesList, fetchRecover
                         <Form {...regenerateRecoveryCodes.form()} options={{ preserveScroll: true }} onSuccess={fetchRecoveryCodes}>
                             {({ processing }) => (
                                 <Button variant="secondary" type="submit" disabled={processing} aria-describedby="regenerate-warning">
-                                    <RefreshCw className={`mr-2 size-4 ${processing ? 'animate-spin' : ''}`} aria-hidden="true" />
-                                    {processing ? 'Regenerating...' : 'Regenerate Codes'}
+                                    <RefreshCw /> Regenerate Codes
                                 </Button>
                             )}
                         </Form>
diff --git a/resources/js/components/two-factor-setup-modal.tsx b/resources/js/components/two-factor-setup-modal.tsx
@@ -134,7 +134,7 @@ function TwoFactorVerificationStep({ onClose, onBack }: { onClose: () => void; o
                                 Back
                             </Button>
                             <Button type="submit" className="flex-1" disabled={processing || code.length < OTP_MAX_LENGTH}>
-                                {processing ? 'Confirming...' : 'Confirm'}
+                                Confirm
                             </Button>
                         </div>
                     </div>
diff --git a/resources/js/hooks/use-two-factor-auth.ts b/resources/js/hooks/use-two-factor-auth.ts
@@ -1,6 +1,6 @@
 import { qrCode, recoveryCodes, secretKey } from '@/routes/two-factor';
 import { type TwoFactorSecretKey, type TwoFactorSetupData } from '@/types';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useState } from 'react';
 
 export const OTP_MAX_LENGTH = 6;
 
@@ -21,8 +21,6 @@ export const useTwoFactorAuth = () => {
     const [manualSetupKey, setManualSetupKey] = useState<string | null>(null);
     const [recoveryCodesList, setRecoveryCodesList] = useState<string[]>([]);
 
-    const hasSetupData = useMemo<boolean>(() => qrCodeSvg !== null && manualSetupKey !== null, [qrCodeSvg, manualSetupKey]);
-
     const fetchQrCode = useCallback(async (): Promise<void> => {
         try {
             const { svg } = await fetchJson<TwoFactorSetupData>(qrCode.url());
@@ -72,7 +70,6 @@ export const useTwoFactorAuth = () => {
         qrCodeSvg,
         manualSetupKey,
         recoveryCodesList,
-        hasSetupData,
         clearSetupData,
         fetchQrCode,
         fetchSetupKey,
diff --git a/resources/js/pages/settings/two-factor.tsx b/resources/js/pages/settings/two-factor.tsx
@@ -25,7 +25,7 @@ const breadcrumbs: BreadcrumbItem[] = [
 ];
 
 export default function TwoFactor({ requiresConfirmation = false, twoFactorEnabled = false }: TwoFactorProps) {
-    const { hasSetupData, qrCodeSvg, manualSetupKey, clearSetupData, fetchSetupData, recoveryCodesList, fetchRecoveryCodes } = useTwoFactorAuth();
+    const { qrCodeSvg, manualSetupKey, clearSetupData, fetchSetupData, recoveryCodesList, fetchRecoveryCodes } = useTwoFactorAuth();
     const [showSetupModal, setShowSetupModal] = useState<boolean>(false);
 
     return (
@@ -44,21 +44,13 @@ export default function TwoFactor({ requiresConfirmation = false, twoFactorEnabl
                             </p>
 
                             <div>
-                                {hasSetupData ? (
-                                    <Button onClick={() => setShowSetupModal(true)}>
-                                        <ShieldCheck />
-                                        Continue Setup
-                                    </Button>
-                                ) : (
-                                    <Form {...enable.form()} onSuccess={() => setShowSetupModal(true)}>
-                                        {({ processing }) => (
-                                            <Button type="submit" disabled={processing}>
-                                                <ShieldCheck />
-                                                {processing ? 'Enabling...' : 'Enable 2FA'}
-                                            </Button>
-                                        )}
-                                    </Form>
-                                )}
+                                <Form {...enable.form()} onSuccess={() => setShowSetupModal(true)}>
+                                    {({ processing }) => (
+                                        <Button type="submit" disabled={processing}>
+                                            <ShieldCheck /> Enable 2FA
+                                        </Button>
+                                    )}
+                                </Form>
                             </div>
                         </div>
                     ) : (
@@ -75,8 +67,7 @@ export default function TwoFactor({ requiresConfirmation = false, twoFactorEnabl
                                 <Form {...disable.form()}>
                                     {({ processing }) => (
                                         <Button variant="destructive" type="submit" disabled={processing}>
-                                            <ShieldBan />
-                                            {processing ? 'Disabling...' : 'Disable 2FA'}
+                                            <ShieldBan /> Disable 2FA
                                         </Button>
                                     )}
                                 </Form>
diff --git a/tests/Feature/Auth/AuthenticationTest.php b/tests/Feature/Auth/AuthenticationTest.php
@@ -4,6 +4,7 @@
 
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\RateLimiter;
 use Laravel\Fortify\Features;
 use Tests\TestCase;
 
@@ -60,20 +61,6 @@ public function test_users_with_two_factor_enabled_are_redirected_to_two_factor_
         $this->assertGuest();
     }
 
-    public function test_users_without_two_factor_enabled_login_normally()
-    {
-        $user = User::factory()->create();
-
-        $response = $this->post(route('login'), [
-            'email' => $user->email,
-            'password' => 'password',
-        ]);
-
-        $this->assertAuthenticated();
-        $response->assertRedirect(route('dashboard', absolute: false));
-        $response->assertSessionMissing('login.id');
-    }
-
     public function test_users_can_not_authenticate_with_invalid_password()
     {
         $user = User::factory()->create();
@@ -100,14 +87,7 @@ public function test_users_are_rate_limited()
     {
         $user = User::factory()->create();
 
-        for ($i = 0; $i < 5; $i++) {
-            $this->post(route('login.store'), [
-                'email' => $user->email,
-                'password' => 'wrong-password',
-            ])->assertStatus(302)->assertSessionHasErrors([
-                'email' => 'These credentials do not match our records.',
-            ]);
-        }
+        RateLimiter::increment(implode('|', [$user->email, '127.0.0.1']), amount: 10);
 
         $response = $this->post(route('login.store'), [
             'email' => $user->email,
diff --git a/tests/Feature/Auth/PasswordConfirmationTest.php b/tests/Feature/Auth/PasswordConfirmationTest.php
@@ -18,6 +18,7 @@ public function test_confirm_password_screen_can_be_rendered()
         $response = $this->actingAs($user)->get(route('password.confirm'));
 
         $response->assertStatus(200);
+
         $response->assertInertia(fn (Assert $page) => $page
             ->component('auth/confirm-password')
         );
diff --git a/tests/Feature/Auth/TwoFactorChallengeTest.php b/tests/Feature/Auth/TwoFactorChallengeTest.php
@@ -12,7 +12,7 @@ class TwoFactorChallengeTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_two_factor_challenge_redirects_when_not_authenticated(): void
+    public function test_two_factor_challenge_redirects_to_login_when_not_authenticated(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
@@ -23,7 +23,7 @@ public function test_two_factor_challenge_redirects_when_not_authenticated(): vo
         $response->assertRedirect(route('login'));
     }
 
-    public function test_two_factor_challenge_renders_correct_inertia_component(): void
+    public function test_two_factor_challenge_can_be_rendered(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
@@ -53,41 +53,4 @@ public function test_two_factor_challenge_renders_correct_inertia_component(): v
                 ->component('auth/two-factor-challenge')
             );
     }
-
-    public function test_two_factor_authentication_is_rate_limited(): void
-    {
-        if (! Features::enabled(Features::twoFactorAuthentication())) {
-            $this->markTestSkipped('Two-factor authentication is not enabled.');
-        }
-
-        Features::twoFactorAuthentication([
-            'confirm' => true,
-            'confirmPassword' => true,
-        ]);
-
-        $user = User::factory()->create();
-
-        $user->forceFill([
-            'two_factor_secret' => encrypt(implode(range('A', 'P'))),
-            'two_factor_recovery_codes' => encrypt(json_encode(['recovery-code-1', 'recovery-code-2'])),
-            'two_factor_confirmed_at' => now(),
-        ])->save();
-
-        $this->post(route('login'), [
-            'email' => $user->email,
-            'password' => 'password',
-        ]);
-
-        foreach (range(0, 4) as $ignored) {
-            $this->post(route('two-factor.login.store'), [
-                'code' => '000000',
-            ])->assertSessionHasErrors('code');
-        }
-
-        $response = $this->post(route('two-factor.login.store'), [
-            'code' => '000000',
-        ]);
-
-        $response->assertTooManyRequests();
-    }
 }
diff --git a/tests/Feature/Settings/TwoFactorAuthenticationTest.php b/tests/Feature/Settings/TwoFactorAuthenticationTest.php
@@ -12,7 +12,7 @@ class TwoFactorAuthenticationTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_two_factor_settings_page_is_displayed()
+    public function test_two_factor_settings_page_can_be_rendered()
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
@@ -34,7 +34,7 @@ public function test_two_factor_settings_page_is_displayed()
             );
     }
 
-    public function test_two_factor_settings_page_requires_password_confirmation()
+    public function test_two_factor_settings_page_requires_password_confirmation_when_enabled()
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
@@ -53,7 +53,7 @@ public function test_two_factor_settings_page_requires_password_confirmation()
         $response->assertRedirect(route('password.confirm'));
     }
 
-    public function test_two_factor_settings_page_does_not_requires_password_confirmation_if_that_feature_is_disabled()
+    public function test_two_factor_settings_page_does_not_requires_password_confirmation_when_disabled()
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
@@ -74,7 +74,7 @@ public function test_two_factor_settings_page_does_not_requires_password_confirm
             );
     }
 
-    public function test_two_factor_settings_page_returns_forbidden_when_two_factor_is_disabled()
+    public function test_two_factor_settings_page_returns_forbidden_response_when_two_factor_is_disabled()
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
@@ -89,123 +89,4 @@ public function test_two_factor_settings_page_returns_forbidden_when_two_factor_
             ->get(route('two-factor.show'))
             ->assertForbidden();
     }
-
-    public function test_controller_sets_confirming_data_when_enabling_two_factor_with_confirmation()
-    {
-        if (! Features::canManageTwoFactorAuthentication()) {
-            $this->markTestSkipped('Two-factor authentication is not enabled.');
-        }
-
-        Features::twoFactorAuthentication([
-            'confirm' => true,
-            'confirmPassword' => false,
-        ]);
-
-        $user = User::factory()->create();
-
-        $this->actingAs($user)
-            ->withSession(['auth.password_confirmed_at' => time()])
-            ->withSession(['two_factor_empty_at' => time() - 10])
-            ->post(route('two-factor.enable'));
-
-        $this->get(route('two-factor.show'))
-            ->assertOk();
-
-        $this->assertNotNull(session('two_factor_confirming_at'));
-    }
-
-    public function test_user_can_view_setting_page_when_confirm_disabled()
-    {
-        if (! Features::canManageTwoFactorAuthentication()) {
-            $this->markTestSkipped('Two-factor authentication is not enabled.');
-        }
-
-        Features::twoFactorAuthentication([
-            'confirm' => false,
-            'confirmPassword' => false,
-        ]);
-
-        $user = User::factory()->create();
-
-        $this->actingAs($user)
-            ->get(route('two-factor.show'))
-            ->assertOk()
-            ->assertInertia(fn (Assert $page) => $page
-                ->component('settings/two-factor')
-                ->where('requiresConfirmation', false)
-            );
-    }
-
-    public function test_controller_sets_empty_session_data_when_transitioning_to_disabled_state()
-    {
-        if (! Features::canManageTwoFactorAuthentication()) {
-            $this->markTestSkipped('Two-factor authentication is not enabled.');
-        }
-
-        Features::twoFactorAuthentication([
-            'confirm' => true,
-            'confirmPassword' => false,
-        ]);
-
-        $user = User::factory()->create();
-
-        $this->actingAs($user)
-            ->get(route('two-factor.show'))
-            ->assertSessionHas('two_factor_empty_at');
-    }
-
-    public function test_controller_removes_confirming_session_data_when_cleanup_triggered()
-    {
-        if (! Features::canManageTwoFactorAuthentication()) {
-            $this->markTestSkipped('Two-factor authentication is not enabled.');
-        }
-
-        Features::twoFactorAuthentication([
-            'confirm' => true,
-            'confirmPassword' => false,
-        ]);
-
-        $user = User::factory()->create();
-
-        $user->forceFill([
-            'two_factor_secret' => encrypt('test-secret'),
-            'two_factor_recovery_codes' => encrypt(json_encode(['code1', 'code2'])),
-        ])->save();
-
-        $this->actingAs($user)
-            ->withSession(['two_factor_confirming_at' => time() - 100])
-            ->get(route('two-factor.show'))
-            ->assertSessionMissing('two_factor_confirming_at')
-            ->assertSessionHas('two_factor_empty_at');
-    }
-
-    public function test_two_factor_authentication_disabled_when_confirmation_abandoned_between_requests()
-    {
-        if (! Features::canManageTwoFactorAuthentication()) {
-            $this->markTestSkipped('Two-factor authentication is not enabled.');
-        }
-
-        Features::twoFactorAuthentication([
-            'confirm' => true,
-            'confirmPassword' => false,
-        ]);
-
-        $user = User::factory()->create();
-
-        $user->forceFill([
-            'two_factor_secret' => encrypt('test-secret'),
-            'two_factor_recovery_codes' => encrypt(json_encode(['code1', 'code2'])),
-            'two_factor_confirmed_at' => null,
-        ])->save();
-
-        $this->actingAs($user)
-            ->withSession(['two_factor_confirming_at' => time() - 100])
-            ->get(route('two-factor.show'));
-
-        $this->assertDatabaseHas('users', [
-            'id' => $user->id,
-            'two_factor_secret' => null,
-            'two_factor_recovery_codes' => null,
-        ]);
-    }
 }
