Merge pull request #350 from datamweb/fildename-validate-error

Author: MGatner

docs/customization.md

@@ -95,35 +95,47 @@ Shield has the following rules for registration:
 
 ```php
 [
-    'username'         => [
-            'required',
-            'max_length[30]',
-            'min_length[3]',
-            'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
-            'is_unique[users.username]',
-        ],
-    'email'            => 'required|max_length[254]|valid_email|is_unique[auth_identities.secret]',
-    'password'         => 'required|strong_password',
-    'password_confirm' => 'required|matches[password]',
+    'username' => [
+        'label' =>  'Auth.username',
+        'rules' => 'required|max_length[30]|min_length[3]|regex_match[/\A[a-zA-Z0-9\.]+\z/]|is_unique[users.username]',
+    ],
+    'email' => [
+        'label' =>  'Auth.email',
+        'rules' => 'required|max_length[254]|valid_email|is_unique[auth_identities.secret]',
+    ],
+    'password' => [
+        'label' =>  'Auth.password',
+        'rules' => 'required|strong_password',
+    ],
+    'password_confirm' => [
+        'label' =>  'Auth.passwordConfirm',
+        'rules' => 'required|matches[password]',
+    ],
 ];
 ```
 
 If you need a different set of rules for registration, you can specify them in your `Validation` configuration (**app/Config/Validation.php**) like:
 
 ```php
-//--------------------------------------------------------------------
-// Rules
-//--------------------------------------------------------------------
-public $registration = [
-    'username'         => [
-            'required',
-            'max_length[30]',
-            'min_length[3]',
-            'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
-            'is_unique[users.username]',
+    //--------------------------------------------------------------------
+    // Rules
+    //--------------------------------------------------------------------
+    public $registration = [
+        'username' => [
+            'label' =>  'Auth.username',
+            'rules' => 'required|max_length[30]|min_length[3]|regex_match[/\A[a-zA-Z0-9\.]+\z/]|is_unique[users.username]',
         ],
-    'email'            => 'required|max_length[254]|valid_email|is_unique[auth_identities.secret]',
-    'password'         => 'required|strong_password',
-    'password_confirm' => 'required|matches[password]',
-];
+        'email' => [
+            'label' =>  'Auth.email',
+            'rules' => 'required|max_length[254]|valid_email|is_unique[auth_identities.secret]',
+        ],
+        'password' => [
+            'label' =>  'Auth.password',
+            'rules' => 'required|strong_password',
+        ],
+        'password_confirm' => [
+            'label' =>  'Auth.passwordConfirm',
+            'rules' => 'required|matches[password]',
+        ],
+    ];
 ```

src/Controllers/LoginController.php

@@ -70,9 +70,18 @@ public function loginAction(): RedirectResponse
     protected function getValidationRules(): array
     {
         return setting('Validation.login') ?? [
-            //'username' => config('AuthSession')->usernameValidationRules,
-            'email'    => config('AuthSession')->emailValidationRules,
-            'password' => 'required',
+            // 'username' => [
+            //     'label' => 'Auth.username',
+            //     'rules' => config('AuthSession')->usernameValidationRules,
+            // ],
+            'email' => [
+                'label' => 'Auth.email',
+                'rules' => config('AuthSession')->emailValidationRules,
+            ],
+            'password' => [
+                'label' => 'Auth.password',
+                'rules' => 'required',
+            ],
         ];
     }
 

src/Controllers/MagicLinkController.php

@@ -191,7 +191,10 @@ private function recordLoginAttempt(
     protected function getValidationRules(): array
     {
         return [
-            'email' => config('AuthSession')->emailValidationRules,
+            'email' => [
+                'label' => 'Auth.email',
+                'rules' => config('AuthSession')->emailValidationRules,
+            ],
         ];
     }
 }

src/Controllers/RegisterController.php

@@ -151,10 +151,22 @@ protected function getValidationRules(): array
         );
 
         return setting('Validation.registration') ?? [
-            'username'         => $registrationUsernameRules,
-            'email'            => $registrationEmailRules,
-            'password'         => 'required|strong_password',
-            'password_confirm' => 'required|matches[password]',
+            'username' => [
+                'label' => 'Auth.username',
+                'rules' => $registrationUsernameRules,
+            ],
+            'email' => [
+                'label' => 'Auth.email',
+                'rules' => $registrationEmailRules,
+            ],
+            'password' => [
+                'label' => 'Auth.password',
+                'rules' => 'required|strong_password',
+            ],
+            'password_confirm' => [
+                'label' => 'Auth.passwordConfirm',
+                'rules' => 'required|matches[password]',
+            ],
         ];
     }
 }