Merge 4abb95c into bdfbcff

Zizaco · Sep 15, 2014 · a6268ab · a6268ab
2 parents bdfbcff + 4abb95c
commit a6268ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Confide/CacheLoginThrottleService.php b/src/Confide/CacheLoginThrottleService.php
@@ -72,11 +72,12 @@ public function isThrottled($identity)
      */
     protected function parseIdentity($identity)
     {
-        // If is an array, remove password, remember and then
+        // If is an array, remove password, remember, token and then
         // transforms it into a string.
         if (is_array($identity)) {
             unset($identity['password']);
             unset($identity['remember']);
+            unset($identity['_token']);
             $identity = serialize($identity);
         }
 

diff --git a/src/views/generators/controller.blade.php b/src/views/generators/controller.blade.php
@@ -94,6 +94,8 @@ public function {{ (! $restful) ? 'doLogin' : 'postLogin' }}()
         if ($repo->login($input)) {
             return Redirect::intended('/');
         } else {
+            //please use array_get($input,'username or email') 
+            //or you'll find out the login throttling might not be working
             if ($repo->isThrottled($input)) {
                 $err_msg = Lang::get('confide::confide.alerts.too_many_attempts');
             } elseif ($repo->existsButNotConfirmed($input)) {