Moved getSchema and getAdldap to the ImportsUsers trait

Author: stevebauman

src/AdldapAuthUserProvider.php

@@ -319,35 +319,6 @@ protected function handleAttributeRetrieval(User $user, $field)
         return $value;
     }
 
-    /**
-     * Returns Adldap's current attribute schema.
-     *
-     * @return \Adldap\Contracts\Schemas\SchemaInterface
-     */
-    protected function getSchema()
-    {
-        return $this->getAdldap()->getSchema();
-    }
-
-    /**
-     * Returns the root Adldap instance.
-     *
-     * @param string $provider
-     *
-     * @return \Adldap\Contracts\Connections\ProviderInterface
-     */
-    protected function getAdldap($provider = null)
-    {
-        /** @var \Adldap\Adldap $ad */
-        $ad = Adldap::getFacadeRoot();
-
-        if (is_null($provider)) {
-            $provider = $this->getDefaultConnectionName();
-        }
-
-        return $ad->getManager()->get($provider);
-    }
-
     /**
      * Returns the password key to retrieve the
      * password from the user input array.

src/Middleware/WindowsAuthenticate.php

@@ -4,7 +4,6 @@
 
 use Adldap\Laravel\Traits\ImportsUsers;
 use Adldap\Models\User;
-use Adldap\Schemas\ActiveDirectory;
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Database\Eloquent\Model;
@@ -119,6 +118,6 @@ public function createModel()
      */
     protected function getWindowsAuthAttribute()
     {
-        return Config::get('adldap_auth.windows_auth_attribute', [ActiveDirectory::ACCOUNT_NAME => 'AUTH_USER']);
+        return Config::get('adldap_auth.windows_auth_attribute', [$this->getSchema()->accountName() => 'AUTH_USER']);
     }
 }

src/Traits/ImportsUsers.php

@@ -220,6 +220,35 @@ protected function newAdldapUserQuery()
         return $query->select($this->getSelectAttributes());
     }
 
+    /**
+     * Returns Adldap's current attribute schema.
+     *
+     * @return \Adldap\Contracts\Schemas\SchemaInterface
+     */
+    protected function getSchema()
+    {
+        return $this->getAdldap()->getSchema();
+    }
+
+    /**
+     * Returns the root Adldap instance.
+     *
+     * @param string $provider
+     *
+     * @return \Adldap\Contracts\Connections\ProviderInterface
+     */
+    protected function getAdldap($provider = null)
+    {
+        /** @var \Adldap\Adldap $ad */
+        $ad = Adldap::getFacadeRoot();
+
+        if (is_null($provider)) {
+            $provider = $this->getDefaultConnectionName();
+        }
+
+        return $ad->getManager()->get($provider);
+    }
+
     /**
      * Retrieves the Aldldap select attributes when performing
      * queries for authentication and binding for users.