Merge 8b19f79 into c1280c4

Zizaco · Oct 1, 2014 · b55495d · b55495d
2 parents c1280c4 + 8b19f79
commit b55495d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /vendor
-composer.lock
+composer.lock
+.DS_Store
diff --git a/src/Confide/UserValidator.php b/src/Confide/UserValidator.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Support\Facades\App as App;
 use Illuminate\Support\Facades\Lang as Lang;
+use Illuminate\Support\Facades\Config as Config;
 use Illuminate\Support\MessageBag;
 
 /**
@@ -41,18 +42,13 @@ class UserValidator implements UserValidatorInterface
      *
      * @var array
      */
-    public $rules = [
-        'create' => [
-            'username' => 'required|alpha_dash',
-            'email'    => 'required|email',
-            'password' => 'required|min:4',
-        ],
-        'update' => [
-            'username' => 'required|alpha_dash',
-            'email'    => 'required|email',
-            'password' => 'required|min:4',
-        ]
-    ];
+    public $rules = array();
+
+    public function __construct()
+    {
+        //This provides you configure you validation rules directly in Config file
+        $this->rules = Config::get('confide::rules');
+    }
 
     /**
      * Validates the given user. Should check if all the fields are correctly.
@@ -160,7 +156,7 @@ public function validateAttributes(ConfideUserInterface $user, $ruleset = 'creat
         // Force getting password since it may be hidden from array form
         $attributes['password'] = $user->getAuthPassword();
 
-        $rules = $this->rules[$ruleset];
+        $rules = $this->rules[Config::get('confide::username_type')][$ruleset];
 
         $validator = App::make('validator')
             ->make($attributes, $rules);

diff --git a/src/config/config.php b/src/config/config.php
@@ -2,6 +2,18 @@
 
 return array(
 
+    /*
+    |--------------------------------------------------------------------------
+    | Username type
+    |--------------------------------------------------------------------------
+    |
+    | You can use an alpha numeric username (alpha) or e-mail as username (email)
+    |
+    | Default: email
+    |
+    */
+    'username_type' => 'email',
+
     /*
     |--------------------------------------------------------------------------
     | Login Throttle
@@ -126,4 +138,39 @@
     */
     'email_queue' => 'default',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Rules
+    |--------------------------------------------------------------------------
+    |
+    | Modify the lines below to customize your own User Model Validation with
+    | no needs to extend or overwrite the UserInterface of Confide
+    |
+    */
+    'rules' => [
+        'alpha' => [
+            'create' => [
+                'username' => 'required|alpha_dash',
+                'email'    => 'required|email',
+                'password' => 'required|min:4',
+            ],
+            'update' => [
+                'username' => 'required|alpha_dash',
+                'email'    => 'required|email',
+                'password' => 'required|min:4',
+            ]
+        ],
+        'email' => [
+            'create' => [
+                'username' => 'required|email|same:email',
+                'email'    => 'required|email',
+                'password' => 'required|min:4',
+            ],
+            'update' => [
+                'username' => 'required|email|same:email',
+                'email'    => 'required|email',
+                'password' => 'required|min:4',
+            ]
+        ]
+    ],
 );