Fix getting cache tags from user model not ShinobiTrait (#66) (#67)

caffeinated · Nov 16, 2017 · 6be6885 · 6be6885
1 parent 41cd0ae
commit 6be6885
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Models/Role.php b/src/Models/Role.php
@@ -8,7 +8,9 @@
 
 class Role extends Model
 {
-    use PermissionTrait;
+    use PermissionTrait {
+        flushPermissionCache as parentFlushPermissionCache;
+    }
 
     /**
      * The attributes that are fillable via mass assignment.
@@ -29,7 +31,7 @@ class Role extends Model
      *
      * @return string
      */
-    protected static function getShinobiTag()
+    public static function getShinobiTag()
     {
         return 'shinobi.roles';
     }
@@ -61,9 +63,11 @@ protected function getFreshPermissions()
      */
     public function flushPermissionCache()
     {
-        parent::flushPermissionCache([
+        $userClass = config('auth.model') ?: config('auth.providers.users.model');
+        $usersTag = call_user_func([$userClass, 'getShinobiTag']);
+        static::parentFlushPermissionCache([
           static::getShinobiTag(),
-          \Caffeinated\Shinobi\Traits\ShinobiTrait::getShinobiTag()
+          $usersTag,
         ]);
     }
 

diff --git a/src/Traits/PermissionTrait.php b/src/Traits/PermissionTrait.php
@@ -10,7 +10,7 @@ trait PermissionTrait
      *
      * @return string
      */
-    protected static function getShinobiTag()
+    public static function getShinobiTag()
     {
         return '';
     }

diff --git a/src/Traits/ShinobiTrait.php b/src/Traits/ShinobiTrait.php
@@ -11,7 +11,7 @@ trait ShinobiTrait
      *
      * @return string
      */
-    protected static function getShinobiTag()
+    public static function getShinobiTag()
     {
         return 'shinobi.users';
     }