Merge branch '1467-check-user-password-minimum-length-and-correct-tex…

…t' into develop
younginnovations · Jul 9, 2024 · 19de904 · 19de904
2 parents d716327 + e052f38
commit 19de904
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/app/Http/Requests/User/UserProfileRequest.php b/app/Http/Requests/User/UserProfileRequest.php
@@ -39,9 +39,9 @@ public function rules(): array
 
         if ($form_type === 'password') {
             $rules = [
-                'current_password'      => ['required', 'string', 'min:6', 'max:255'],
-                'password'              => ['required', 'string', 'min:6', 'max:255', 'confirmed'],
-                'password_confirmation' => ['required', 'string', 'min:6', 'max:255'],
+                'current_password'      => ['required', 'string', 'min:8', 'max:255'],
+                'password'              => ['required', 'string', 'min:8', 'max:255', 'confirmed'],
+                'password_confirmation' => ['required', 'string', 'min:8', 'max:255'],
             ];
         }
 

diff --git a/app/Http/Requests/User/UserRequest.php b/app/Http/Requests/User/UserRequest.php
@@ -34,8 +34,8 @@ public function rules(): array
             'full_name'             => ['required', 'string', 'max:255'],
             'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255', 'unique:users,email', 'not_in_spam_emails'],
             'status'                => ['required'],
-            'password'              => ['required', 'string', 'min:6', 'max:255', 'confirmed'],
-            'password_confirmation' => ['required', 'string', 'min:6', 'max:255'],
+            'password'              => ['required', 'string', 'min:8', 'max:255', 'confirmed'],
+            'password_confirmation' => ['required', 'string', 'min:8', 'max:255'],
         ];
 
         if ($role === 'admin') {

diff --git a/app/Http/Requests/User/UserUpdateRequest.php b/app/Http/Requests/User/UserUpdateRequest.php
@@ -38,8 +38,8 @@ public function rules(): array
         ];
 
         if (!empty(Arr::get($request, 'password', null))) {
-            $rules['password'] = ['required', 'string', 'min:6', 'max:255', 'confirmed'];
-            $rules['password_confirmation'] = ['required', 'string', 'min:6', 'max:255'];
+            $rules['password'] = ['required', 'string', 'min:8', 'max:255', 'confirmed'];
+            $rules['password_confirmation'] = ['required', 'string', 'min:8', 'max:255'];
         }
         if ($role === 'admin') {
             $rules['role_id'] = 'required';

diff --git a/app/Http/Requests/Web/IatiRegister/IatiRegisterFormRequest.php b/app/Http/Requests/Web/IatiRegister/IatiRegisterFormRequest.php
@@ -62,8 +62,8 @@ public function rules(): array
                     'username'              => ['required', 'max:255', 'string', 'unique:users,username', 'regex:/^[a-z]([0-9a-z-_])*$/'],
                     'full_name'             => ['required', 'string', 'max:255'],
                     'email'                 => ['required', 'string', 'email', 'regex:/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,}$/ix', 'max:255', 'unique:users,email', 'not_in_spam_emails'],
-                    'password'              => ['required', 'string', 'min:6', 'max:255', 'confirmed'],
-                    'password_confirmation' => ['required', 'string', 'min:6', 'max:255'],
+                    'password'              => ['required', 'string', 'min:8', 'max:255', 'confirmed'],
+                    'password_confirmation' => ['required', 'string', 'min:8', 'max:255'],
                 ];
                 break;
         }

diff --git a/resources/assets/js/views/web/IatiRegisterPage.vue b/resources/assets/js/views/web/IatiRegisterPage.vue
@@ -667,7 +667,7 @@ export default defineComponent({
             placeholder: 'Type password here',
             id: 'password',
             required: true,
-            help_text: 'Minimum length: 6 characters',
+            help_text: 'Minimum length: 8 characters',
             type: 'password',
             class: 'mb-4 lg:mb-2',
           },
@@ -677,7 +677,7 @@ export default defineComponent({
             placeholder: 'Type password here',
             id: 'password-confirmation',
             required: true,
-            help_text: 'Should match the password above',
+            help_text: 'This should match the password on the left',
             type: 'password',
             class: 'mb-4 lg:mb-6',
           },