Merge pull request #219 from AfzalivE/master

Check for empty identity_columns after array_diff. Thanks @AfzalivE
Zizaco · Feb 8, 2014 · 4fd06db · 4fd06db
2 parents 3c74dbd + f145dee
commit 4fd06db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Zizaco/Confide/Confide.php b/src/Zizaco/Confide/Confide.php
@@ -93,6 +93,10 @@ public function logAttempt( $credentials, $confirmed_only = false, $identity_col
                 array_keys($credentials),
                 array('password','remember')
             );
+            // Recheck if identity_columns are populated now
+            if (empty($identity_columns)) {
+                return false;
+           }
         }
 
         // Check for throttle limit then log-in

diff --git a/tests/ConfideTest.php b/tests/ConfideTest.php
@@ -114,6 +114,13 @@ public function testShouldLogAttempt()
         $this->assertTrue( 
             $this->confide->logAttempt( $credentials, true )
         );
+
+        unset($credentials['username']);
+        unset($credentials['email']);
+        // Should not login because there is no username or email provided
+        $this->assertFalse(
+            $this->confide->logAttempt( $credentials, true )
+        );
     }
 
     public function testShouldThrottleLogAttempt()