Add Concerns namespace and refactor code to reuse traits for rules (#204)

* Add Concerns namespace and refactor code to reuse traits for rules

* Create profileRules method for trait

Author: WendellAdriel

app/Actions/Fortify/CreateNewUser.php

@@ -2,14 +2,15 @@
 
 namespace App\Actions\Fortify;
 
+use App\Concerns\PasswordValidationRules;
+use App\Concerns\ProfileValidationRules;
 use App\Models\User;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
 
 class CreateNewUser implements CreatesNewUsers
 {
-    use PasswordValidationRules;
+    use PasswordValidationRules, ProfileValidationRules;
 
     /**
      * Validate and create a newly registered user.
@@ -19,14 +20,7 @@ class CreateNewUser implements CreatesNewUsers
     public function create(array $input): User
     {
         Validator::make($input, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => [
-                'required',
-                'string',
-                'email',
-                'max:255',
-                Rule::unique(User::class),
-            ],
+            ...$this->profileRules(),
             'password' => $this->passwordRules(),
         ])->validate();
 

app/Actions/Fortify/ResetUserPassword.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Fortify;
 
+use App\Concerns\PasswordValidationRules;
 use App\Models\User;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\ResetsUserPasswords;

…ions/Fortify/PasswordValidationRules.php app/Concerns/PasswordValidationRules.phpapp/Actions/Fortify/PasswordValidationRules.php renamed to app/Concerns/PasswordValidationRules.php app/Actions/Fortify/PasswordValidationRules.php renamed to app/Concerns/PasswordValidationRules.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Actions\Fortify;
+namespace App\Concerns;
 
 use Illuminate\Validation\Rules\Password;
 
@@ -15,4 +15,14 @@ protected function passwordRules(): array
     {
         return ['required', 'string', Password::default(), 'confirmed'];
     }
+
+    /**
+     * Get the validation rules used to validate the current password.
+     *
+     * @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>
+     */
+    protected function currentPasswordRules(): array
+    {
+        return ['required', 'string', 'current_password'];
+    }
 }

app/Concerns/ProfileValidationRules.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Concerns;
+
+use App\Models\User;
+use Illuminate\Validation\Rule;
+
+trait ProfileValidationRules
+{
+    /**
+     * Get the validation rules used to validate user profiles.
+     *
+     * @return array<string, array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>>
+     */
+    protected function profileRules(?int $userId = null): array
+    {
+        return [
+            'name' => $this->nameRules(),
+            'email' => $this->emailRules($userId),
+        ];
+    }
+
+    /**
+     * Get the validation rules used to validate user names.
+     *
+     * @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>
+     */
+    protected function nameRules(): array
+    {
+        return ['required', 'string', 'max:255'];
+    }
+
+    /**
+     * Get the validation rules used to validate user emails.
+     *
+     * @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>
+     */
+    protected function emailRules(?int $userId = null): array
+    {
+        return [
+            'required',
+            'string',
+            'email',
+            'max:255',
+            $userId === null
+                ? Rule::unique(User::class)
+                : Rule::unique(User::class)->ignore($userId),
+        ];
+    }
+}

app/Livewire/Settings/DeleteUserForm.php

@@ -2,12 +2,15 @@
 
 namespace App\Livewire\Settings;
 
+use App\Concerns\PasswordValidationRules;
 use App\Livewire\Actions\Logout;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
 
 class DeleteUserForm extends Component
 {
+    use PasswordValidationRules;
+
     public string $password = '';
 
     /**
@@ -16,7 +19,7 @@ class DeleteUserForm extends Component
     public function deleteUser(Logout $logout): void
     {
         $this->validate([
-            'password' => ['required', 'string', 'current_password'],
+            'password' => $this->currentPasswordRules(),
         ]);
 
         tap(Auth::user(), $logout(...))->delete();

app/Livewire/Settings/Password.php

@@ -2,13 +2,15 @@
 
 namespace App\Livewire\Settings;
 
+use App\Concerns\PasswordValidationRules;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rules\Password as PasswordRule;
 use Illuminate\Validation\ValidationException;
 use Livewire\Component;
 
 class Password extends Component
 {
+    use PasswordValidationRules;
+
     public string $current_password = '';
 
     public string $password = '';
@@ -22,8 +24,8 @@ public function updatePassword(): void
     {
         try {
             $validated = $this->validate([
-                'current_password' => ['required', 'string', 'current_password'],
-                'password' => ['required', 'string', PasswordRule::defaults(), 'confirmed'],
+                'current_password' => $this->currentPasswordRules(),
+                'password' => $this->passwordRules(),
             ]);
         } catch (ValidationException $e) {
             $this->reset('current_password', 'password', 'password_confirmation');

app/Livewire/Settings/Profile.php

@@ -2,14 +2,16 @@
 
 namespace App\Livewire\Settings;
 
+use App\Concerns\ProfileValidationRules;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
-use Illuminate\Validation\Rule;
 use Livewire\Component;
 
 class Profile extends Component
 {
+    use ProfileValidationRules;
+
     public string $name = '';
 
     public string $email = '';
@@ -30,18 +32,7 @@ public function updateProfileInformation(): void
     {
         $user = Auth::user();
 
-        $validated = $this->validate([
-            'name' => ['required', 'string', 'max:255'],
-
-            'email' => [
-                'required',
-                'string',
-                'lowercase',
-                'email',
-                'max:255',
-                Rule::unique(User::class)->ignore($user->id),
-            ],
-        ]);
+        $validated = $this->validate($this->profileRules($user->id));
 
         $user->fill($validated);