Move user validator methods

7 files changed, 154 insertions, 140 deletions

diff --git a/app/Api/User.php b/app/Api/User.php
index 06e305f2..63c222fe 100644
--- a/app/Api/User.php
+++ b/app/Api/User.php
@@ -42,7 +42,7 @@ class User extends \Kanboard\Core\Base
             'role' => $role,
         );
 
-        list($valid, ) = $this->user->validateCreation($values);
+        list($valid, ) = $this->userValidator->validateCreation($values);
         return $valid ? $this->user->create($values) : false;
     }
 
@@ -94,7 +94,7 @@ class User extends \Kanboard\Core\Base
             }
         }
 
-        list($valid, ) = $this->user->validateApiModification($values);
+        list($valid, ) = $this->userValidator->validateApiModification($values);
         return $valid && $this->user->update($values);
     }
 }
diff --git a/app/Controller/User.php b/app/Controller/User.php
index 2a811219..97e01553 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -108,7 +108,7 @@ class User extends Base
     public function save()
     {
         $values = $this->request->getValues();
-        list($valid, $errors) = $this->user->validateCreation($values);
+        list($valid, $errors) = $this->userValidator->validateCreation($values);
 
         if ($valid) {
             $project_id = empty($values['project_id']) ? 0 : $values['project_id'];
@@ -329,7 +329,7 @@ class User extends Base
 
         if ($this->request->isPost()) {
             $values = $this->request->getValues();
-            list($valid, $errors) = $this->user->validatePasswordModification($values);
+            list($valid, $errors) = $this->userValidator->validatePasswordModification($values);
 
             if ($valid) {
                 if ($this->user->update($values)) {
@@ -371,7 +371,7 @@ class User extends Base
                 }
             }
 
-            list($valid, $errors) = $this->user->validateModification($values);
+            list($valid, $errors) = $this->userValidator->validateModification($values);
 
             if ($valid) {
                 if ($this->user->update($values)) {
@@ -409,7 +409,7 @@ class User extends Base
 
         if ($this->request->isPost()) {
             $values = $this->request->getValues() + array('disable_login_form' => 0, 'is_ldap_user' => 0);
-            list($valid, $errors) = $this->user->validateModification($values);
+            list($valid, $errors) = $this->userValidator->validateModification($values);
 
             if ($valid) {
                 if ($this->user->update($values)) {
diff --git a/app/Model/User.php b/app/Model/User.php
index 50e9b310..84785ce5 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -369,132 +369,4 @@ class User extends Base
                     ->eq('id', $user_id)
                     ->save(array('token' => ''));
     }
-
-    /**
-     * Common validation rules
-     *
-     * @access private
-     * @return array
-     */
-    private function commonValidationRules()
-    {
-        return array(
-            new Validators\MaxLength('role', t('The maximum length is %d characters', 25), 25),
-            new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50),
-            new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), self::TABLE, 'id'),
-            new Validators\Email('email', t('Email address invalid')),
-            new Validators\Integer('is_ldap_user', t('This value must be an integer')),
-        );
-    }
-
-    /**
-     * Common password validation rules
-     *
-     * @access private
-     * @return array
-     */
-    private function commonPasswordValidationRules()
-    {
-        return array(
-            new Validators\Required('password', t('The password is required')),
-            new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6),
-            new Validators\Required('confirmation', t('The confirmation is required')),
-            new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')),
-        );
-    }
-
-    /**
-     * Validate user creation
-     *
-     * @access public
-     * @param  array   $values           Form values
-     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
-     */
-    public function validateCreation(array $values)
-    {
-        $rules = array(
-            new Validators\Required('username', t('The username is required')),
-        );
-
-        if (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) {
-            $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
-        } else {
-            $v = new Validator($values, array_merge($rules, $this->commonValidationRules(), $this->commonPasswordValidationRules()));
-        }
-
-        return array(
-            $v->execute(),
-            $v->getErrors()
-        );
-    }
-
-    /**
-     * Validate user modification
-     *
-     * @access public
-     * @param  array   $values           Form values
-     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
-     */
-    public function validateModification(array $values)
-    {
-        $rules = array(
-            new Validators\Required('id', t('The user id is required')),
-            new Validators\Required('username', t('The username is required')),
-        );
-
-        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
-
-        return array(
-            $v->execute(),
-            $v->getErrors()
-        );
-    }
-
-    /**
-     * Validate user API modification
-     *
-     * @access public
-     * @param  array   $values           Form values
-     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
-     */
-    public function validateApiModification(array $values)
-    {
-        $rules = array(
-            new Validators\Required('id', t('The user id is required')),
-        );
-
-        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
-
-        return array(
-            $v->execute(),
-            $v->getErrors()
-        );
-    }
-
-    /**
-     * Validate password modification
-     *
-     * @access public
-     * @param  array   $values           Form values
-     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
-     */
-    public function validatePasswordModification(array $values)
-    {
-        $rules = array(
-            new Validators\Required('id', t('The user id is required')),
-            new Validators\Required('current_password', t('The current password is required')),
-        );
-
-        $v = new Validator($values, array_merge($rules, $this->commonPasswordValidationRules()));
-
-        if ($v->execute()) {
-            if ($this->authenticationManager->passwordAuthentication($this->userSession->getUsername(), $values['current_password'], false)) {
-                return array(true, array());
-            } else {
-                return array(false, array('current_password' => array(t('Wrong password'))));
-            }
-        }
-
-        return array(false, $v->getErrors());
-    }
 }
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index e206ef68..ca6dcf5d 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -87,6 +87,7 @@ class ClassProvider implements ServiceProviderInterface
         ),
         'Validator' => array(
             'PasswordResetValidator',
+            'UserValidator',
         ),
         'Core' => array(
             'DateParser',
diff --git a/app/Validator/Base.php b/app/Validator/Base.php
index 6c56e2fd..ba32a503 100644
--- a/app/Validator/Base.php
+++ b/app/Validator/Base.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Validator;
 
+use SimpleValidator\Validators;
+
 /**
  * Base Validator
  *
@@ -33,4 +35,20 @@ class Base extends \Kanboard\Core\Base
 
         return array($result, $errors);
     }
+
+    /**
+     * Common password validation rules
+     *
+     * @access protected
+     * @return array
+     */
+    protected function commonPasswordValidationRules()
+    {
+        return array(
+            new Validators\Required('password', t('The password is required')),
+            new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6),
+            new Validators\Required('confirmation', t('The confirmation is required')),
+            new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')),
+        );
+    }
 }
