Handle user resolution the same across providers

Author: stevebauman

src/Auth/DatabaseUserProvider.php

@@ -34,13 +34,6 @@ class DatabaseUserProvider extends UserProvider
      */
     protected $user;
 
-    /**
-     * The user resolver to use for finding the authenticating user.
-     *
-     * @var \Closure
-     */
-    protected $userResolver;
-
     /**
      * Whether falling back to Eloquent auth is being used.
      *
@@ -66,10 +59,6 @@ public function __construct(
 
         $this->importer = $importer;
         $this->eloquent = $eloquent;
-
-        $this->userResolver = function ($credentials) {
-            return $this->users->findByCredentials($credentials);
-        };
     }
 
     /**
@@ -158,14 +147,10 @@ public function updateRememberToken(Authenticatable $user, $token)
      */
     public function retrieveByCredentials(array $credentials)
     {
-        $user = rescue(function () use ($credentials) {
-            return call_user_func($this->userResolver, $credentials);
-        });
-
         // If an LDAP user is not located by their credentials and fallback
         // is enabled, we will attempt to locate the local database user
         // instead and perform validation on their password normally.
-        if (! $user) {
+        if (! $user = $this->fetchLdapUserByCredentials($credentials)) {
             return isset($credentials['fallback'])
                 ? $this->retrieveByCredentialsUsingEloquent($credentials)
                 : null;

src/Auth/NoDatabaseUserProvider.php

@@ -36,7 +36,7 @@ public function updateRememberToken(Authenticatable $user, $token)
      */
     public function retrieveByCredentials(array $credentials)
     {
-        return $this->users->findByCredentials($credentials);
+        return $this->fetchLdapUserByCredentials($credentials);
     }
 
     /**

src/Auth/UserProvider.php

@@ -3,6 +3,7 @@
 namespace LdapRecord\Laravel\Auth;
 
 use Illuminate\Contracts\Auth\UserProvider as LaravelUserProvider;
+use Illuminate\Validation\ValidationException;
 use LdapRecord\Laravel\LdapUserAuthenticator;
 use LdapRecord\Laravel\LdapUserRepository;
 
@@ -22,6 +23,13 @@ abstract class UserProvider implements LaravelUserProvider
      */
     protected $auth;
 
+    /**
+     * The user resolver to use for finding the authenticating user.
+     *
+     * @var \Closure
+     */
+    protected $userResolver;
+
     /**
      * Constructor.
      *
@@ -32,6 +40,42 @@ public function __construct(LdapUserRepository $users, LdapUserAuthenticator $au
     {
         $this->users = $users;
         $this->auth = $auth;
+
+        $this->userResolver = function ($credentials) {
+            return $this->users->findByCredentials($credentials);
+        };
+    }
+
+    /**
+     * Attempt to retrieve the user by their credentials.
+     *
+     * @param array $credentials
+     *
+     * @return mixed
+     *
+     * @throws ValidationException
+     */
+    protected function fetchLdapUserByCredentials($credentials)
+    {
+        return rescue(function () use ($credentials) {
+            return call_user_func($this->userResolver, $credentials);
+        }, function ($e) {
+            $this->handleException($e);
+        });
+    }
+
+    /**
+     * Handle exceptions during user resolution.
+     *
+     * @param \Exception $e
+     *
+     * @throws ValidationException
+     */
+    protected function handleException($e)
+    {
+        if ($e instanceof ValidationException) {
+            throw $e;
+        }
     }
 
     /**