Implement new Resolver facade

- The resolver is now bound to the app container upon insertion of the
AdldapAuthServiceProvider

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -3,14 +3,16 @@
 namespace Adldap\Laravel;
 
 use InvalidArgumentException;
-use Adldap\Laravel\Commands\Import;
-use Adldap\Laravel\Events\Synchronizing;
+use Adldap\Laravel\Facades\Adldap;
+use Adldap\Laravel\Auth\Resolver;
+use Adldap\Laravel\Auth\ResolverInterface;
+use Adldap\Laravel\Commands\Console\Import;
 use Adldap\Laravel\Auth\DatabaseUserProvider;
 use Adldap\Laravel\Auth\NoDatabaseUserProvider;
 use Adldap\Laravel\Listeners\BindsLdapUserModel;
-use Adldap\Laravel\Listeners\SynchronizesPasswords;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Auth\Events\Authenticated;
@@ -59,6 +61,8 @@ public function boot()
      */
     public function register()
     {
+        $this->registerBindings();
+
         $this->registerListeners();
     }
 
@@ -72,6 +76,18 @@ public function provides()
         return ['auth'];
     }
 
+    /**
+     * Registers the application bindings.
+     *
+     * @return void
+     */
+    protected function registerBindings()
+    {
+        $this->app->bind(ResolverInterface::class, function () {
+            return $this->newUserResolver();
+        });
+    }
+
     /**
      * Registers the event listeners.
      *
@@ -80,8 +96,6 @@ public function provides()
     protected function registerListeners()
     {
         Event::listen(Authenticated::class, BindsLdapUserModel::class);
-
-        Event::listen(Synchronizing::class, SynchronizesPasswords::class);
     }
 
     /**
@@ -96,7 +110,7 @@ protected function registerListeners()
      */
     protected function newUserProvider(Hasher $hasher, array $config)
     {
-        $provider = $this->getUserProvider();
+        $provider = $this->userProvider();
 
         switch ($provider) {
             case DatabaseUserProvider::class:
@@ -117,12 +131,54 @@ protected function newUserProvider(Hasher $hasher, array $config)
     }
 
     /**
-     * Returns the configured user provider.
+     * Returns a new user resolver.
+     *
+     * @return ResolverInterface
+     */
+    protected function newUserResolver()
+    {
+        $resolver = $this->resolver();
+
+        return new $resolver($this->ldapProvider());
+    }
+
+    /**
+     * Retrieves a connection provider from the Adldap instance.
+     *
+     * @return \Adldap\Connections\ProviderInterface
+     */
+    protected function ldapProvider()
+    {
+        return Adldap::getProvider($this->connection());
+    }
+
+    /**
+     * Returns the configured user provider class.
+     *
+     * @return string
+     */
+    protected function userProvider()
+    {
+        return Config::get('adldap_auth.provider', DatabaseUserProvider::class);
+    }
+
+    /**
+     * Returns the configured user resolver class.
+     *
+     * @return string
+     */
+    protected function resolver()
+    {
+        return Config::get('adldap_auth.resolver', Resolver::class);
+    }
+
+    /**
+     * Returns the configured default connection name.
      *
      * @return string
      */
-    protected function getUserProvider()
+    public function connection()
     {
-        return config('adldap_auth.provider', DatabaseUserProvider::class);
+        return Config::get('adldap_auth.connection', 'default');
     }
 }

src/Facades/Resolver.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Adldap\Laravel\Facades;
+
+use Adldap\Laravel\Auth\ResolverInterface;
+use Illuminate\Support\Facades\Facade;
+
+class Resolver extends Facade
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getFacadeAccessor()
+    {
+        return ResolverInterface::class;
+    }
+}