refactor: move $usernameValidationRules and $emailValidationRules to Config\Auth

Author: kenjis

docs/addons/jwt.md

@@ -215,7 +215,7 @@ class LoginController extends BaseController
         return setting('Validation.login') ?? [
             'email' => [
                 'label' => 'Auth.email',
-                'rules' => config(AuthSession::class)->emailValidationRules,
+                'rules' => config('Auth')->emailValidationRules,
             ],
             'password' => [
                 'label'  => 'Auth.password',

docs/guides/mobile_apps.md

@@ -26,7 +26,7 @@ class LoginController extends BaseController
         $rules = setting('Validation.login') ?? [
             'email' => [
                 'label' => 'Auth.email',
-                'rules' => config('AuthSession')->emailValidationRules,
+                'rules' => config('Auth')->emailValidationRules,
             ],
             'password' => [
                 'label' => 'Auth.password',

src/Config/Auth.php

@@ -224,6 +224,33 @@ class Auth extends BaseConfig
         'rememberLength'     => 30 * DAY,
     ];
 
+    /**
+     * --------------------------------------------------------------------
+     * The validation rules for username
+     * --------------------------------------------------------------------
+     *
+     * @var string[]
+     */
+    public array $usernameValidationRules = [
+        'required',
+        'max_length[30]',
+        'min_length[3]',
+        'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
+    ];
+
+    /**
+     * --------------------------------------------------------------------
+     * The validation rules for email
+     * --------------------------------------------------------------------
+     *
+     * @var string[]
+     */
+    public array $emailValidationRules = [
+        'required',
+        'max_length[254]',
+        'valid_email',
+    ];
+
     /**
      * --------------------------------------------------------------------
      * Minimum Password Length

src/Config/AuthSession.php

@@ -15,6 +15,8 @@ class AuthSession extends BaseConfig
      * The validation rules for username
      *
      * @var string[]
+     *
+     * @deprecated Moved to Auth. No longer used.
      */
     public array $usernameValidationRules = [
         'required',
@@ -27,6 +29,8 @@ class AuthSession extends BaseConfig
      * The validation rules for email
      *
      * @var string[]
+     *
+     * @deprecated Moved to Auth. No longer used.
      */
     public array $emailValidationRules = [
         'required',

src/Controllers/LoginController.php

@@ -85,11 +85,11 @@ protected function getValidationRules(): array
         return setting('Validation.login') ?? [
             // 'username' => [
             //     'label' => 'Auth.username',
-            //     'rules' => config('AuthSession')->usernameValidationRules,
+            //     'rules' => config('Auth')->usernameValidationRules,
             // ],
             'email' => [
                 'label' => 'Auth.email',
-                'rules' => config('AuthSession')->emailValidationRules,
+                'rules' => config('Auth')->emailValidationRules,
             ],
             'password' => [
                 'label'  => 'Auth.password',

src/Controllers/MagicLinkController.php

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

src/Validation/RegistrationValidationRules.php

@@ -24,11 +24,11 @@ public function __construct()
     public function get(): array
     {
         $registrationUsernameRules = array_merge(
-            config('AuthSession')->usernameValidationRules,
+            config('Auth')->usernameValidationRules,
             [sprintf('is_unique[%s.username]', $this->tables['users'])]
         );
         $registrationEmailRules = array_merge(
-            config('AuthSession')->emailValidationRules,
+            config('Auth')->emailValidationRules,
             [sprintf('is_unique[%s.secret]', $this->tables['identities'])]
         );
 

tests/Controllers/LoginTest.php

@@ -183,7 +183,7 @@ public function testLoginActionUsernameSuccess(): void
                 'password' => 'required',
             ];
         };
-        $config->login['username'] = config('AuthSession')->usernameValidationRules;
+        $config->login['username'] = config('Auth')->usernameValidationRules;
         Factories::injectMock('config', 'Validation', $config);
 
         $this->user->createEmailIdentity([