reset password

app/Actions/Fortify/CreateNewUser.php

@@ -24,7 +24,7 @@ class CreateNewUser implements CreatesNewUsers
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
             'password' => $this->passwordRules(),
             'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '',
-        ])->validate();
+        ], $this->passwordValidationMessages())->validate();
 
         return User::create([
             'name' => $input['name'],

app/Actions/Fortify/PasswordValidationRules.php

@@ -2,7 +2,7 @@
 
 namespace App\Actions\Fortify;
 
-use Illuminate\Validation\Rules\Password;
+use App\Support\PasswordRequirements;
 
 trait PasswordValidationRules
 {
@@ -13,6 +13,14 @@ trait PasswordValidationRules
      */
     protected function passwordRules(): array
     {
-        return ['required', 'string', Password::default(), 'confirmed'];
+        return ['required', 'string', PasswordRequirements::rule(), 'confirmed'];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function passwordValidationMessages(): array
+    {
+        return PasswordRequirements::messages();
     }
 }

app/Actions/Fortify/ResetUserPassword.php

@@ -20,7 +20,7 @@ class ResetUserPassword implements ResetsUserPasswords
     {
         Validator::make($input, [
             'password' => $this->passwordRules(),
-        ])->validate();
+        ], $this->passwordValidationMessages())->validate();
 
         $user->forceFill([
             'password' => Hash::make($input['password']),

app/Actions/Fortify/UpdateUserPassword.php

@@ -21,9 +21,9 @@ class UpdateUserPassword implements UpdatesUserPasswords
         Validator::make($input, [
             'current_password' => ['required', 'string', 'current_password:web'],
             'password' => $this->passwordRules(),
-        ], [
+        ], array_merge($this->passwordValidationMessages(), [
             'current_password.current_password' => __('The provided password does not match your current password.'),
-        ])->validateWithBag('updatePassword');
+        ]))->validateWithBag('updatePassword');
 
         $user->forceFill([
             'password' => Hash::make($input['password']),

app/Http/Controllers/UserController.php

@@ -26,6 +26,7 @@ use Intervention\Image\ImageManager;
 use Intervention\Image\Drivers\Gd\Driver;
 use Illuminate\Support\Facades\Validator;
 use App\Models\Role;
+use App\Support\PasswordRequirements;
 
 class UserController extends Controller implements HasMiddleware
 {
@@ -252,11 +253,10 @@ class UserController extends Controller implements HasMiddleware
 
           $validated = $request->validate([
             'current_password' => ['required', 'string', 'current_password:web'],
-            'password' => ['required', 'string', 'confirmed', \Illuminate\Validation\Rules\Password::default()],
-          ], [
+            'password' => ['required', 'string', 'confirmed', PasswordRequirements::rule()],
+          ], array_merge(PasswordRequirements::messages(), [
             'current_password.current_password' => 'La password attuale non è corretta.',
-            'password.confirmed' => 'La conferma password non coincide.',
-          ]);
+          ]));
 
           $user->forceFill([
             'password' => Hash::make($validated['password']),

app/Models/User.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Models;
 
+use App\Notifications\ResetPasswordNotification;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -156,4 +157,9 @@ class User extends \App\Models\AbstractModels\AbstractUser
       ->whereNotNull('email')
       ->get();
   }
+
+  public function sendPasswordResetNotification($token): void
+  {
+    $this->notify(new ResetPasswordNotification($token));
+  }
 }

app/Notifications/ResetPasswordNotification.php

@@ -2,63 +2,30 @@
 
 namespace App\Notifications;
 
+use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class ResetPasswordNotification extends Notification implements ShouldQueue
+class ResetPasswordNotification extends ResetPassword implements ShouldQueue
 {
   use Queueable;
-  public $url = "";
 
   /**
-  * Create a new notification instance.
-  *
-  * @return void
-  */
-  public function __construct($url)
-  {
-    $this->url = $url;
-  }
-
-  /**
-  * Get the notification's delivery channels.
-  *
-  * @param  mixed  $notifiable
-  * @return array
-  */
-  public function via($notifiable)
-  {
-    return ['mail'];
-  }
-
-  /**
-  * Get the mail representation of the notification.
-  *
-  * @param  mixed  $notifiable
-  * @return \Illuminate\Notifications\Messages\MailMessage
-  */
+   * Get the mail representation of the notification.
+   *
+   * @param  mixed  $notifiable
+   * @return \Illuminate\Notifications\Messages\MailMessage
+   */
   public function toMail($notifiable)
   {
-    return (new MailMessage)
-    ->subject('Reset password')
-    ->line('Hai ricevuto questa email perché abbiamo ricevuto una richiesta di reimpostazione della password per il tuo account.')
-    ->action('Reset Password', $this->url)
-    ->line('Questo link per la reimpostazione della password scadrà tra 60 minuti.')
-    ->line('Se non hai richiesto la reimpostazione della password, non sono necessarie ulteriori azioni.');
-  }
+    $expire = (int) config('auth.passwords.users.expire', 60);
 
-  /**
-  * Get the array representation of the notification.
-  *
-  * @param  mixed  $notifiable
-  * @return array
-  */
-  public function toArray($notifiable)
-  {
-    return [
-      //
-    ];
+    return (new MailMessage)
+      ->subject('Reimposta la password')
+      ->line('Hai ricevuto questa email perché abbiamo ricevuto una richiesta di reimpostazione della password per il tuo account.')
+      ->action('Reimposta la password', $this->resetUrl($notifiable))
+      ->line("Questo link per la reimpostazione della password scadrà tra {$expire} minuti.")
+      ->line('Se non hai richiesto la reimpostazione della password, non sono necessarie ulteriori azioni.');
   }
 }

app/Support/PasswordRequirements.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Support;
+
+use Illuminate\Validation\Rules\Password;
+
+class PasswordRequirements
+{
+    public const HINT = 'La password deve contenere almeno 6 caratteri, un numero e un simbolo.';
+
+    public static function rule(): Password
+    {
+        return Password::min(6)->numbers()->symbols();
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public static function messages(): array
+    {
+        return [
+            'password.min' => 'La password deve contenere almeno 6 caratteri.',
+            'password.numbers' => 'La password deve contenere almeno un numero.',
+            'password.symbols' => 'La password deve contenere almeno un simbolo.',
+            'password.confirmed' => 'La conferma della password non corrisponde.',
+        ];
+    }
+}

lang/it.json

@@ -89,6 +89,12 @@
   "Resend Verification Email": "Invia nuovamente email di verifica",
   "Reset Content": "Resetta il contenuto",
   "Reset Password": "Resetta la password",
+  "Reset Password Notification": "Reimposta la password",
+  "You are receiving this email because we received a password reset request for your account.": "Hai ricevuto questa email perché abbiamo ricevuto una richiesta di reimpostazione della password per il tuo account.",
+  "This password reset link will expire in :count minutes.": "Questo link per la reimpostazione della password scadrà tra :count minuti.",
+  "If you did not request a password reset, no further action is required.": "Se non hai richiesto la reimpostazione della password, non sono necessarie ulteriori azioni.",
+  "Hello!": "Ciao!",
+  "Regards": "Cordiali saluti",
   "Retry With": "Riprova con",
   "Save": "Salva",
   "Saved.": "Salvato.",

resources/views/profile/edit_profile.blade.php

@@ -260,6 +260,7 @@
           <div class="mb-3">
             <label class="form-label" for="password">Nuova password</label>
             <input type="password" class="form-control @error('password') is-invalid @enderror" id="password" name="password" autocomplete="new-password" required>
+            <div class="form-text">{{ \App\Support\PasswordRequirements::HINT }}</div>
             @error('password')
             <div class="invalid-feedback">{{ $message }}</div>
             @enderror

tests/Feature/PasswordResetTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Feature;
 
 use App\Models\User;
-use Illuminate\Auth\Notifications\ResetPassword;
+use App\Notifications\ResetPasswordNotification;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;
 use Laravel\Fortify\Features;
@@ -38,7 +38,7 @@ class PasswordResetTest extends TestCase
             'email' => $user->email,
         ]);
 
-        Notification::assertSentTo($user, ResetPassword::class);
+        Notification::assertSentTo($user, ResetPasswordNotification::class);
     }
 
     public function test_reset_password_screen_can_be_rendered(): void
@@ -55,7 +55,7 @@ class PasswordResetTest extends TestCase
             'email' => $user->email,
         ]);
 
