new feature

modules/User/Models/Observers/UsersObserver.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Modules\User\Models\Observers;
+
+use Modules\User\Models\User;
+
+class UsersObserver
+{
+    /**
+     *
+     * @param User $user
+     * @return void
+     */
+    public function created(User $user): void
+    {
+        //
+    }
+
+    /**
+     *
+     * @param User $user
+     * @return void
+     */
+    public function updated(User $user): void
+    {
+        //
+    }
+
+    /**
+     *
+     * @param User $user
+     * @return void
+     */
+    public function deleted(User $user): void
+    {
+        //
+    }
+}

modules/User/Models/Traits/UserRelations.php

@@ -1,22 +1,27 @@
 <?php
-namespace Modules\User\Models\Traits;
 
+namespace Modules\User\Models\Traits;
 
 use Catch\CatchAdmin;
 use Catch\Support\Module\ModuleRepository;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Route;
 
 trait UserRelations
 {
+    protected bool $isPermissionModuleEnabled = false;
 
     /**
      * init traits
      */
     public function initializeUserRelations(): void
     {
-       if (app(ModuleRepository::class)->enabled('permissions')) {
-           $this->with = ['roles', 'jobs'];
-       }
+        $this->isPermissionModuleEnabled = app(ModuleRepository::class)->enabled('permissions');
+
+        if ($this->isPermissionModuleEnabled) {
+            $this->with = ['roles', 'jobs'];
+        }
     }
 
     /**
@@ -56,11 +61,42 @@ trait UserRelations
             $permissions = [];
         }
 
-        $this->setAttribute('permissions', $permissions->each(fn($permission) => $permission->setAttribute('hidden', $permission->isHidden())));
+        $this->setAttribute('permissions', $permissions->each(fn ($permission) => $permission->setAttribute('hidden', $permission->isHidden())));
 
         return $this;
     }
 
+    /**
+     *
+     * permission module controller.action
+     *
+     * @param string|null $permission
+     * @return bool
+     */
+    public function can(string $permission = null): bool
+    {
+        if (! $this->isPermissionModuleEnabled) {
+            return true;
+        }
+
+        if ($this->isSuperAdmin()) {
+            return true;
+        }
+
+        $this->withPermissions();
+
+        $actions = Collection::make();
+
+        $this->permissions->each(function ($permission) use (&$actions) {
+            if ($permission->isAction()) {
+                [$controller, $action] = explode('@', $permission->permission_mark);
+
+                $actions->add(CatchAdmin::getModuleControllerNamespace($permission->module).$controller.'Controller@'.$action);
+            }
+        });
+
+        return $actions->contains($permission ?: Route::currentRouteAction());
+    }
 
     /**
      * get RolesModel
@@ -70,7 +106,7 @@ trait UserRelations
      */
     protected function getRolesModel(): string
     {
-        return '\\' . CatchAdmin::getModuleModelNamespace('permissions') . 'RolesModel';
+        return '\\'.CatchAdmin::getModuleModelNamespace('permissions').'RolesModel';
     }
 
 
@@ -82,7 +118,7 @@ trait UserRelations
      */
     protected function getJobsModel(): string
     {
-        return '\\'. CatchAdmin::getModuleModelNamespace('permissions') . 'JobsModel';
+        return '\\'.CatchAdmin::getModuleModelNamespace('permissions').'JobsModel';
     }
 
     /**
@@ -93,6 +129,6 @@ trait UserRelations
      */
     protected function getPermissionsModel(): string
     {
-        return '\\'. CatchAdmin::getModuleModelNamespace('permissions') . 'PermissionsModel';
+        return '\\'.CatchAdmin::getModuleModelNamespace('permissions').'PermissionsModel';
     }
 }

modules/User/Models/User.php

@@ -23,12 +23,12 @@ use Illuminate\Auth\Authenticatable;
  * @property int $updated_at
  * @property string $remember_token
  */
-class Users extends Model implements AuthenticatableContract, JWTSubject
+class User extends Model implements AuthenticatableContract, JWTSubject
 {
     use Authenticatable, UserRelations;
 
     protected $fillable = [
-        'id', 'username', 'email', 'avatar', 'password', 'remember_token', 'creator_id', 'status', 'login_ip', 'login_at', 'created_at', 'updated_at', 'deleted_at'
+        'id', 'username', 'email', 'avatar', 'password', 'remember_token', 'creator_id', 'status', 'department_id', 'login_ip', 'login_at', 'created_at', 'updated_at', 'deleted_at'
     ];
 
     /**
@@ -45,10 +45,17 @@ class Users extends Model implements AuthenticatableContract, JWTSubject
      */
     protected $table = 'users';
 
+    protected array $fields = ['id', 'username', 'email', 'avatar',  'creator_id', 'status', 'department_id', 'created_at'];
+
     /**
      * @var array|string[]
      */
-    protected array $form = ['username', 'email', 'password'];
+    protected array $form = ['username', 'email', 'password', 'department_id'];
+
+    /**
+     * @var array|string[]
+     */
+    protected array $formRelations = ['roles', 'jobs'];
 
     /**
      *