Merge pull request #80 from stephenjude/main

Chore: Middleware Usage & Translation Fixes

Author: stephenjude

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to `filament-two-factor-authentication` will be documented in this file.
 
+## 3.0.3 - 2025-08-17
+
+### What's Changed
+
+* Add constructor property promotion support for events by @stephenjude in https://github.com/stephenjude/filament-two-factor-authentication/pull/78
+* Improvements: Switch 2FA challenge from hash validation to decrypt validation and Cleanup translation usage. by @stephenjude in https://github.com/stephenjude/filament-two-factor-authentication/pull/79
+
+**Full Changelog**: https://github.com/stephenjude/filament-two-factor-authentication/compare/3.0.2...3.0.3
+
 ## 3.0.2 - 2025-08-17
 
 ### What's Changed

resources/lang/en/components.php

@@ -41,7 +41,7 @@
         'login' => 'Login with Passkey',
         'tootip' => 'Use Face ID, fingerprint, or PIN',
         'notice' => [
-            'header' => 'Passkeys are a passwordless login method using your device’s biometric authentication (fingerprint, Face ID, Windows Hello, etc.). Instead of typing a password, you approve login on your trusted device.',
+            'header' => 'Passkeys are a passwordless login method using your device’s biometric authentication. Instead of typing a password, you approve login on your trusted device.',
         ],
     ],
 ];

resources/views/components/logout.blade.php

@@ -1,8 +1,9 @@
-<div class="flex justify-center w-full">
-    <form method="POST" action="{{ filament()->getCurrentOrDefaultPanel()->getLogoutUrl() }}">
-        @csrf
-        <x-filament::link style="align-center" tag="button" type="submit" weight="semibold">
-            {{__('filament-two-factor-authentication::components.logout.button')}}
-        </x-filament::link>
-    </form>
-</div>
+<form
+    style="display: flex; justify-content: center; align-items: center;"
+    method="POST"
+    action="{{ filament()->getCurrentOrDefaultPanel()->getLogoutUrl() }}">
+    @csrf
+    <x-filament::link tag="button" type="submit" weight="semibold">
+        {{__('filament-two-factor-authentication::components.logout.button')}}
+    </x-filament::link>
+</form>

resources/views/pages/challenge.blade.php

@@ -13,6 +13,4 @@
         />
     </form>
 
-    <x-filament-two-factor-authentication::logout />
-
 </x-filament-panels::page.simple>

resources/views/pages/recovery.blade.php

@@ -12,7 +12,4 @@
             :full-width="$this->hasFullWidthFormActions()"
         />
     </form>
-
-    <x-filament-two-factor-authentication::logout />
-
 </x-filament-panels::page.simple>

src/TwoFactorAuthenticationPlugin.php

@@ -3,8 +3,8 @@
 namespace Stephenjude\FilamentTwoFactorAuthentication;
 
 use Closure;
+use Filament\Actions\Action;
 use Filament\Contracts\Plugin;
-use Filament\Navigation\MenuItem;
 use Filament\Panel;
 use Filament\Support\Concerns\EvaluatesClosures;
 use Filament\View\PanelsRenderHook;
@@ -75,16 +75,19 @@ public function register(Panel $panel): void
             ->routes(fn () => [
                 Route::get('/two-factor-challenge', Challenge::class)->name('two-factor.challenge'),
                 Route::get('/two-factor-recovery', Recovery::class)->name('two-factor.recovery'),
-                Route::get('/two-factor-setup', Setup::class)->name('two-factor.setup'),
-                Route::prefix('passkeys')->group(function () {
-                    Route::get('authentication-options', GeneratePasskeyAuthenticationOptionsController::class)
-                        ->name('passkeys.authentication_options');
-                    Route::post('authenticate', AuthenticateUsingPasskeyController::class)
-                        ->name('passkeys.login');
-                }),
+                Route::get('/two-factor-setup', Setup::class)
+                    ->name('two-factor.setup')
+                    ->middleware($this->getTwoFactorChallengeMiddleware()),
+                Route::prefix('passkeys')
+                    ->group(function () {
+                        Route::get('authentication-options', GeneratePasskeyAuthenticationOptionsController::class)
+                            ->name('passkeys.authentication_options');
+                        Route::post('authenticate', AuthenticateUsingPasskeyController::class)
+                            ->name('passkeys.login');
+                    }),
             ])
             ->userMenuItems([
-                MenuItem::make()
+                Action::make('two-factor-settings')
                     ->visible($this->hasTwoFactorMenuItem())
                     ->url(fn (): string => $panel->route('two-factor.setup'))
                     ->label(fn () => __($this->getTwoFactorMenuItemLabel()))