Remove overridden trait methods, fix tests.

Author: stevebauman

src/AdldapAuthUserProvider.php

@@ -6,7 +6,6 @@
 use Adldap\Models\User;
 use Illuminate\Auth\EloquentUserProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
 
@@ -87,111 +86,6 @@ public function retrieveByCredentials(array $credentials)
         }
     }
 
-    /**
-     * Creates a local User from Active Directory.
-     *
-     * @param User   $user
-     * @param string $password
-     *
-     * @return \Illuminate\Database\Eloquent\Model
-     */
-    protected function getModelFromAdldap(User $user, $password)
-    {
-        // Get the username attributes.
-        $attributes = $this->getUsernameAttribute();
-
-        // Get the model key.
-        $key = key($attributes);
-
-        // Get the username from the AD model.
-        $username = $user->{$attributes[$key]};
-
-        // Make sure we retrieve the first username
-        // result if it's an array.
-        if (is_array($username)) {
-            $username = Arr::get($username, 0);
-        }
-
-        // Try to retrieve the model from the model key and AD username.
-        $model = $this->createModel()->newQuery()->where([$key => $username])->first();
-
-        // Create the model instance of it isn't found.
-        if (!$model instanceof Model) {
-            $model = $this->createModel();
-        }
-
-        // Set the username and password in case
-        // of changes in active directory.
-        $model->{$key} = $username;
-
-        // Sync the users password.
-        $model = $this->syncModelPassword($model, $password);
-
-        // Synchronize other active directory
-        // attributes on the model.
-        $model = $this->syncModelFromAdldap($user, $model);
-
-        if ($this->getBindUserToModel()) {
-            $model = $this->bindAdldapToModel($user, $model);
-        }
-
-        return $model;
-    }
-
-    /**
-     * Fills a models attributes by the specified Users attributes.
-     *
-     * @param User            $user
-     * @param Authenticatable $model
-     *
-     * @return Authenticatable
-     */
-    protected function syncModelFromAdldap(User $user, Authenticatable $model)
-    {
-        $attributes = $this->getSyncAttributes();
-
-        foreach ($attributes as $modelField => $adField) {
-            if ($this->isAttributeCallback($adField)) {
-                $value = $this->handleAttributeCallback($user, $adField);
-            } else {
-                $value = $this->handleAttributeRetrieval($user, $adField);
-            }
-
-            $model->{$modelField} = $value;
-        }
-
-        if ($model instanceof Model) {
-            $model->save();
-        }
-
-        return $model;
-    }
-
-    /**
-     * Syncs the models password with the specified password.
-     *
-     * @param Authenticatable $model
-     * @param string          $password
-     *
-     * @return Authenticatable
-     */
-    protected function syncModelPassword(Authenticatable $model, $password)
-    {
-        if ($model instanceof Model && $model->hasSetMutator('password')) {
-            // If the model has a set mutator for the password then
-            // we'll assume that the dev is using their
-            // own encryption method for passwords.
-            $model->password = $password;
-
-            return $model;
-        }
-
-        // Always encrypt the model password by default.
-        $model->password = bcrypt($password);
-
-        return $model;
-    }
-
     /**
      * Retrieves the Adldap User model from the
      * specified Laravel model.
@@ -221,32 +115,6 @@ protected function discoverAdldapFromModel($model)
         return $model;
     }
 
-    /**
-     * Binds the Adldap User instance to the Eloquent model instance
-     * by setting its `adldapUser` public property.
-     *
-     * @param User            $user
-     * @param Authenticatable $model
-     *
-     * @return Authenticatable
-     */
-    protected function bindAdldapToModel(User $user, Authenticatable $model)
-    {
-        $model->adldapUser = $user;
-
-        return $model;
-    }
-
-    /**
-     * Returns a new Adldap user query.
-     *
-     * @return \Adldap\Query\Builder
-     */
-    protected function newAdldapUserQuery()
-    {
-        return $this->getAdldap()->search()->select($this->getSelectAttributes());
-    }
-
     /**
      * Authenticates a user against Active Directory.
      *
@@ -260,68 +128,6 @@ protected function authenticate($username, $password)
         return $this->getAdldap()->auth()->attempt($username, $password);
     }
 
-    /**
-     * Returns true / false if the specified string
-     * is a callback for an attribute handler.
-     *
-     * @param string $string
-     *
-     * @return bool
-     */
-    protected function isAttributeCallback($string)
-    {
-        $matches = preg_grep("/(\w)@(\w)/", explode("\n", $string));
-
-        return count($matches) > 0;
-    }
-
-    /**
-     * Handles retrieving the value from an attribute callback.
-     *
-     * @param User   $user
-     * @param string $callback
-     *
-     * @return mixed
-     */
-    protected function handleAttributeCallback(User $user, $callback)
-    {
-        // Explode the callback into its class and method.
-        list($class, $method) = explode('@', $callback);
-
-        // Create the handler.
-        $handler = app($class);
-
-        // Call the attribute handler method and return the result.
-        return call_user_func_array([$handler, $method], [$user]);
-    }
-
-    /**
-     * Handles retrieving the specified field from the User model.
-     *
-     * @param User   $user
-     * @param string $field
-     *
-     * @return string|null
-     */
-    protected function handleAttributeRetrieval(User $user, $field)
-    {
-        if ($field === $this->getSchema()->thumbnail()) {
-            // If the field we're retrieving is the users thumbnail photo, we need
-            // to retrieve it encoded so we're able to save it to the database.
-            $value = $user->getThumbnailEncoded();
-        } else {
-            $value = $user->{$field};
-
-            if (is_array($value)) {
-                // If the AD Value is an array, we'll
-                // retrieve the first value.
-                $value = Arr::get($value, 0);
-            }
-        }
-
-        return $value;
-    }
-
     /**
      * Returns the password key to retrieve the
      * password from the user input array.

tests/AdldapTest.php

@@ -83,6 +83,7 @@ public function test_auth_passes()
         $mockedProvider->shouldReceive('getSchema')->andReturn(Schema::get());
         $mockedProvider->shouldReceive('auth')->once()->andReturn($mockedAuth);
 
+        $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('whereEquals')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('first')->once()->andReturn($adUser);
@@ -143,6 +144,7 @@ public function test_auth_fails()
         $mockedProvider->shouldReceive('getSchema')->andReturn(Schema::get());
         $mockedProvider->shouldReceive('auth')->once()->andReturn($mockedAuth);
 
+        $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('whereEquals')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('first')->once()->andReturn($adUser);
@@ -169,6 +171,7 @@ public function test_auth_fails_when_user_not_found()
         $mockedProvider->shouldReceive('search')->once()->andReturn($mockedSearch);
         $mockedProvider->shouldReceive('getSchema')->andReturn(Schema::get());
 
+        $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->once()->andReturn($mockedBuilder);
         $mockedBuilder->shouldReceive('getConnection')->once()->andReturn($mockedConnection);
         $mockedBuilder->shouldReceive('whereEquals')->once()->andReturn($mockedBuilder);
@@ -197,6 +200,7 @@ public function test_credentials_key_does_not_exist()
         Adldap::shouldReceive('getManager')->andReturn($manager);
 
         $mockedProvider->shouldReceive('search')->once()->andReturn($mockedSearch);
+        $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedProvider->shouldReceive('getSchema')->andReturn(Schema::get());
 
         $nonExistantInputKey = 'non-existent-key';
@@ -229,6 +233,7 @@ public function test_config_login_fallback()
 
         $mockedConnection->shouldReceive('isBound')->twice()->andReturn(true);
 
+        $mockedSearch->shouldReceive('users')->twice()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('select')->twice()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('getConnection')->twice()->andReturn($mockedConnection);
         $mockedSearch->shouldReceive('whereEquals')->twice()->andReturn($mockedSearch);
@@ -279,6 +284,7 @@ public function test_config_login_fallback_no_connection()
         $mockedConnection->shouldReceive('isBound')->once()->andReturn(false);
 
         $mockedSearch->shouldReceive('select')->once()->andReturn($mockedSearch);
+        $mockedSearch->shouldReceive('users')->once()->andReturn($mockedSearch);
         $mockedSearch->shouldReceive('getConnection')->once()->andReturn($mockedConnection);
 
         $manager = new Manager();