Rework importing from WindowsAuthenticate

Author: stevebauman

src/Auth/Importer.php

@@ -4,6 +4,7 @@
 
 use Adldap\Models\User;
 use Adldap\AdldapException;
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
 
 class Importer implements ImporterInterface
@@ -59,10 +60,13 @@ protected function findByCredentials(Model $model, array $credentials = [])
             $model = $model->withTrashed();
         }
 
-        $username = $this->getEloquentUsername();
+        foreach ($credentials as $key => $value) {
+            if (! Str::contains($key, 'password')) {
+                $model->where($key, $value);
+            }
+        }
 
-        return $model->where([$username => $credentials[$username]])
-            ->first();
+        return $model->first();
     }
 
     /**

src/Middleware/WindowsAuthenticate.php

@@ -83,8 +83,10 @@ protected function retrieveAuthenticatedUser($key, $username)
         $provider = $this->auth->getProvider();
 
         try {
+            $resolver = $this->getResolver();
+
             // Find the user in AD.
-            $user = $this->getResolver()->query()
+            $user = $resolver->query()
                 ->where([$key => $username])
                 ->firstOrFail();
 
@@ -93,10 +95,14 @@ protected function retrieveAuthenticatedUser($key, $username)
 
                 return $user;
             } elseif ($provider instanceof DatabaseUserProvider) {
+                $credentials = [
+                    $resolver->getEloquentUsername() => $user->getFirstAttribute($resolver->getLdapUsername()),
+                ];
+
                 // Retrieve the Eloquent user model from our AD user instance.
                 // We'll assign the user a random password since we don't
                 // have access to it through SSO auth.
-                $model = $this->getImporter()->run($user, $this->getModel(), ['password' => str_random()]);
+                $model = $this->getImporter()->run($user, $this->getModel(), $credentials);
 
                 // Save model in case of changes.
                 $model->save();