Fixed binding users via model

#692

Author: stevebauman

src/Listeners/BindsLdapUserModel.php

@@ -19,17 +19,15 @@ class BindsLdapUserModel
      */
     public function handle($event)
     {
-        // Before we bind the users LDAP model, we will verify they are using the
-        // Adldap authentication provider, the required trait, and the
-        // users LDAP property has not already been set.
+        // Before we bind the users LDAP model, we will verify they are using the Adldap
+        // authentication provider, the required trait, the users LDAP property has
+        // not already been set, and we have located an LDAP user to bind.
         if (
             $this->isUsingAdldapProvider($event->guard)
             && $this->canBind($event->user)
-            && is_null($event->user->ldap)
+            && $user = Resolver::byModel($event->user)
         ) {
-            $event->user->setLdapUser(
-                Resolver::byModel($event->user)
-            );
+            $event->user->setLdapUser($user);
         }
     }
 
@@ -54,6 +52,6 @@ protected function isUsingAdldapProvider($guard) : bool
      */
     protected function canBind(Authenticatable $user) : bool
     {
-        return array_key_exists(HasLdapUser::class, class_uses_recursive($user));
+        return array_key_exists(HasLdapUser::class, class_uses_recursive($user)) && is_null($user->ldap);
     }
 }

src/Resolvers/UserResolver.php

@@ -56,7 +56,7 @@ public function setConnection($connection)
      */
     public function byId($identifier)
     {
-        return $this->query()->findByGuid($identifier);
+        return $this->query()->findByGuid($identifier) ?? null;
     }
 
     /**
@@ -90,9 +90,7 @@ public function byCredentials(array $credentials = [])
      */
     public function byModel(Authenticatable $model)
     {
-        $identifier = $this->getDatabaseIdColumn();
-
-        return $this->query()->whereEquals($identifier, $model->{$identifier})->first();
+        return $this->byId($model->{$this->getDatabaseIdColumn()});
     }
 
     /**