+
{{ __('Don\'t have an account?') }}
{{ __('Sign up') }}
diff --git a/resources/views/livewire/auth/two-factor-challenge.blade.php b/resources/views/livewire/auth/two-factor-challenge.blade.php
new file mode 100644
index 00000000..00409651
--- /dev/null
+++ b/resources/views/livewire/auth/two-factor-challenge.blade.php
@@ -0,0 +1,99 @@
+
+
+
diff --git a/resources/views/livewire/settings/two-factor.blade.php b/resources/views/livewire/settings/two-factor.blade.php
new file mode 100644
index 00000000..8981ec09
--- /dev/null
+++ b/resources/views/livewire/settings/two-factor.blade.php
@@ -0,0 +1,206 @@
+
+ @include('partials.settings-heading')
+
+
+
+ @if ($twoFactorEnabled)
+
+
+ {{ __('Enabled') }}
+
+
+
+ {{ __('With two-factor authentication enabled, you will be prompted for a secure, random pin during login, which you can retrieve from the TOTP-supported application on your phone.') }}
+
+
+
+
+
+
+ {{ __('Disable 2FA') }}
+
+
+
+ @else
+
+
+ {{ __('Disabled') }}
+
+
+
+ {{ __('When you enable two-factor authentication, you will be prompted for a secure pin during login. This pin can be retrieved from a TOTP-supported application on your phone.') }}
+
+
+
+ {{ __('Enable 2FA') }}
+
+
+ @endif
+
+
+
+
+
+
+
+
+ @for ($i = 1; $i <= 5; $i++)
+
+ @endfor
+
+
+
+ @for ($i = 1; $i <= 5; $i++)
+
+ @endfor
+
+
+
+
+
+
+
+ {{ $this->modalConfig['title'] }}
+ {{ $this->modalConfig['description'] }}
+
+
+
+ @if ($showVerificationStep)
+
+
+
+ {{ $message }}
+
+ @enderror
+
+
+
+
+ {{ __('Back') }}
+
+
+
+ {{ __('Confirm') }}
+
+
+
+ @else
+ @error('setupData')
+
+ @enderror
+
+
+
+ @empty($qrCodeSvg)
+
+
+ @else
+
+ {!! $qrCodeSvg !!}
+
+ @endempty
+
+
+
+
+
+ {{ $this->modalConfig['buttonText'] }}
+
+
+
+
+
+
+
+ {{ __('or, enter the code manually') }}
+
+
+
+
+
+ @empty($manualSetupKey)
+
+
+ @else
+
+
+
+
+
+
+ @endempty
+
+
+
+ @endif
+
+
diff --git a/resources/views/livewire/settings/two-factor/recovery-codes.blade.php b/resources/views/livewire/settings/two-factor/recovery-codes.blade.php
new file mode 100644
index 00000000..0bce00df
--- /dev/null
+++ b/resources/views/livewire/settings/two-factor/recovery-codes.blade.php
@@ -0,0 +1,89 @@
+
+
+
+ {{ __('2FA Recovery Codes') }}
+
+
+ {{ __('Recovery codes let you regain access if you lose your 2FA device. Store them in a secure password manager.') }}
+
+
+
+
+
+
+ {{ __('View Recovery Codes') }}
+
+
+
+ {{ __('Hide Recovery Codes') }}
+
+
+ @if (filled($recoveryCodes))
+
+ {{ __('Regenerate Codes') }}
+
+ @endif
+
+
+
+
+ @error('recoveryCodes')
+
+ @enderror
+
+ @if (filled($recoveryCodes))
+
+ @foreach($recoveryCodes as $code)
+
+ {{ $code }}
+
+ @endforeach
+
+
+ {{ __('Each recovery code can be used once to access your account and will be removed after use. If you need more, click Regenerate Codes above.') }}
+
+ @endif
+
+
+
+
diff --git a/routes/auth.php b/routes/auth.php
index 031f43cb..3d7863af 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -1,7 +1,7 @@
middleware(['signed', 'throttle:6,1'])
->name('verification.verify');
-
- Route::get('confirm-password', ConfirmPassword::class)
- ->name('password.confirm');
});
-Route::post('logout', App\Livewire\Actions\Logout::class)
+Route::post('logout', Logout::class)
->name('logout');
diff --git a/routes/web.php b/routes/web.php
index 910db328..6c0f8cf5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,7 +3,9 @@
use App\Livewire\Settings\Appearance;
use App\Livewire\Settings\Password;
use App\Livewire\Settings\Profile;
+use App\Livewire\Settings\TwoFactor;
use Illuminate\Support\Facades\Route;
+use Laravel\Fortify\Features;
Route::get('/', function () {
return view('welcome');
@@ -19,6 +21,17 @@
Route::get('settings/profile', Profile::class)->name('settings.profile');
Route::get('settings/password', Password::class)->name('settings.password');
Route::get('settings/appearance', Appearance::class)->name('settings.appearance');
+
+ Route::get('settings/two-factor', TwoFactor::class)
+ ->middleware(
+ when(
+ Features::canManageTwoFactorAuthentication()
+ && Features::optionEnabled(Features::twoFactorAuthentication(), 'confirmPassword'),
+ ['password.confirm'],
+ [],
+ ),
+ )
+ ->name('two-factor.show');
});
require __DIR__.'/auth.php';
diff --git a/tests/Feature/Auth/AuthenticationTest.php b/tests/Feature/Auth/AuthenticationTest.php
index 07088f73..02ba4f2f 100644
--- a/tests/Feature/Auth/AuthenticationTest.php
+++ b/tests/Feature/Auth/AuthenticationTest.php
@@ -5,6 +5,7 @@
use App\Livewire\Auth\Login;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Fortify\Features;
use Livewire\Livewire;
use Tests\TestCase;
@@ -49,6 +50,35 @@ public function test_users_can_not_authenticate_with_invalid_password(): void
$this->assertGuest();
}
+ public function test_users_with_two_factor_enabled_are_redirected_to_two_factor_challenge(): void
+ {
+ if (! Features::canManageTwoFactorAuthentication()) {
+ $this->markTestSkipped('Two-factor authentication is not enabled.');
+ }
+
+ Features::twoFactorAuthentication([
+ 'confirm' => true,
+ 'confirmPassword' => true,
+ ]);
+
+ $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' => now(),
+ ])->save();
+
+ $response = Livewire::test('auth.login')
+ ->set('email', $user->email)
+ ->set('password', 'password')
+ ->call('login');
+
+ $response->assertRedirect(route('two-factor.login'));
+ $response->assertSessionHas('login.id', $user->id);
+ $this->assertGuest();
+ }
+
public function test_users_can_logout(): void
{
$user = User::factory()->create();
diff --git a/tests/Feature/Auth/PasswordConfirmationTest.php b/tests/Feature/Auth/PasswordConfirmationTest.php
index bab6cb48..1b53b110 100644
--- a/tests/Feature/Auth/PasswordConfirmationTest.php
+++ b/tests/Feature/Auth/PasswordConfirmationTest.php
@@ -2,10 +2,8 @@
namespace Tests\Feature\Auth;
-use App\Livewire\Auth\ConfirmPassword;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
-use Livewire\Livewire;
use Tests\TestCase;
class PasswordConfirmationTest extends TestCase
@@ -16,36 +14,8 @@ public function test_confirm_password_screen_can_be_rendered(): void
{
$user = User::factory()->create();
- $response = $this->actingAs($user)->get('/confirm-password');
+ $response = $this->actingAs($user)->get(route('password.confirm'));
$response->assertStatus(200);
}
-
- public function test_password_can_be_confirmed(): void
- {
- $user = User::factory()->create();
-
- $this->actingAs($user);
-
- $response = Livewire::test(ConfirmPassword::class)
- ->set('password', 'password')
- ->call('confirmPassword');
-
- $response
- ->assertHasNoErrors()
- ->assertRedirect(route('dashboard', absolute: false));
- }
-
- public function test_password_is_not_confirmed_with_invalid_password(): void
- {
- $user = User::factory()->create();
-
- $this->actingAs($user);
-
- $response = Livewire::test(ConfirmPassword::class)
- ->set('password', 'wrong-password')
- ->call('confirmPassword');
-
- $response->assertHasErrors(['password']);
- }
}
diff --git a/tests/Feature/Auth/TwoFactorChallengeTest.php b/tests/Feature/Auth/TwoFactorChallengeTest.php
new file mode 100644
index 00000000..5e16870f
--- /dev/null
+++ b/tests/Feature/Auth/TwoFactorChallengeTest.php
@@ -0,0 +1,52 @@
+markTestSkipped('Two-factor authentication is not enabled.');
+ }
+
+ $response = $this->get(route('two-factor.login'));
+
+ $response->assertRedirect(route('login'));
+ }
+
+ public function test_two_factor_challenge_can_be_rendered(): void
+ {
+ if (! Features::canManageTwoFactorAuthentication()) {
+ $this->markTestSkipped('Two-factor authentication is not enabled.');
+ }
+
+ Features::twoFactorAuthentication([
+ 'confirm' => true,
+ 'confirmPassword' => true,
+ ]);
+
+ $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' => now(),
+ ])->save();
+
+ Livewire::test('auth.login')
+ ->set('email', $user->email)
+ ->set('password', 'password')
+ ->call('login')
+ ->assertRedirect(route('two-factor.login'))
+ ->assertOk();
+ }
+}
diff --git a/tests/Feature/Settings/TwoFactorAuthenticationTest.php b/tests/Feature/Settings/TwoFactorAuthenticationTest.php
new file mode 100644
index 00000000..6e9b8fc3
--- /dev/null
+++ b/tests/Feature/Settings/TwoFactorAuthenticationTest.php
@@ -0,0 +1,86 @@
+markTestSkipped('Two-factor authentication is not enabled.');
+ }
+
+ Features::twoFactorAuthentication([
+ 'confirm' => true,
+ 'confirmPassword' => true,
+ ]);
+ }
+
+ public function test_two_factor_settings_page_can_be_rendered(): void
+ {
+ $user = User::factory()->create();
+
+ $this->actingAs($user)
+ ->withSession(['auth.password_confirmed_at' => time()])
+ ->get(route('two-factor.show'))
+ ->assertOk()
+ ->assertSee('Two Factor Authentication')
+ ->assertSee('Disabled');
+ }
+
+ public function test_two_factor_settings_page_requires_password_confirmation_when_enabled(): void
+ {
+ $user = User::factory()->create();
+
+ $response = $this->actingAs($user)
+ ->get(route('two-factor.show'));
+
+ $response->assertRedirect(route('password.confirm'));
+ }
+
+ public function test_two_factor_settings_page_returns_forbidden_response_when_two_factor_is_disabled(): void
+ {
+ config(['fortify.features' => []]);
+
+ $user = User::factory()->create();
+
+ $response = $this->actingAs($user)
+ ->withSession(['auth.password_confirmed_at' => time()])
+ ->get(route('two-factor.show'));
+
+ $response->assertForbidden();
+ }
+
+ public function test_two_factor_authentication_disabled_when_confirmation_abandoned_between_requests(): void
+ {
+ $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);
+
+ $component = Livewire::test('settings.two-factor');
+
+ $component->assertSet('twoFactorEnabled', false);
+
+ $this->assertDatabaseHas('users', [
+ 'id' => $user->id,
+ 'two_factor_secret' => null,
+ 'two_factor_recovery_codes' => null,
+ ]);
+ }
+}