Check instance of auth provider rather than configuration.

- Closes #575

(cherry picked from commit b342fa7)

Author: stevebauman

src/Resolvers/UserResolver.php

@@ -9,10 +9,11 @@
 use Adldap\Laravel\Events\Authenticated;
 use Adldap\Laravel\Events\Authenticating;
 use Adldap\Laravel\Events\AuthenticationFailed;
-use Adldap\Laravel\Auth\DatabaseUserProvider;
 use Adldap\Laravel\Auth\NoDatabaseUserProvider;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
 
 class UserResolver implements ResolverInterface
@@ -25,7 +26,7 @@ class UserResolver implements ResolverInterface
     protected $ldap;
 
     /**
-     * The LDAP connection to utilize.
+     * The name of the LDAP connection to utilize.
      *
      * @var string
      */
@@ -38,7 +39,7 @@ public function __construct(AdldapInterface $ldap)
     {
         $this->ldap = $ldap;
 
-        $this->setConnection($this->getAuthConnection());
+        $this->setConnection($this->getLdapAuthConnectionName());
     }
 
     /**
@@ -66,12 +67,10 @@ public function byCredentials(array $credentials = [])
             return;
         }
 
-        $provider = Config::get('adldap_auth.provider', DatabaseUserProvider::class);
-
         // Depending on the configured user provider, the
         // username field will differ for retrieving
         // users by their credentials.
-        if ($provider == NoDatabaseUserProvider::class) {
+        if ($this->getAppAuthProvider() instanceof NoDatabaseUserProvider) {
             $username = $credentials[$this->getLdapDiscoveryAttribute()];
         } else {
             $username = $credentials[$this->getEloquentUsernameAttribute()];
@@ -114,7 +113,7 @@ public function authenticate(User $user, array $credentials = [])
 
         Event::fire(new Authenticating($user, $username));
 
-        if ($this->getProvider()->auth()->attempt($username, $password)) {
+        if ($this->getLdapAuthProvider()->auth()->attempt($username, $password)) {
             Event::fire(new Authenticated($user));
 
             return true;
@@ -130,7 +129,7 @@ public function authenticate(User $user, array $credentials = [])
      */
     public function query() : Builder
     {
-        $query = $this->getProvider()->search()->users();
+        $query = $this->getLdapAuthProvider()->search()->users();
 
         $scopes = Config::get('adldap_auth.scopes', []);
 
@@ -192,19 +191,29 @@ protected function getPasswordFromCredentials($credentials)
      *
      * @throws \Adldap\AdldapException
      *
-     * @return \Adldap\Connections\ProviderInterface
+     * @return ProviderInterface
      */
-    protected function getProvider() : ProviderInterface
+    protected function getLdapAuthProvider() : ProviderInterface
     {
         return $this->ldap->getProvider($this->connection);
     }
 
+    /**
+     * Returns the default guards provider instance.
+     *
+     * @return UserProvider
+     */
+    protected function getAppAuthProvider() : UserProvider
+    {
+        return Auth::guard()->getProvider();
+    }
+
     /**
      * Returns the connection name of the authentication provider.
      *
      * @return string
      */
-    protected function getAuthConnection()
+    protected function getLdapAuthConnectionName()
     {
         return Config::get('adldap_auth.connection', 'default');
     }

tests/UserResolverTest.php

@@ -7,7 +7,9 @@
 use Adldap\AdldapInterface;
 use Adldap\Schemas\SchemaInterface;
 use Adldap\Connections\ProviderInterface;
+use Adldap\Laravel\Auth\NoDatabaseUserProvider;
 use Adldap\Laravel\Resolvers\UserResolver;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
 
 class UserResolverTest extends TestCase
@@ -71,7 +73,7 @@ public function scopes_are_applied_when_query_is_called()
 
         $ad = m::mock(AdldapInterface::class);
 
-        $ad->shouldReceive('getProvider')->withArgs(['default'])->andReturn($provider);
+        $ad->shouldReceive('getProvider')->with('default')->andReturn($provider);
 
         $resolver = new UserResolver($ad);
 
@@ -81,12 +83,44 @@ public function scopes_are_applied_when_query_is_called()
     /** @test */
     public function connection_is_set_upon_creation()
     {
-        Config::shouldReceive('get')->once()->withArgs(['adldap_auth.connection', 'default']);
+        Config::shouldReceive('get')->once()->with('adldap_auth.connection', 'default')->andReturn('other-test');
 
         $ad = m::mock(AdldapInterface::class);
 
-        $ad->shouldReceive('getProvider')->withArgs(['other-connection']);
-
         new UserResolver($ad);
     }
+
+    /** @test */
+    public function by_credentials_retrieves_alternate_username_attribute_depending_on_user_provider()
+    {
+        // Setup our builder.
+        $query = m::mock(Builder::class);
+
+        //
+        $query->shouldReceive('whereEquals')->once()->with('userprincipalname', 'jdoe')->andReturnSelf()
+            ->shouldReceive('first')->andReturnNull();
+
+        $ldapProvider = m::mock(ProviderInterface::class);
+
+        $ldapProvider->shouldReceive('search')->once()->andReturnSelf()
+            ->shouldReceive('users')->once()->andReturn($query);
+
+        $ad = m::mock(AdldapInterface::class);
+
+        $ad->shouldReceive('getProvider')->once()->andReturn($ldapProvider);
+
+        $ad->shouldReceive('getProvider')->andReturnSelf();
+
+        $authProvider = m::mock(NoDatabaseUserProvider::class);
+
+        Auth::shouldReceive('guard')->once()->andReturnSelf()->shouldReceive('getProvider')->once()->andReturn($authProvider);
+
+        Config::shouldReceive('get')->with('adldap_auth.connection', 'default')->andReturn('default')
+            ->shouldReceive('get')->with('adldap_auth.usernames.ldap.discover', 'userprincipalname')->andReturn('userprincipalname')
+            ->shouldReceive('get')->with('adldap_auth.scopes', [])->andReturn([]);
+
+        $resolver = new UserResolver($ad);
+
+        $resolver->byCredentials(['userprincipalname' => 'jdoe', 'password' => 'Password1']);
+    }
 }