Formatting

Author: pushpak1300

app/Livewire/Auth/Login.php

@@ -25,6 +25,9 @@ class Login extends Component
 
     public bool $remember = false;
 
+    /**
+     * Handle an incoming authentication request.
+     */
     public function login(): void
     {
         $this->validate();
@@ -52,6 +55,9 @@ public function login(): void
         $this->redirectIntended(default: route('dashboard', absolute: false), navigate: true);
     }
 
+    /**
+     * Validate the user's credentials.
+     */
     protected function validateCredentials(): User
     {
         $user = Auth::getProvider()->retrieveByCredentials(['email' => $this->email, 'password' => $this->password]);
@@ -67,6 +73,9 @@ protected function validateCredentials(): User
         return $user;
     }
 
+    /**
+     * Ensure the authentication request is not rate limited.
+     */
     protected function ensureIsNotRateLimited(): void
     {
         if (! RateLimiter::tooManyAttempts($this->throttleKey(), 5)) {
@@ -85,6 +94,9 @@ protected function ensureIsNotRateLimited(): void
         ]);
     }
 
+    /**
+     * Get the authentication rate limiting throttle key.
+     */
     protected function throttleKey(): string
     {
         return Str::transliterate(Str::lower($this->email).'|'.request()->ip());

app/Livewire/Settings/TwoFactor.php

@@ -34,6 +34,9 @@ class TwoFactor extends Component
     #[Validate('required|string|size:6', onUpdate: false)]
     public string $code = '';
 
+    /**
+     * Mount the component.
+     */
     public function mount(DisableTwoFactorAuthentication $disableTwoFactorAuthentication): void
     {
         abort_unless(Features::enabled(Features::twoFactorAuthentication()), Response::HTTP_FORBIDDEN);
@@ -46,6 +49,9 @@ public function mount(DisableTwoFactorAuthentication $disableTwoFactorAuthentica
         $this->requiresConfirmation = Features::optionEnabled(Features::twoFactorAuthentication(), 'confirm');
     }
 
+    /**
+     * Enable two-factor authentication for the user.
+     */
     public function enable(EnableTwoFactorAuthentication $enableTwoFactorAuthentication): void
     {
         $enableTwoFactorAuthentication(auth()->user());
@@ -54,53 +60,36 @@ public function enable(EnableTwoFactorAuthentication $enableTwoFactorAuthenticat
             $this->twoFactorEnabled = auth()->user()->hasEnabledTwoFactorAuthentication();
         }
 
-        $this->loadTwoFactorData();
-        $this->showModal = true;
-    }
+        $this->loadSetupData();
 
-    public function disable(DisableTwoFactorAuthentication $disableTwoFactorAuthentication): void
-    {
-        $disableTwoFactorAuthentication(auth()->user());
-        $this->twoFactorEnabled = false;
+        $this->showModal = true;
     }
 
-    public function confirmTwoFactor(ConfirmTwoFactorAuthentication $confirmTwoFactorAuthentication): void
+    /**
+     * Load the two-factor authentication setup data for the user.
+     */
+    private function loadSetupData(): void
     {
-        $this->validate();
-        $confirmTwoFactorAuthentication(auth()->user(), $this->code);
-        $this->closeModal();
-        $this->twoFactorEnabled = true;
-    }
+        $user = auth()->user();
 
-    public function getModalConfigProperty(): array
-    {
-        if ($this->twoFactorEnabled) {
-            return [
-                'title' => __('Two-Factor Authentication Enabled'),
-                'description' => __('Two-factor authentication is now enabled. Scan the QR code or enter the setup key in your authenticator app.'),
-                'buttonText' => __('Close'),
-            ];
-        }
+        try {
+            $this->qrCodeSvg = $user?->twoFactorQrCodeSvg();
+            $this->manualSetupKey = decrypt($user->two_factor_secret);
+        } catch (Exception) {
+            $this->addError('setupData', 'Failed to fetch setup data.');
 
-        if ($this->showVerificationStep) {
-            return [
-                'title' => __('Verify Authentication Code'),
-                'description' => __('Enter the 6-digit code from your authenticator app'),
-                'buttonText' => __('Continue'),
-            ];
+            $this->reset('qrCodeSvg', 'manualSetupKey');
         }
-
-        return [
-            'title' => __('Enable Two-Factor Authentication'),
-            'description' => __('To finish enabling two-factor authentication, scan the QR code or enter the setup key in your authenticator app'),
-            'buttonText' => __('Continue'),
-        ];
     }
 
-    public function handleNextAction(): void
+    /**
+     * Show the two-factor verification step if necessary.
+     */
+    public function showVerificationIfNecessary(): void
     {
         if ($this->requiresConfirmation) {
             $this->showVerificationStep = true;
+
             $this->resetErrorBag();
 
             return;
@@ -109,38 +98,85 @@ public function handleNextAction(): void
         $this->closeModal();
     }
 
+    /**
+     * Confirm two-factor authentication for the user.
+     */
+    public function confirmTwoFactor(ConfirmTwoFactorAuthentication $confirmTwoFactorAuthentication): void
+    {
+        $this->validate();
+
+        $confirmTwoFactorAuthentication(auth()->user(), $this->code);
+
+        $this->closeModal();
+
+        $this->twoFactorEnabled = true;
+    }
+
+    /**
+     * Reset two-factor verification state.
+     */
     public function resetVerification(): void
     {
         $this->reset('code', 'showVerificationStep');
+
         $this->resetErrorBag();
     }
 
+    /**
+     * Disable two-factor authentication for the user.
+     */
+    public function disable(DisableTwoFactorAuthentication $disableTwoFactorAuthentication): void
+    {
+        $disableTwoFactorAuthentication(auth()->user());
+
+        $this->twoFactorEnabled = false;
+    }
+
+    /**
+     * Close the two-factor authentication modal.
+     */
     public function closeModal(): void
     {
         $this->reset(
             'code',
-            'showVerificationStep',
             'manualSetupKey',
             'qrCodeSvg',
             'showModal',
+            'showVerificationStep',
         );
+
         $this->resetErrorBag();
 
         if (! $this->requiresConfirmation) {
             $this->twoFactorEnabled = auth()->user()->hasEnabledTwoFactorAuthentication();
         }
     }
 
-    private function loadTwoFactorData(): void
+    /**
+     * Get the current modal configuration state.
+     */
+    public function getModalConfigProperty(): array
     {
-        $user = auth()->user();
+        if ($this->twoFactorEnabled) {
+            return [
+                'title' => __('Two-Factor Authentication Enabled'),
+                'description' => __('Two-factor authentication is now enabled. Scan the QR code or enter the setup key in your authenticator app.'),
+                'buttonText' => __('Close'),
+            ];
+        }
 
-        try {
-            $this->qrCodeSvg = $user?->twoFactorQrCodeSvg();
-            $this->manualSetupKey = decrypt($user->two_factor_secret);
-        } catch (Exception) {
-            $this->addError('setupData', 'Failed to fetch setup data.');
-            $this->reset('qrCodeSvg', 'manualSetupKey');
+        if ($this->showVerificationStep) {
+            return [
+                'title' => __('Verify Authentication Code'),
+                'description' => __('Enter the 6-digit code from your authenticator app.'),
+                'buttonText' => __('Continue'),
+            ];
         }
+
+        return [
+            'title' => __('Enable Two-Factor Authentication'),
+            'description' => __('To finish enabling two-factor authentication, scan the QR code or enter the setup key in your authenticator app.'),
+            'buttonText' => __('Continue'),
+        ];
     }
 }

app/Livewire/Settings/TwoFactor/RecoveryCodes.php

@@ -12,17 +12,27 @@ class RecoveryCodes extends Component
     #[Locked]
     public array $recoveryCodes = [];
 
+    /**
+     * Mount the component.
+     */
     public function mount(): void
     {
         $this->loadRecoveryCodes();
     }
 
+    /**
+     * Generate new recovery codes for the user.
+     */
     public function regenerateRecoveryCodes(GenerateNewRecoveryCodes $generateNewRecoveryCodes): void
     {
         $generateNewRecoveryCodes(auth()->user());
+
         $this->loadRecoveryCodes();
     }
 
+    /**
+     * Load the recovery codes for the user.
+     */
     private function loadRecoveryCodes(): void
     {
         $user = auth()->user();
@@ -32,6 +42,7 @@ private function loadRecoveryCodes(): void
                 $this->recoveryCodes = json_decode(decrypt($user->two_factor_recovery_codes), true);
             } catch (Exception) {
                 $this->addError('recoveryCodes', 'Failed to load recovery codes');
+
                 $this->recoveryCodes = [];
             }
         }

resources/views/livewire/auth/login.blade.php

@@ -29,7 +29,7 @@
             />
 
             @if (Route::has('password.request'))
-                <flux:link class="absolute end-0 top-0 text-sm" :href="route('password.request')" wire:navigate>
+                <flux:link class="absolute top-0 text-sm end-0" :href="route('password.request')" wire:navigate>
                     {{ __('Forgot your password?') }}
                 </flux:link>
             @endif
@@ -39,12 +39,14 @@
         <flux:checkbox wire:model="remember" :label="__('Remember me')" />
 
         <div class="flex items-center justify-end">
-            <flux:button variant="primary" type="submit" class="w-full">{{ __('Log in') }}</flux:button>
+            <flux:button variant="primary" type="submit" class="w-full" data-test="login-button">
+                {{ __('Log in') }}
+            </flux:button>
         </div>
     </form>
 
     @if (Route::has('register'))
-        <div class="space-x-1 rtl:space-x-reverse text-center text-sm text-zinc-600 dark:text-zinc-400">
+        <div class="space-x-1 text-sm text-center rtl:space-x-reverse text-zinc-600 dark:text-zinc-400">
             <span>{{ __('Don\'t have an account?') }}</span>
             <flux:link :href="route('register')" wire:navigate>{{ __('Sign up') }}</flux:link>
         </div>

resources/views/livewire/auth/two-factor-challenge.blade.php

@@ -5,12 +5,11 @@ class="relative w-full h-auto"
             x-cloak
             x-data="{
                 showRecoveryInput: @js($errors->has('recovery_code')),
-
                 code: '',
                 recovery_code: '',
-
                 toggleInput() {
                     this.showRecoveryInput = !this.showRecoveryInput;
+
                     this.code = '';
                     this.recovery_code = '';
 
@@ -58,6 +57,7 @@ class="relative w-full h-auto"
                             </flux:text>
                         @enderror
                     </div>
+
                     <div x-show="showRecoveryInput">
                         <div class="my-5">
                             <flux:input

resources/views/livewire/settings/two-factor.blade.php

@@ -11,10 +11,13 @@
                     <div class="flex items-center gap-3">
                         <flux:badge color="green">{{ __('Enabled') }}</flux:badge>
                     </div>
+
                     <flux:text>
                         {{ __('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.') }}
                     </flux:text>
+
                     <livewire:settings.two-factor.recovery-codes :$requiresConfirmation/>
+
                     <div class="flex justify-start">
                         <flux:button
                             variant="danger"
@@ -31,9 +34,11 @@
                     <div class="flex items-center gap-3">
                         <flux:badge color="red">{{ __('Disabled') }}</flux:badge>
                     </div>
+
                     <flux:text variant="subtle">
                         {{ __('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.') }}
                     </flux:text>
+
                     <flux:button
                         variant="primary"
                         icon="shield-check"
@@ -62,14 +67,17 @@ class="max-w-md md:min-w-md"
                                 <div></div>
                             @endfor
                         </div>
+
                         <div class="flex flex-col items-stretch absolute w-full h-full divide-y [&>div]:flex-1 inset-0 divide-stone-200 dark:divide-stone-300 justify-around opacity-50">
                             @for ($i = 1; $i <= 5; $i++)
                                 <div></div>
                             @endfor
                         </div>
+
                         <flux:icon.qr-code class="relative z-20 dark:text-accent-foreground"/>
                     </div>
                 </div>
+
                 <div class="space-y-2 text-center">
                     <flux:heading size="lg">{{ $this->modalConfig['title'] }}</flux:heading>
                     <flux:text>{{ $this->modalConfig['description'] }}</flux:text>
@@ -100,6 +108,7 @@ class="flex-1"
                         >
                             {{ __('Back') }}
                         </flux:button>
+
                         <flux:button
                             variant="primary"
                             class="flex-1"
@@ -128,23 +137,26 @@ class="flex-1"
                         @endempty
                     </div>
                 </div>
+
                 <div>
                     <flux:button
                         :disabled="$errors->has('setupData')"
                         variant="primary"
                         class="w-full"
-                        wire:click="handleNextAction"
+                        wire:click="showVerificationIfNecessary"
                     >
                         {{ $this->modalConfig['buttonText'] }}
                     </flux:button>
                 </div>
+
                 <div class="space-y-4">
                     <div class="relative flex items-center justify-center w-full">
                         <div class="absolute inset-0 w-full h-px top-1/2 bg-stone-200 dark:bg-stone-600"></div>
                         <span class="relative px-2 text-sm bg-white dark:bg-stone-800 text-stone-600 dark:text-stone-400">
                             {{ __('or, enter the code manually') }}
                         </span>
                     </div>
+
                     <div
                         class="flex items-center space-x-2"
                         x-data="{
@@ -172,6 +184,7 @@ class="flex items-center space-x-2"
                                     value="{{ $manualSetupKey }}"
                                     class="w-full p-3 bg-transparent outline-none text-stone-900 dark:text-stone-100"
                                 />
+
                                 <button
                                     @click="copy()"
                                     class="px-3 transition-colors border-l cursor-pointer border-stone-200 dark:border-stone-600"