added abilities in users

nahid · Dec 20, 2018 · a76f9b7 · a76f9b7
1 parent bf07c9d
commit a76f9b7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 28 deletions.
diff --git a/helpers/permit.php b/helpers/permit.php
@@ -65,4 +65,24 @@ function json_to_array($json)
 
         return $json_out;
     }
+}
+
+if (!function_exists('array_merge_nested')) {
+    function array_merge_nested(array &$array1, array &$array2)
+    {
+        $merged = $array1;
+        foreach ($array2 as $key => &$value) {
+            if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
+                $merged[$key] = array_merge_nested($merged[$key], $value);
+            } else {
+                if (is_string($key)) {
+                    $merged[$key]  = $value;
+                } else {
+                    $merged[]  = $value;
+                }
+            }
+        }
+
+        return $merged;
+    }
 }
diff --git a/src/Permission.php b/src/Permission.php
@@ -205,13 +205,9 @@ public function roleCan($user, $permission, $params = [])
     public function allows($user, $permission, $params = [])
     {
         if ($user instanceof $this->userModelNamespace) {
-            $user_permissions = json_to_array($user->permissions);
-            $role_permissions = json_to_array($user->permission->permission);
-            $abilities = $this->arrayMergeNested($role_permissions, $user_permissions);
+            $this->abilities = $user->abilities;
 
-            $this->abilities = $abilities;
-
-            if (count($abilities) > 0) {
+            if (count($this->abilities) > 0) {
                 if (is_array($permission)) {
                     if ($this->hasOnePermission($permission, $user)) {
                         return true;
@@ -476,22 +472,4 @@ public function role($role)
     {
         return $this->permission->getRole($role);
     }
-
-    protected function arrayMergeNested(array &$array1, array &$array2)
-    {
-        $merged = $array1;
-        foreach ($array2 as $key => &$value) {
-            if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
-                $merged[$key] = $this->arrayMergeNested($merged[$key], $value);
-            } else {
-                if (is_string($key)) {
-                    $merged[$key]  = $value;
-                } else {
-                    $merged[]  = $value;
-                }
-            }
-        }
-
-        return $merged;
-    }
 }
diff --git a/src/Users/Permitable.php b/src/Users/Permitable.php
@@ -5,12 +5,10 @@
 trait Permitable
 {
     /**
-     * boot model
+     * boot trait
      */
-    protected static function boot()
+    protected static function bootPermitable()
     {
-        parent::boot();
-
         static::addGlobalScope(new PermissionScope());
     }
 
@@ -35,6 +33,16 @@ public function getPermissionArrayAttribute()
         return json_to_array($this->permissions);
     }
 
+    public function getAbilitiesAttribute()
+    {
+        if ($this->relationLoaded('permission')) {
+            $role_permissions = json_to_array($this->permission->permission);
+        }
+        $user_permissions = json_to_array($this->attributes['permissions']);
+
+        return array_merge_nested($role_permissions, $user_permissions);
+    }
+
     /**
      * relationship for permission
      *