-        Notification::assertSentTo($user, ResetPassword::class, function (object $notification) {
+        Notification::assertSentTo($user, ResetPasswordNotification::class, function (object $notification) {
             $response = $this->get('/reset-password/'.$notification->token);
 
             $response->assertStatus(200);
@@ -78,12 +78,12 @@ class PasswordResetTest extends TestCase
             'email' => $user->email,
         ]);
 
-        Notification::assertSentTo($user, ResetPassword::class, function (object $notification) use ($user) {
+        Notification::assertSentTo($user, ResetPasswordNotification::class, function (object $notification) use ($user) {
             $response = $this->post('/reset-password', [
                 'token' => $notification->token,
                 'email' => $user->email,
-                'password' => 'password',
-                'password_confirmation' => 'password',
+                'password' => 'Password1!',
+                'password_confirmation' => 'Password1!',
             ]);
 
             $response->assertSessionHasNoErrors();

tests/Feature/RegistrationTest.php

@@ -42,8 +42,8 @@ class RegistrationTest extends TestCase
         $response = $this->post('/register', [
             'name' => 'Test User',
             'email' => 'test@example.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
+            'password' => 'Password1!',
+            'password_confirmation' => 'Password1!',
             'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
         ]);
 

tests/Feature/UpdatePasswordTest.php

@@ -20,12 +20,12 @@ class UpdatePasswordTest extends TestCase
         Livewire::test(UpdatePasswordForm::class)
             ->set('state', [
                 'current_password' => 'password',
-                'password' => 'new-password',
-                'password_confirmation' => 'new-password',
+                'password' => 'Password1!',
+                'password_confirmation' => 'Password1!',
             ])
             ->call('updatePassword');
 
-        $this->assertTrue(Hash::check('new-password', $user->fresh()->password));
+        $this->assertTrue(Hash::check('Password1!', $user->fresh()->password));
     }
 
     public function test_current_password_must_be_correct(): void
@@ -35,8 +35,8 @@ class UpdatePasswordTest extends TestCase
         Livewire::test(UpdatePasswordForm::class)
             ->set('state', [
                 'current_password' => 'wrong-password',
-                'password' => 'new-password',
-                'password_confirmation' => 'new-password',
+                'password' => 'Password1!',
+                'password_confirmation' => 'Password1!',
             ])
             ->call('updatePassword')
             ->assertHasErrors(['current_password']);
@@ -51,7 +51,7 @@ class UpdatePasswordTest extends TestCase
         Livewire::test(UpdatePasswordForm::class)
             ->set('state', [
                 'current_password' => 'password',
-                'password' => 'new-password',
+                'password' => 'Password1!',
                 'password_confirmation' => 'wrong-password',
             ])
             ->call('updatePassword')

tests/Unit/PasswordRequirementsTest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Support\PasswordRequirements;
+use Tests\TestCase;
+
+class PasswordRequirementsTest extends TestCase
+{
+    public function test_hint_is_defined(): void
+    {
+        $this->assertNotEmpty(PasswordRequirements::HINT);
+        $this->assertStringContainsString('6 caratteri', PasswordRequirements::HINT);
+    }
+}