feat: apply new logic of validation

Author: jlopes90

src/Config/Auth.php

@@ -223,18 +223,6 @@ class Auth extends BaseConfig
         'username',
     ];
 
-    /**
-     * --------------------------------------------------------------------
-     * Login validation rules
-     * --------------------------------------------------------------------
-     * Returns the rules that should be used for user login validation.
-     */
-    public array $loginRules = [
-        // 'username' => 'required|max_length[30]|alpha_numeric_space|min_length[3]',
-        'email'    => 'required|valid_email|max_length[254]',
-        'password' => 'required',
-    ];
-
     /**
      * --------------------------------------------------------------------
      * Additional Fields for "Nothing Personal"

src/Controllers/LoginController.php

@@ -28,7 +28,11 @@ public function loginView()
      */
     public function loginAction(): RedirectResponse
     {
-        if (! $this->validate(setting('Auth.loginRules'))) {
+        // Validate here first, since some things,
+        // like the password, can only be validated properly here.
+        $rules = $this->getValidationRules();
+
+        if (! $this->validate($rules)) {
             return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
         }
 
@@ -52,6 +56,20 @@ public function loginAction(): RedirectResponse
         return redirect()->to(config('Auth')->loginRedirect())->withCookies();
     }
 
+    /**
+     * Returns the rules that should be used for validation.
+     *
+     * @return string[]
+     */
+    protected function getValidationRules(): array
+    {
+        return setting('Validation.login') ?? [
+            //'username' => 'required|max_length[30]|alpha_numeric_space|min_length[3]',
+            'email'    => 'required|valid_email|max_length[254]',
+            'password' => 'required',
+        ];
+    }
+
     /**
      * Logs the current user out.
      */