Bug Fix

Author: darryldecode

src/Darryldecode/Backend/Base/Registrar/Registrar.php

@@ -13,7 +13,7 @@ class Registrar {
     /**
      * the laravel backend version
      */
-    const VERSION = '1.0.17';
+    const VERSION = '1.0.18';
     const VERSION_NAME = 'Alpha';
 
     /**

src/Darryldecode/Backend/Components/User/Commands/CreateUserCommand.php

@@ -94,7 +94,7 @@ public function handle(User $user, Factory $validator, Dispatcher $dispatcher, G
             'last_name' => $this->lastName,
             'email' => $this->email,
             'password' => $this->password,
-        ), $this->user->getValidationRules());
+        ), $user->getValidationRules());
 
         if( $validationResult->fails() )
         {
@@ -170,7 +170,11 @@ protected function transform($permissions)
      */
     protected function createUserModel($user, $config)
     {
-        $userModelUsed = $config->get('backend.backend.user_model');
+        if( ! $userModelUsed = $config->get('backend.backend.user_model') )
+        {
+            return $user;
+        }
+
         $userModelUsed = new $userModelUsed();
 
         if( $userModelUsed instanceof User )

src/Darryldecode/Backend/Components/User/Commands/DeleteUserCommand.php

@@ -14,6 +14,7 @@
 use Darryldecode\Backend\Components\User\Models\Group;
 use Illuminate\Contracts\Bus\SelfHandling;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Config\Repository;
 
 class DeleteUserCommand extends Command implements SelfHandling {
     /**
@@ -41,9 +42,10 @@ public function __construct($id = null, $disablePermissionChecking = false)
      * @param User $user
      * @param Group $group
      * @param Dispatcher $dispatcher
+     * @param Repository $config
      * @return CommandResult
      */
-    public function handle(User $user, Group $group, Dispatcher $dispatcher)
+    public function handle(User $user, Group $group, Dispatcher $dispatcher, Repository $config)
     {
         // check user permission
         if( ! $this->disablePermissionChecking )
@@ -58,6 +60,9 @@ public function handle(User $user, Group $group, Dispatcher $dispatcher)
             }
         }
 
+        // prepare the user model
+        $user = $this->createUserModel($user, $config);
+
         // find the user
         if( ! $userToBeDelete = $user->find($this->id) )
         {
@@ -77,4 +82,26 @@ public function handle(User $user, Group $group, Dispatcher $dispatcher)
         // all good
         return new CommandResult(true, "User successfully deleted.", null, 200);
     }
+
+    /**
+     * @param $user \Darryldecode\Backend\Components\User\Models\User
+     * @param $config \Illuminate\Config\Repository
+     * @return mixed
+     */
+    protected function createUserModel($user, $config)
+    {
+        if( ! $userModelUsed = $config->get('backend.backend.user_model') )
+        {
+            return $user;
+        }
+
+        $userModelUsed = new $userModelUsed();
+
+        if( $userModelUsed instanceof User )
+        {
+            return $userModelUsed;
+        }
+
+        return $user;
+    }
 }

src/Darryldecode/Backend/Components/User/Commands/QueryUsersCommand.php

@@ -183,7 +183,11 @@ public function handle(User $user, Group $group, Dispatcher $dispatcher, Reposit
      */
     protected function createUserModel($user, $config)
     {
-        $userModelUsed = $config->get('backend.backend.user_model');
+        if( ! $userModelUsed = $config->get('backend.backend.user_model') )
+        {
+            return $user;
+        }
+
         $userModelUsed = new $userModelUsed();
 
         if( $userModelUsed instanceof User )