Fire events and utilize alternate username on provider

Author: stevebauman

src/Resolvers/UserResolver.php

@@ -4,13 +4,19 @@
 
 use Adldap\Models\User;
 use Adldap\AdldapInterface;
+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\Event;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Contracts\Auth\Authenticatable;
 
 class UserResolver implements ResolverInterface
 {
     /**
-     * The underlying Adldap instance.
+     * The Adldap instance.
      *
      * @var AdldapInterface
      */
@@ -32,11 +38,7 @@ public function __construct(AdldapInterface $ldap)
     }
 
     /**
-     * Sets the LDAP connection to use.
-     *
-     * @param string $connection
-     *
-     * @return void
+     * {@inheritdoc}
      */
     public function setConnection($connection)
     {
@@ -60,19 +62,32 @@ public function byCredentials(array $credentials = [])
             return;
         }
 
-        return $this->query()
-            ->whereEquals($this->getLdapDiscoveryAttribute(), $credentials[$this->getEloquentUsernameAttribute()])
-            ->first();
+        $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) {
+            $username = $credentials[$this->getLdapDiscoveryAttribute()];
+        } else {
+            $username = $credentials[$this->getEloquentUsernameAttribute()];
+        }
+
+        $field = $this->getLdapDiscoveryAttribute();
+
+        return $this->query()->whereEquals($field, $username)->first();
     }
 
     /**
      * {@inheritdoc}
      */
     public function byModel(Authenticatable $model)
     {
-        return $this->query()
-            ->whereEquals($this->getLdapDiscoveryAttribute(), $model->{$this->getEloquentUsernameAttribute()})
-            ->first();
+        $field = $this->getLdapDiscoveryAttribute();
+
+        $username = $model->{$this->getEloquentUsernameAttribute()};
+
+        return $this->query()->whereEquals($field, $username)->first();
     }
 
     /**
@@ -82,7 +97,19 @@ public function authenticate(User $user, array $credentials = [])
     {
         $username = $user->getFirstAttribute($this->getLdapAuthAttribute());
 
-        return $this->getProvider()->auth()->attempt($username, $credentials['password']);
+        $password = $this->getPasswordFromCredentials($credentials);
+
+        Event::fire(new Authenticating($user, $username));
+
+        if ($this->getProvider()->auth()->attempt($username, $password)) {
+            Event::fire(new Authenticated($user));
+
+            return true;
+        }
+
+        Event::fire(new AuthenticationFailed($user));
+
+        return false;
     }
 
     /**
@@ -92,27 +119,21 @@ public function query()
     {
         $query = $this->getProvider()->search()->users();
 
-        foreach ($this->getScopes() as $scope) {
-            // Create the scope.
+        $scopes = Config::get('adldap_auth.scopes', []);
+
+        foreach ($scopes as $scope) {
+            // Here we will use Laravel's IoC container to construct our scope.
+            // This allows us to utilize any Laravel dependencies in
+            // the scopes constructor that may be needed.
             $scope = app($scope);
 
-            // Apply it to our query.
+            // With the scope constructed, we can apply it to our query.
             $scope->apply($query);
         }
 
         return $query;
     }
 
-    /**
-     * Returns the configured connection provider.
-     *
-     * @return \Adldap\Connections\ProviderInterface
-     */
-    protected function getProvider()
-    {
-        return $this->ldap->getProvider($this->connection);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -138,12 +159,26 @@ public function getEloquentUsernameAttribute()
     }
 
     /**
-     * Returns the configured query scopes.
+     * Returns the password field to retrieve from the credentials.
+     *
+     * @param array $credentials
+     *
+     * @return string|null
+     */
+    protected function getPasswordFromCredentials($credentials)
+    {
+        return array_get($credentials, 'password');
+    }
+
+    /**
+     * Retrieves the provider for the current connection.
      *
-     * @return array
+     * @throws \Adldap\AdldapException
+     *
+     * @return \Adldap\Connections\ProviderInterface
      */
-    protected function getScopes()
+    protected function getProvider()
     {
-        return Config::get('adldap_auth.scopes', []);
+        return $this->ldap->getProvider($this->connection);
     }
 }