Added method, some tweaks

- Added `discoverAdldapFromModel()` method to retrieve the Adldap user
from the eloquent model
- Users are now searched for only if `getBindUserToModel()` is true, to
prevent extra queries for users who do not have it enabled

Author: stevebauman

src/AdldapAuthUserProvider.php

@@ -13,41 +13,27 @@
 class AdldapAuthUserProvider extends EloquentUserProvider
 {
     /**
-     * Retrieve a user by their unique identifier.
-     *
-     * @param  mixed  $identifier
-     *
-     * @return Authenticatable|null
+     * {@inheritDoc}
      */
     public function retrieveById($identifier)
     {
         $model = parent::retrieveById($identifier);
 
-        if ($model instanceof Authenticatable) {
-            $attributes = $this->getUsernameAttribute();
-
-            $key = key($attributes);
-
-            $query = Adldap::users()->search();
-
-            $query->whereEquals($attributes[$key], $model->{$key});
-
-            $user = $query->first();
+        return $this->discoverAdldapFromModel($model);
+    }
 
-            if ($user instanceof User && $this->getBindUserToModel()) {
-                $model = $this->bindAdldapToModel($user, $model);
-            }
-        }
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveByToken($identifier, $token)
+    {
+        $model = parent::retrieveByToken($identifier, $token);
 
-        return $model;
+        return $this->discoverAdldapFromModel($model);
     }
 
     /**
-     * Retrieve a user by the given credentials.
-     *
-     * @param array $credentials
-     *
-     * @return Authenticatable|null
+     * {@inheritDoc}
      */
     public function retrieveByCredentials(array $credentials)
     {
@@ -146,6 +132,35 @@ protected function syncModelFromAdldap(User $user, Authenticatable $model)
         return $model;
     }
 
+    /**
+     * Retrieves the Adldap User model from the
+     * specified Laravel model.
+     *
+     * @param mixed $model
+     *
+     * @return null|Authenticatable
+     */
+    protected function discoverAdldapFromModel($model)
+    {
+        if ($model instanceof Authenticatable && $this->getBindUserToModel()) {
+            $attributes = $this->getUsernameAttribute();
+
+            $key = key($attributes);
+
+            $query = Adldap::users()->search();
+
+            $query->whereEquals($attributes[$key], $model->{$key});
+
+            $user = $query->first();
+
+            if ($user instanceof User) {
+                $model = $this->bindAdldapToModel($user, $model);
+            }
+        }
+
+        return $model;
+    }
+
     /**
      * Binds the Adldap User instance to the Eloquent model instance
      * by setting its `adldapUser` public property.