Merge pull request #5 from JoelGilliland/master

Fixed bug in LdapAuth where it assumed authenticate returned boolean res...
Nitecon · Oct 24, 2013 · d4d8003 · d4d8003
2 parents 572d6f0 + 70fcad7
commit d4d8003
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/ZfcUserLdap/Authentication/Adapter/LdapAuth.php b/src/ZfcUserLdap/Authentication/Adapter/LdapAuth.php
@@ -82,7 +82,7 @@ public function authenticate(AuthEvent $e)
             }
         }
         $ldapAuthAdapter = $this->serviceManager->get('ZfcUserLdap\LdapAdapter');
-        if (!$ldapAuthAdapter->authenticate($identity, $credential)) {
+        if ($ldapAuthAdapter->authenticate($identity, $credential) !== true) {
             // Password does not match
             $e->setCode(AuthenticationResult::FAILURE_CREDENTIAL_INVALID)
                     ->setMessages(array('Supplied credential is invalid.'));

diff --git a/src/ZfcUserLdap/Entity/User.php b/src/ZfcUserLdap/Entity/User.php
@@ -3,8 +3,9 @@
 namespace ZfcUserLdap\Entity;
 
 use ZfcUser\Entity\UserInterface;
+use ZfcRbac\Identity\IdentityInterface;
 
-class User implements UserInterface
+class User implements UserInterface, IdentityInterface
 {
 
     /**