Merge branch 'master' of https://github.com/Adldap2/Adldap2-Laravel

Author: stevebauman

readme.md

@@ -3,7 +3,6 @@
 <p align="center">
     <a href="www.laravel.com"><img src="https://img.shields.io/badge/Built_for-Laravel-green.svg?style=flat-square"></a>
     <a href="https://travis-ci.org/Adldap2/Adldap2-Laravel"><img src="https://img.shields.io/travis/Adldap2/Adldap2-Laravel.svg?style=flat-square"></a>
-    <a href="https://travis-ci.org/Adldap2/Adldap2-Laravel"><img src="https://img.shields.io/travis/Adldap2/Adldap2-Laravel.svg?style=flat-square"></a>
     <a href="https://scrutinizer-ci.com/g/Adldap2/Adldap2-Laravel"><img src="https://img.shields.io/scrutinizer/g/Adldap2/Adldap2-laravel/master.svg?style=flat-square"></a>
     <a href="https://packagist.org/packages/adldap2/adldap2-laravel"><img src="https://img.shields.io/packagist/dt/adldap2/adldap2-laravel.svg?style=flat-square"></a>
     <a href="https://packagist.org/packages/adldap2/adldap2-laravel"><img src="https://img.shields.io/packagist/v/adldap2/adldap2-laravel.svg?style=flat-square"></a>

src/AdldapAuthServiceProvider.php

@@ -12,6 +12,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Hashing\Hasher;
+use Illuminate\Auth\Events\Login;
 use Illuminate\Auth\Events\Authenticated;
 
 class AdldapAuthServiceProvider extends ServiceProvider
@@ -63,6 +64,7 @@ public function register()
         // model to their Eloquent model upon authentication (if configured).
         // This allows us to utilize their LDAP model right
         // after authentication has passed.
+        Event::listen(Login::class, Listeners\BindsLdapUserModel::class);
         Event::listen(Authenticated::class, Listeners\BindsLdapUserModel::class);
 
         if ($this->isLogging()) {

src/Listeners/BindsLdapUserModel.php

@@ -6,21 +6,27 @@
 use Adldap\Laravel\Facades\Resolver;
 use Adldap\Laravel\Traits\HasLdapUser;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Auth\Events\Authenticated;
 use Illuminate\Contracts\Auth\Authenticatable;
 
 class BindsLdapUserModel
 {
     /**
      * Binds the LDAP user record to their model.
      *
-     * @param Authenticated $event
+     * @param mixed $event
      *
      * @return void
      */
-    public function handle(Authenticated $event)
+    public function handle($event)
     {
-        if ($this->isUsingAdldapProvider() && $this->canBind($event->user)) {
+        // Before we bind the users LDAP model, we will verify they are using the
+        // Adldap authentication provider, the required trait, and the
+        // users LDAP property has not already been set.
+        if (
+            $this->isUsingAdldapProvider()
+            && $this->canBind($event->user)
+            && is_null($event->user->ldap)
+        ) {
             $event->user->setLdapUser(
                 Resolver::byModel($event->user)
             );

tests/DatabaseProviderTest.php

@@ -133,7 +133,7 @@ public function auth_attempts_fallback_using_config_option()
         ];
 
         Resolver::shouldReceive('byCredentials')->times(3)->andReturn(null)
-            ->shouldReceive('byModel')->once()->andReturn(null);
+            ->shouldReceive('byModel')->times(2)->andReturn(null);
 
         $this->assertTrue(Auth::attempt($credentials));