refactor: move label for validation rules to Config\Auth

Author: kenjis

src/Config/Auth.php

@@ -206,10 +206,13 @@ class Auth extends BaseConfig
      * @var string[]
      */
     public array $usernameValidationRules = [
-        'required',
-        'max_length[30]',
-        'min_length[3]',
-        'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
+        'label' => 'Auth.username',
+        'rules' => [
+            'required',
+            'max_length[30]',
+            'min_length[3]',
+            'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
+        ],
     ];
 
     /**
@@ -220,9 +223,12 @@ class Auth extends BaseConfig
      * @var string[]
      */
     public array $emailValidationRules = [
-        'required',
-        'max_length[254]',
-        'valid_email',
+        'label' => 'Auth.email',
+        'rules' => [
+            'required',
+            'max_length[254]',
+            'valid_email',
+        ],
     ];
 
     /**

src/Controllers/LoginController.php

@@ -83,14 +83,8 @@ public function loginAction(): RedirectResponse
     protected function getValidationRules(): array
     {
         return setting('Validation.login') ?? [
-            // 'username' => [
-            //     'label' => 'Auth.username',
-            //     'rules' => config('Auth')->usernameValidationRules,
-            // ],
-            'email' => [
-                'label' => 'Auth.email',
-                'rules' => config('Auth')->emailValidationRules,
-            ],
+            // 'username' => config('Auth')->usernameValidationRules,
+            'email'    => config('Auth')->emailValidationRules,
             'password' => [
                 'label'  => 'Auth.password',
                 'rules'  => 'required|' . Passwords::getMaxLengthRule(),

src/Controllers/MagicLinkController.php

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

src/Validation/RegistrationValidationRules.php

@@ -23,26 +23,25 @@ public function __construct()
 
     public function get(): array
     {
-        $registrationUsernameRules = array_merge(
-            config('Auth')->usernameValidationRules,
+        $config = config('Auth');
+
+        $usernameValidationRules = $config->usernameValidationRules;
+        $emailValidationRules    = $config->emailValidationRules;
+
+        $usernameValidationRules['rules'] = array_merge(
+            $usernameValidationRules['rules'],
             [sprintf('is_unique[%s.username]', $this->tables['users'])]
         );
-        $registrationEmailRules = array_merge(
-            config('Auth')->emailValidationRules,
+        $emailValidationRules['rules'] = array_merge(
+            $emailValidationRules['rules'],
             [sprintf('is_unique[%s.secret]', $this->tables['identities'])]
         );
 
         helper('setting');
 
         return setting('Validation.registration') ?? [
-            'username' => [
-                'label' => 'Auth.username',
-                'rules' => $registrationUsernameRules,
-            ],
-            'email' => [
-                'label' => 'Auth.email',
-                'rules' => $registrationEmailRules,
-            ],
+            'username' => $usernameValidationRules,
+            'email'    => $emailValidationRules,
             'password' => [
                 'label'  => 'Auth.password',
                 'rules'  => 'required|' . Passwords::getMaxLengthRule() . '|strong_password[]',