Make the Account onRegister validation pull from the user model. Rela…

…ted: #373,
rainlab · Nov 19, 2019 · 7307e99 · 7307e99
1 parent bed2661
commit 7307e99
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/components/Account.php b/components/Account.php
@@ -204,7 +204,7 @@ public function onSignin()
             if (!array_key_exists('login', $data)) {
                 $data['login'] = post('username', post('email'));
             }
-            
+
             $data['login'] = trim($data['login']);
 
             $validation = Validator::make($data, $rules);
@@ -286,13 +286,15 @@ public function onRegister()
                 $data['password_confirmation'] = post('password');
             }
 
+            $rules = (new UserModel)->rules;
+
             $rules = [
                 'email'    => 'required|email|between:6,255',
                 'password' => 'required|between:4,255|confirmed'
             ];
 
-            if ($this->loginAttribute() == UserSettings::LOGIN_USERNAME) {
-                $rules['username'] = 'required|between:2,255';
+            if ($this->loginAttribute() !== UserSettings::LOGIN_USERNAME) {
+                unset($rules['username']);
             }
 
             $validation = Validator::make($data, $rules);