Refactoring AuthServiceProvider

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -2,14 +2,12 @@
 
 namespace Adldap\Laravel;
 
+use Adldap\AdldapInterface;
 use InvalidArgumentException;
-use Adldap\Laravel\Facades\Adldap;
 use Adldap\Laravel\Resolvers\UserResolver;
 use Adldap\Laravel\Resolvers\ResolverInterface;
 use Adldap\Laravel\Commands\Console\Import;
 use Adldap\Laravel\Auth\DatabaseUserProvider;
-use Adldap\Laravel\Auth\NoDatabaseUserProvider;
-use Adldap\Laravel\Listeners\BindsLdapUserModel;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
@@ -28,7 +26,6 @@ public function boot()
     {
         $config = __DIR__.'/Config/auth.php';
 
-        // Add publishable configuration.
         $this->publishes([
             $config => config_path('adldap_auth.php'),
         ], 'adldap');
@@ -39,11 +36,11 @@ public function boot()
 
         if (method_exists($auth, 'provider')) {
             $auth->provider('adldap', function ($app, array $config) {
-                return $this->newUserProvider($app['hash'], $config);
+                return $this->makeUserProvider($app['hash'], $config);
             });
         } else {
             $auth->extend('adldap', function ($app) {
-                return $this->newUserProvider($app['hash'], $app['config']['auth']);
+                return $this->makeUserProvider($app['hash'], $app['config']['auth']);
             });
         }
 
@@ -80,7 +77,9 @@ public function provides()
     protected function registerBindings()
     {
         $this->app->bind(ResolverInterface::class, function () {
-            return $this->newUserResolver();
+            $ad = $this->app->make(AdldapInterface::class);
+
+            return new UserResolver($ad);
         });
     }
 
@@ -91,7 +90,18 @@ protected function registerBindings()
      */
     protected function registerListeners()
     {
-        Event::listen(Authenticated::class, BindsLdapUserModel::class);
+        // Here we will register the event listener that will bind the users LDAP
+        // model to their Eloquent model upon authentication (if configured).
+        // This allows us to utilize their LDAP model right
+        // after authentication has passed.
+        Event::listen(Authenticated::class, Listeners\BindsLdapUserModel::class);
+
+        if ($this->isLogging()) {
+            Event::listen(Events\Importing::class, Listeners\LogImport::class);
+            Event::listen(Events\Synchronized::class, Listeners\LogSynchronized::class);
+            Event::listen(Events\Synchronizing::class, Listeners\LogSynchronizing::class);
+            Event::listen(Events\DiscoveredWithCredentials::class, Listeners\LogDiscovery::class);
+        }
     }
 
     /**
@@ -100,69 +110,39 @@ protected function registerListeners()
      * @param Hasher $hasher
      * @param array  $config
      *
-     * @return \Illuminate\Contracts\Auth\UserProvider
-     *
      * @throws InvalidArgumentException
+     * 
+     * @return \Illuminate\Contracts\Auth\UserProvider
      */
-    protected function newUserProvider(Hasher $hasher, array $config)
+    protected function makeUserProvider(Hasher $hasher, array $config)
     {
-        $provider = $this->userProvider();
+        $provider = Config::get('adldap_auth.provider', DatabaseUserProvider::class);
 
-        switch ($provider) {
-            case DatabaseUserProvider::class:
-                if ($model = array_get($config, 'model')) {
-                    return new $provider($hasher, $model);
-                }
+        // The DatabaseUserProvider has some extra dependencies needed,
+        // so we will validate that we have them before
+        // constructing a new instance.
+        if ($provider == DatabaseUserProvider::class) {
+            $model = array_get($config, 'model');
 
+            if (!$model) {
                 throw new InvalidArgumentException(
                     "No model is configured. You must configure a model to use with the {$provider}."
                 );
-            case NoDatabaseUserProvider::class:
-                return new $provider;
-        }
+            }
 
-        throw new InvalidArgumentException(
-            "The configured Adldap provider [{$provider}] is not supported or does not exist."
-        );
-    }
-
-    /**
-     * Returns a new user resolver.
-     *
-     * @return ResolverInterface
-     */
-    protected function newUserResolver()
-    {
-        return new UserResolver($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);
+            return new $provider($hasher, $model);
+        }
+        
+        return new $provider;
     }
 
     /**
-     * Returns the configured default connection name.
+     * Determines if authentication requests are logged.
      *
-     * @return string
+     * @return bool
      */
-    protected function connection()
+    protected function isLogging()
     {
-        return Config::get('adldap_auth.connection', 'default');
+        return Config::get('adldap_auth.logging', false);
     }
 }