Merge pull request #855 from KenoKokoro/user-resolver-lazy-connection

Lazy connection before searching for user while trying to authenticate

Author: stevebauman

src/Resolvers/UserResolver.php

@@ -201,7 +201,15 @@ protected function getPasswordFromCredentials($credentials)
      */
     protected function getLdapAuthProvider(): ProviderInterface
     {
-        return $this->ldap->getProvider($this->connection ?? $this->getLdapAuthConnectionName());
+        $provider = $this->ldap->getProvider($this->connection ?? $this->getLdapAuthConnectionName());
+
+        if (! $provider->getConnection()->isBound()) {
+            // We'll make sure we have a bound connection before
+            // allowing dynamic calls on the default provider.
+            $provider->connect();
+        }
+
+        return $provider;
     }
 
     /**

tests/DatabaseProviderTest.php

@@ -3,6 +3,9 @@
 namespace Adldap\Laravel\Tests;
 
 use Adldap\AdldapInterface;
+use Adldap\Connections\ConnectionInterface;
+use Adldap\Connections\Provider;
+use Adldap\Connections\ProviderInterface;
 use Adldap\Laravel\Commands\Import;
 use Adldap\Laravel\Facades\Resolver;
 use Adldap\Laravel\Tests\Handlers\LdapAttributeHandler;
@@ -13,6 +16,7 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
+use Mockery as m;
 
 class DatabaseProviderTest extends DatabaseTestCase
 {
@@ -89,8 +93,20 @@ public function auth_fails_when_user_not_found()
     /** @test */
     public function config_scopes_are_applied()
     {
+        $ldapMock = m::mock(AdldapInterface::class);
+        App::instance(AdldapInterface::class, $ldapMock);
+        /** @var Provider $provider */
+        $provider = App::make(Provider::class);
         config(['ldap_auth.scopes' => [JohnDoeScope::class]]);
 
+        $providerMock = m::mock(ProviderInterface::class);
+        $connectionMock = m::mock(ConnectionInterface::class);
+
+        $providerMock->shouldReceive('getConnection')->once()->andReturn($connectionMock);
+        $connectionMock->shouldReceive('isBound')->once()->andReturn(true);
+        $ldapMock->shouldReceive('getProvider')->once()->andReturn($providerMock);
+        $providerMock->shouldReceive('search')->once()->andReturn($provider->search());
+
         $expectedFilter = '(&(objectclass=\75\73\65\72)(objectcategory=\70\65\72\73\6f\6e)(!(objectclass=\63\6f\6e\74\61\63\74))(cn=\4a\6f\68\6e\20\44\6f\65))';
 
         $this->assertEquals($expectedFilter, Resolver::query()->getQuery());
@@ -219,6 +235,10 @@ public function auth_attempts_fallback_using_config_option()
     /** @test */
     public function auth_attempts_using_fallback_does_not_require_connection()
     {
+        $ldapMock = m::mock(AdldapInterface::class);
+        App::instance(AdldapInterface::class, $ldapMock);
+        /** @var Provider $provider */
+        $provider = App::make(Provider::class);
         config(['ldap_auth.login_fallback' => true]);
 
         EloquentUser::create([
@@ -232,6 +252,14 @@ public function auth_attempts_using_fallback_does_not_require_connection()
             'password' => 'Password123',
         ];
 
+        $providerMock = m::mock(ProviderInterface::class);
+        $connectionMock = m::mock(ConnectionInterface::class);
+
+        $providerMock->shouldReceive('getConnection')->times(3)->andReturn($connectionMock);
+        $connectionMock->shouldReceive('isBound')->times(3)->andReturn(true);
+        $ldapMock->shouldReceive('getProvider')->times(3)->andReturn($providerMock);
+        $providerMock->shouldReceive('search')->times(3)->andReturn($provider->search());
+
         $this->assertTrue(Auth::attempt($credentials));
 
         $user = Auth::user();

tests/UserResolverTest.php

@@ -3,6 +3,7 @@
 namespace Adldap\Laravel\Tests;
 
 use Adldap\AdldapInterface;
+use Adldap\Connections\ConnectionInterface;
 use Adldap\Connections\ProviderInterface;
 use Adldap\Laravel\Auth\NoDatabaseUserProvider;
 use Adldap\Laravel\Resolvers\UserResolver;
@@ -85,6 +86,11 @@ public function scopes_are_applied_when_query_is_called()
             ->shouldReceive('users')->once()->andReturn($builder);
 
         $ad = m::mock(AdldapInterface::class);
+        $ldapConnection = m::mock(ConnectionInterface::class);
+        $ldapConnection->shouldReceive('isBound')->once()->andReturn(false);
+
+        $provider->shouldReceive('getConnection')->once()->andReturn($ldapConnection);
+        $provider->shouldReceive('connect')->once();
 
         $ad->shouldReceive('getProvider')->with('default')->andReturn($provider);
 
@@ -99,8 +105,14 @@ public function connection_is_set_when_retrieving_provider()
         Config::shouldReceive('get')->once()->with('ldap_auth.connection', 'default')->andReturn('other-domain');
 
         $ad = m::mock(AdldapInterface::class);
+        $provider = m::mock(ProviderInterface::class);
 
-        $ad->shouldReceive('getProvider')->andReturn(m::mock(ProviderInterface::class))->with('other-domain');
+        $ad->shouldReceive('getProvider')->with('other-domain')->andReturn($provider);
+        $ldapConnection = m::mock(ConnectionInterface::class);
+        $ldapConnection->shouldReceive('isBound')->once()->andReturn(false);
+
+        $provider->shouldReceive('getConnection')->once()->andReturn($ldapConnection);
+        $provider->shouldReceive('connect')->once();
 
         $r = m::mock(UserResolver::class, [$ad])->makePartial();
 
@@ -130,6 +142,11 @@ public function by_credentials_retrieves_alternate_username_attribute_depending_
             ->shouldReceive('users')->once()->andReturn($query);
 
         $ad = m::mock(AdldapInterface::class);
+        $ldapConnection = m::mock(ConnectionInterface::class);
+        $ldapConnection->shouldReceive('isBound')->once()->andReturn(false);
+
+        $ldapProvider->shouldReceive('getConnection')->once()->andReturn($ldapConnection);
+        $ldapProvider->shouldReceive('connect')->once();
 
         $ad->shouldReceive('getProvider')->once()->andReturn($ldapProvider);