Merge pull request #412 from freezy-sk/bugfix/isThrottled

[Bugfix] CacheLoginThrottleService->isThrottled
Zizaco · Sep 20, 2014 · c27d251 · c27d251
2 parents b5a55a7 + 1644f09
commit c27d251
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 /vendor
-composer.lock
+composer.lock
diff --git a/src/Confide/CacheLoginThrottleService.php b/src/Confide/CacheLoginThrottleService.php
@@ -75,9 +75,11 @@ protected function parseIdentity($identity)
         // If is an array, remove password, remember and then
         // transforms it into a string.
         if (is_array($identity)) {
-            unset($identity['password']);
-            unset($identity['remember']);
-            $identity = serialize($identity);
+            if (isset($identity['email'])) {
+                return $identity['email'];
+            } elseif (isset($identity['username'])) {
+                return $identity['username'];
+            }
         }
 
         return $identity;

diff --git a/tests/Confide/CacheLoginThrottleServiceTest.php b/tests/Confide/CacheLoginThrottleServiceTest.php
@@ -67,10 +67,10 @@ public function testShouldCheckIsThrottled()
         */
         $throttleService->shouldReceive('parseIdentity')
             ->once()->with($identity)
-            ->andReturn(serialize(['email'=>'someone@somewhere.com']));
+            ->andReturn('someone@somewhere.com');
 
         $throttleService->shouldReceive('countThrottle')
-            ->once()->with(serialize(['email'=>'someone@somewhere.com']), 0)
+            ->once()->with('someone@somewhere.com', 0)
             ->andReturn(10); // More than the limit specified bellow
 
         $config->shouldReceive('get')
@@ -106,10 +106,10 @@ public function testShouldCheckIsThrottledOnNonThrottled()
         */
         $throttleService->shouldReceive('parseIdentity')
             ->once()->with($identity)
-            ->andReturn(serialize(['email'=>'someone@somewhere.com']));
+            ->andReturn('someone@somewhere.com');
 
         $throttleService->shouldReceive('countThrottle')
-            ->once()->with(serialize(['email'=>'someone@somewhere.com']), 0)
+            ->once()->with('someone@somewhere.com', 0)
             ->andReturn(5); // Less than the limit specified bellow
 
         $config->shouldReceive('get')
@@ -149,7 +149,7 @@ public function testShouldParseIdentity()
         |------------------------------------------------------------
         */
         $this->assertEquals(
-            serialize(['email'=>'someone@somewhere.com']),
+            'someone@somewhere.com',
             $throttleService->parseIdentity($identity)
         );
     }