diff --git a/app/Validator/PasswordResetValidator.php b/app/Validator/PasswordResetValidator.php
index 6f21cbca..9ef45045 100644
--- a/app/Validator/PasswordResetValidator.php
+++ b/app/Validator/PasswordResetValidator.php
@@ -35,12 +35,7 @@ class PasswordResetValidator extends Base
      */
     public function validateModification(array $values)
     {
-        $v = new Validator($values, array(
-            new Validators\Required('password', t('The password is required')),
-            new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6),
-            new Validators\Required('confirmation', t('The confirmation is required')),
-            new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')),
-        ));
+        $v = new Validator($values, $this->commonPasswordValidationRules());
 
         return array(
             $v->execute(),
diff --git a/app/Validator/UserValidator.php b/app/Validator/UserValidator.php
new file mode 100644
index 00000000..d85d335f
--- /dev/null
+++ b/app/Validator/UserValidator.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Kanboard\Validator;
+
+use SimpleValidator\Validator;
+use SimpleValidator\Validators;
+use Kanboard\Model\User;
+
+/**
+ * User Validator
+ *
+ * @package  validator
+ * @author   Frederic Guillot
+ */
+class UserValidator extends Base
+{
+    /**
+     * Common validation rules
+     *
+     * @access private
+     * @return array
+     */
+    private function commonValidationRules()
+    {
+        return array(
+            new Validators\MaxLength('role', t('The maximum length is %d characters', 25), 25),
+            new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50),
+            new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), User::TABLE, 'id'),
+            new Validators\Email('email', t('Email address invalid')),
+            new Validators\Integer('is_ldap_user', t('This value must be an integer')),
+        );
+    }
+
+    /**
+     * Validate user creation
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateCreation(array $values)
+    {
+        $rules = array(
+            new Validators\Required('username', t('The username is required')),
+        );
+
+        if (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) {
+            $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+        } else {
+            $v = new Validator($values, array_merge($rules, $this->commonValidationRules(), $this->commonPasswordValidationRules()));
+        }
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate user modification
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The user id is required')),
+            new Validators\Required('username', t('The username is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate user API modification
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateApiModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The user id is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate password modification
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validatePasswordModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The user id is required')),
+            new Validators\Required('current_password', t('The current password is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonPasswordValidationRules()));
+
+        if ($v->execute()) {
+            if ($this->authenticationManager->passwordAuthentication($this->userSession->getUsername(), $values['current_password'], false)) {
+                return array(true, array());
+            } else {
+                return array(false, array('current_password' => array(t('Wrong password'))));
+            }
+        }
+
+        return array(false, $v->getErrors());
+    }
+}