Updated for Adldap v6.0 compatibility

- Updated for Adldap upcoming version `v6.0`
- Updated tests
- Updated configuration files to allow multiple connection support

Author: stevebauman

src/AdldapAuthUserProvider.php

@@ -241,7 +241,7 @@ protected function bindAdldapToModel(User $user, Authenticatable $model)
      */
     protected function newAdldapUserQuery()
     {
-        return Adldap::users()->search()->select($this->getSelectAttributes());
+        return $this->getAdldap()->search()->select($this->getSelectAttributes());
     }
 
     /**
@@ -254,7 +254,7 @@ protected function newAdldapUserQuery()
      */
     protected function authenticate($username, $password)
     {
-        return Adldap::authenticate($username, $password);
+        return $this->getAdldap()->auth()->attempt($username, $password);
     }
 
     /**
@@ -302,7 +302,7 @@ protected function handleAttributeCallback(User $user, $callback)
      */
     protected function handleAttributeRetrieval(User $user, $field)
     {
-        if ($field === ActiveDirectory::THUMBNAIL) {
+        if ($field === $this->getSchema()->thumbnail()) {
             // If the field we're retrieving is the users thumbnail photo, we need
             // to retrieve it encoded so we're able to save it to the database.
             $value = $user->getThumbnailEncoded();
@@ -319,14 +319,43 @@ protected function handleAttributeRetrieval(User $user, $field)
         return $value;
     }
 
+    /**
+     * Returns Adldap's current attribute schema.
+     *
+     * @return \Adldap\Contracts\Schemas\SchemaInterface
+     */
+    protected function getSchema()
+    {
+        return $this->getAdldap()->getSchema();
+    }
+
+    /**
+     * Returns the root Adldap instance.
+     *
+     * @param string $provider
+     *
+     * @return \Adldap\Contracts\Connections\ProviderInterface
+     */
+    protected function getAdldap($provider = null)
+    {
+        /** @var \Adldap\Adldap $ad */
+        $ad = Adldap::getFacadeRoot();
+
+        if (is_null($provider)) {
+            $provider = $this->getDefaultConnectionName();
+        }
+
+        return $ad->getManager()->get($provider);
+    }
+
     /**
      * Returns the username attribute for discovering LDAP users.
      *
      * @return array
      */
     protected function getUsernameAttribute()
     {
-        return Config::get('adldap_auth.username_attribute', ['username' => ActiveDirectory::ACCOUNT_NAME]);
+        return Config::get('adldap_auth.username_attribute', ['username' => $this->getSchema()->accountName()]);
     }
 
     /**
@@ -347,7 +376,7 @@ protected function getPasswordKey()
      */
     protected function getLoginAttribute()
     {
-        return Config::get('adldap_auth.login_attribute', ActiveDirectory::ACCOUNT_NAME);
+        return Config::get('adldap_auth.login_attribute', $this->getSchema()->accountName());
     }
 
     /**
@@ -369,7 +398,7 @@ protected function getBindUserToModel()
      */
     protected function getSyncAttributes()
     {
-        return Config::get('adldap_auth.sync_attributes', ['name' => ActiveDirectory::COMMON_NAME]);
+        return Config::get('adldap_auth.sync_attributes', ['name' => $this->getSchema()->commonName()]);
     }
 
     /**
@@ -393,4 +422,14 @@ protected function getLoginFallback()
     {
         return Config::get('adldap_auth.login_fallback', false);
     }
+
+    /**
+     * Retrieves the default connection name from the configuration.
+     *
+     * @return mixed
+     */
+    protected function getDefaultConnectionName()
+    {
+        return Config::get('adldap_auth.connection', 'default');
+    }
 }

src/AdldapServiceProvider.php

@@ -3,7 +3,11 @@
 namespace Adldap\Laravel;
 
 use Adldap\Adldap;
+use Adldap\Connections\Configuration;
+use Adldap\Connections\Manager;
+use Adldap\Contracts\AdldapInterface;
 use Adldap\Laravel\Exceptions\ConfigurationMissingException;
+use Adldap\Connections\Provider;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
@@ -37,31 +41,46 @@ public function register()
     {
         // Bind the Adldap instance to the IoC
         $this->app->bind('adldap', function (Application $app) {
-            $config = $app->make('config');
+            $config = $app->make('config')->get('adldap');
 
-            $settings = $config->get('adldap');
-
-            // Verify configuration.
-            if (is_null($settings)) {
+            // Verify configuration exists.
+            if (is_null($config)) {
                 $message = 'Adldap configuration could not be found. Try re-publishing using `php artisan vendor:publish --tag="adldap"`.';
 
                 throw new ConfigurationMissingException($message);
             }
 
-            // Create a new Adldap instance.
-            $ad = new Adldap($settings['connection_settings'], new $settings['connection'](), $settings['auto_connect']);
+            // Create a new connection Manager.
+            $manager = new Manager();
+
+            // Retrieve the LDAP connections.
+            $connections = $config['connections'];
+
+            // Go through each connection and construct a Provider.
+            foreach ($connections as $name => $settings) {
+
+                $ldap = new $settings['connection']();
+                $configuration = new Configuration($settings['connection_settings']);
+                $schema = new $settings['schema'];
+
+                // Construct a new connection Provider with its settings.
+                $provider = new Provider($ldap, $configuration, $schema);
+
+                if ($settings['auto_connect'] === true) {
+                    // Try connecting to the provider if `auto_connect` is true.
+                    $provider->connect();
+                }
 
-            if ($config->get('app.debug')) {
-                // If the application is set to debug mode, we'll display LDAP error messages.
-                $ad->getConnection()->showErrors();
+                // Add the Provider to the Manager.
+                $manager->add($name, $provider);
             }
 
-            return $ad;
+            return new Adldap($manager);
         });
 
         // Bind the Adldap contract to the Adldap object
         // in the IoC for dependency injection.
-        $this->app->bind('Adldap\Contracts\Adldap', 'adldap');
+        $this->app->bind(AdldapInterface::class, 'adldap');
     }
 
     /**

src/Config/auth.php

@@ -2,6 +2,20 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Connection
+    |--------------------------------------------------------------------------
+    |
+    | The connection to use for authentication.
+    |
+    | You must specify connections in your `config/adldap.php` configuration file.
+    |
+    */
+
+    'connection' => 'default',
+
+
     /*
     |--------------------------------------------------------------------------
     | Username Attribute