Set LDAP connection when calling the auth provider

- Preserve BC and only use the connection property if set, otherwise retrieve it from the configuration
- #712

Author: stevebauman

src/Resolvers/UserResolver.php

@@ -29,18 +29,16 @@ class UserResolver implements ResolverInterface
     /**
      * The name of the LDAP connection to utilize.
      *
-     * @var string
+     * @var string|null
      */
-    protected $connection = 'default';
+    protected $connection;
 
     /**
      * {@inheritdoc}
      */
     public function __construct(AdldapInterface $ldap)
     {
         $this->ldap = $ldap;
-
-        $this->setConnection($this->getLdapAuthConnectionName());
     }
 
     /**
@@ -207,7 +205,7 @@ protected function getPasswordFromCredentials($credentials)
      */
     protected function getLdapAuthProvider() : ProviderInterface
     {
-        return $this->ldap->getProvider($this->connection);
+        return $this->ldap->getProvider($this->connection ?? $this->getLdapAuthConnectionName());
     }
 
     /**

tests/UserResolverTest.php

@@ -88,13 +88,17 @@ public function scopes_are_applied_when_query_is_called()
     }
 
     /** @test */
-    public function connection_is_set_upon_creation()
+    public function connection_is_set_when_retrieving_provider()
     {
         Config::shouldReceive('get')->once()->with('ldap_auth.connection', 'default')->andReturn('other-test');
 
         $ad = m::mock(AdldapInterface::class);
 
-        new UserResolver($ad);
+        $ad->shouldReceive('getProvider')->andReturn(m::mock(ProviderInterface::class));
+
+        $r = m::mock(UserResolver::class, [$ad])->makePartial();
+
+        $r->getLdapAuthProvider();
     }
 
     /** @test */