refactor: remove Config\Auth::$validationRulesUsername

Author: kenjis

src/Config/Auth.php

@@ -223,20 +223,6 @@ class Auth extends BaseConfig
         'username',
     ];
 
-    /**
-     * --------------------------------------------------------------------
-     * Validation Rules for username
-     * --------------------------------------------------------------------
-     *
-     * @var string[]
-     */
-    public array $validationRulesUsername = [
-        'required',
-        'max_length[30]',
-        'min_length[3]',
-        'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
-    ];
-
     /**
      * --------------------------------------------------------------------
      * Additional Fields for "Nothing Personal"

src/Controllers/LoginController.php

@@ -64,12 +64,27 @@ public function loginAction(): RedirectResponse
     protected function getValidationRules(): array
     {
         return setting('Validation.login') ?? [
-            //'username' => setting('Auth.validationRulesUsername'),
+            //'username' => setting('Validation._username') ?? $this->getUsernameRules(),
             'email'    => 'required|max_length[254]|valid_email',
             'password' => 'required',
         ];
     }
 
+    /**
+     * Returns the validation rules for username
+     *
+     * @return string[]
+     */
+    public static function getUsernameRules(): array
+    {
+        return [
+            'required',
+            'max_length[30]',
+            'min_length[3]',
+            'regex_match[/\A[a-zA-Z0-9\.]+\z/]',
+        ];
+    }
+
     /**
      * Logs the current user out.
      */

src/Controllers/RegisterController.php

@@ -130,13 +130,15 @@ protected function getUserEntity(): User
      */
     protected function getValidationRules(): array
     {
-        $usernameRules = array_merge(
-            setting('Auth.validationRulesUsername'),
+        $usernameRules = setting('Validation._username') ?? LoginController::getUsernameRules();
+
+        $registrationUsernameRules = array_merge(
+            $usernameRules,
             ['is_unique[users.username]']
         );
 
         return setting('Validation.registration') ?? [
-            'username'         => $usernameRules,
+            'username'         => $registrationUsernameRules,
             'email'            => 'required|valid_email|is_unique[auth_identities.secret]',
             'password'         => 'required|strong_password',
             'password_confirm' => 'required|matches[password]',

tests/Controllers/LoginTest.php

@@ -5,6 +5,7 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Shield\Authentication\Actions\Email2FA;
+use CodeIgniter\Shield\Controllers\LoginController;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\FeatureTestTrait;
 use Config\Services;
@@ -123,7 +124,7 @@ public function testLoginActionUsernameSuccess(): void
                 'password' => 'required',
             ];
         };
-        $config->login['username'] = setting('Auth.validationRulesUsername');
+        $config->login['username'] = LoginController::getUsernameRules();
         Factories::injectMock('config', 'Validation', $config);
 
         $this->user->createEmailIdentity([