Merge branch '3.x' of github.com:vormkracht10/filament-two-factor-auth into 3.x

Author: Baspa

src/Enums/TwoFactorType.php

@@ -2,8 +2,8 @@
 
 namespace Backstage\TwoFactorAuth\Enums;
 
-use Filament\Support\Contracts\HasLabel;
 use Backstage\TwoFactorAuth\Traits\EnumArraySerializableTrait;
+use Filament\Support\Contracts\HasLabel;
 
 enum TwoFactorType: string implements HasLabel
 {

src/Http/Livewire/Auth/Login.php

@@ -2,6 +2,8 @@
 
 namespace Backstage\TwoFactorAuth\Http\Livewire\Auth;
 
+use Backstage\TwoFactorAuth\Http\Middleware\RedirectIfTwoFactorAuthenticatable;
+use Backstage\TwoFactorAuth\Http\Responses\LoginResponse;
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
@@ -23,8 +25,6 @@
 use Laravel\Fortify\Features;
 use Laravel\Fortify\Fortify;
 use Livewire\Features\SupportRedirects\Redirector;
-use Backstage\TwoFactorAuth\Http\Middleware\RedirectIfTwoFactorAuthenticatable;
-use Backstage\TwoFactorAuth\Http\Responses\LoginResponse;
 
 class Login extends BaseLogin
 {

src/Http/Livewire/Auth/LoginTwoFactor.php

@@ -2,6 +2,8 @@
 
 namespace Backstage\TwoFactorAuth\Http\Livewire\Auth;
 
+use Backstage\TwoFactorAuth\Enums\TwoFactorType;
+use Backstage\TwoFactorAuth\Notifications\SendOTP;
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Filament\Actions\Action;
@@ -16,8 +18,6 @@
 use Laravel\Fortify\Http\Requests\TwoFactorLoginRequest;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Reactive;
-use Backstage\TwoFactorAuth\Enums\TwoFactorType;
-use Backstage\TwoFactorAuth\Notifications\SendOTP;
 
 class LoginTwoFactor extends Page implements HasActions, HasForms
 {

src/Http/Livewire/Auth/Register.php

@@ -2,8 +2,8 @@
 
 namespace Backstage\TwoFactorAuth\Http\Livewire\Auth;
 
-use Filament\Pages\Auth\Register as BaseRegister;
 use Backstage\TwoFactorAuth\Http\Responses\RegistrationResponse;
+use Filament\Pages\Auth\Register as BaseRegister;
 
 class Register extends BaseRegister
 {

src/Listeners/SendTwoFactorCodeListener.php

@@ -2,9 +2,9 @@
 
 namespace Backstage\TwoFactorAuth\Listeners;
 
+use Backstage\TwoFactorAuth\Notifications\SendOTP;
 use Laravel\Fortify\Events\TwoFactorAuthenticationChallenged;
 use Laravel\Fortify\Events\TwoFactorAuthenticationEnabled;
-use Backstage\TwoFactorAuth\Notifications\SendOTP;
 
 class SendTwoFactorCodeListener
 {

src/Notifications/SendOTP.php

@@ -2,16 +2,16 @@
 
 namespace Backstage\TwoFactorAuth\Notifications;
 
+use Backstage\TwoFactorAuth\Actions\GenerateOTP;
+use Backstage\TwoFactorAuth\Enums\TwoFactorType;
+use Backstage\TwoFactorAuth\Mail\TwoFactorCodeMail;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Notifications\Notification;
 use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException;
 use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;
 use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException;
-use Backstage\TwoFactorAuth\Actions\GenerateOTP;
-use Backstage\TwoFactorAuth\Enums\TwoFactorType;
-use Backstage\TwoFactorAuth\Mail\TwoFactorCodeMail;
 
 class SendOTP extends Notification implements ShouldQueue
 {

src/TwoFactorAuthPlugin.php

@@ -2,13 +2,13 @@
 
 namespace Backstage\TwoFactorAuth;
 
+use Backstage\TwoFactorAuth\Http\Middleware\ForceTwoFactor;
+use Backstage\TwoFactorAuth\Pages\TwoFactor;
 use Closure;
 use Filament\Contracts\Plugin;
 use Filament\Navigation\MenuItem;
 use Filament\Panel;
 use Filament\Support\Concerns\EvaluatesClosures;
-use Backstage\TwoFactorAuth\Http\Middleware\ForceTwoFactor;
-use Backstage\TwoFactorAuth\Pages\TwoFactor;
 
 class TwoFactorAuthPlugin implements Plugin
 {

src/TwoFactorAuthServiceProvider.php

@@ -2,6 +2,12 @@
 
 namespace Backstage\TwoFactorAuth;
 
+use Backstage\TwoFactorAuth\Commands\TwoFactorAuthCommand;
+use Backstage\TwoFactorAuth\Enums\TwoFactorType;
+use Backstage\TwoFactorAuth\Http\Responses\LoginResponse;
+use Backstage\TwoFactorAuth\Http\Responses\TwoFactorChallengeViewResponse;
+use Backstage\TwoFactorAuth\Http\Responses\TwoFactorLoginResponse;
+use Backstage\TwoFactorAuth\Testing\TestsTwoFactorAuth;
 use Filament\Facades\Filament;
 use Filament\Support\Assets\AlpineComponent;
 use Filament\Support\Assets\Asset;
@@ -29,12 +35,6 @@
 use Spatie\LaravelPackageTools\Commands\InstallCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Backstage\TwoFactorAuth\Commands\TwoFactorAuthCommand;
-use Backstage\TwoFactorAuth\Enums\TwoFactorType;
-use Backstage\TwoFactorAuth\Http\Responses\LoginResponse;
-use Backstage\TwoFactorAuth\Http\Responses\TwoFactorChallengeViewResponse;
-use Backstage\TwoFactorAuth\Http\Responses\TwoFactorLoginResponse;
-use Backstage\TwoFactorAuth\Testing\TestsTwoFactorAuth;
 
 class TwoFactorAuthServiceProvider extends PackageServiceProvider
 {

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace Backstage\TwoFactorAuth\Tests;
 
+use Backstage\TwoFactorAuth\TwoFactorAuthServiceProvider;
 use BladeUI\Heroicons\BladeHeroiconsServiceProvider;
 use BladeUI\Icons\BladeIconsServiceProvider;
 use Filament\Actions\ActionsServiceProvider;
@@ -16,7 +17,6 @@
 use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 use RyanChandler\BladeCaptureDirective\BladeCaptureDirectiveServiceProvider;
-use Backstage\TwoFactorAuth\TwoFactorAuthServiceProvider;
 
 class TestCase extends Orchestra
 {