Retrieve model from configuration, or the configured auth providers

- Closes #645

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Adldap\Laravel;
 
+use RuntimeException;
 use Adldap\AdldapInterface;
 use Adldap\Laravel\Resolvers\UserResolver;
 use Adldap\Laravel\Resolvers\ResolverInterface;
@@ -81,7 +82,7 @@ public function register()
      * @param Hasher $hasher
      * @param array  $config
      *
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * 
      * @return \Illuminate\Contracts\Auth\UserProvider
      */
@@ -90,12 +91,14 @@ protected function makeUserProvider(Hasher $hasher, array $config)
         $provider = Config::get('ldap_auth.provider', DatabaseUserProvider::class);
 
         // The DatabaseUserProvider requires a model to be configured
-        // in the configuration. We'll validate this here.
+        // in the configuration. We will validate this here.
         if (is_a($provider, DatabaseUserProvider::class, $allowString = true)) {
-            $model = array_get($config, 'model');
+            // We will try to retrieve their model from the config file,
+            // otherwise we will try to use the providers config array.
+            $model = Config::get('ldap_auth.model') ?? array_get($config, 'model');
 
             if (!$model) {
-                throw new \RuntimeException(
+                throw new RuntimeException(
                     "No model is configured. You must configure a model to use with the {$provider}."
                 );
             }

src/Commands/Console/Import.php

@@ -3,15 +3,16 @@
 namespace Adldap\Laravel\Commands\Console;
 
 use Exception;
+use UnexpectedValueException;
 use Adldap\Models\User;
 use Adldap\Laravel\Events\Imported;
 use Adldap\Laravel\Facades\Resolver;
 use Adldap\Laravel\Commands\SyncPassword;
 use Adldap\Laravel\Commands\Import as ImportUser;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Database\Eloquent\Model;
 
 class Import extends Command
@@ -329,7 +330,34 @@ protected function delete(User $user, Model $model)
      */
     protected function model() : Model
     {
-        return Auth::getProvider()->createModel();
+        $model = Config::get('ldap_auth.model') ?? $this->determineModel();
+
+        return new $model;
+    }
+
+    /**
+     * Retrieves the model by checking the configured LDAP authentication providers.
+     *
+     * @return string
+     *
+     * @throws UnexpectedValueException
+     */
+    protected function determineModel()
+    {
+        // Retrieve all of the configured authentication providers that
+        // use the LDAP driver and have a configured model.
+        $providers = array_where(Config::get('auth.providers'), function ($value, $key) {
+            return $value['driver'] == 'ldap' && array_key_exists('model', $value);
+        });
+
+        // Pull the first driver and return a new model instance.
+        if ($ldap = reset($providers)) {
+            return $ldap['model'];
+        }
+
+        throw new UnexpectedValueException(
+            'Unable to retrieve LDAP authentication driver. Did you forget to configure it?'
+        );
     }
 
     /**