Merge pull request #245 from jshah4517/master

Fix cache TTL
kodeine · Nov 14, 2019 · 31932c0 · 31932c0
2 parents 5cca6ff + d1f492d
commit 31932c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Kodeine/Acl/Models/Eloquent/Role.php b/src/Kodeine/Acl/Models/Eloquent/Role.php
@@ -59,7 +59,7 @@ public function getPermissions()
     {
         return \Cache::remember(
             'acl.getPermissionsInheritedById_'.$this->id,
-            config('acl.cacheMinutes'),
+            now()->addMinutes(config('acl.cacheMinutes', 1)),
             function () {
                 return $this->getPermissionsInherited();
             }

diff --git a/src/Kodeine/Acl/Traits/HasPermission.php b/src/Kodeine/Acl/Traits/HasPermission.php
@@ -42,7 +42,7 @@ public function getPermissions()
         // user permissions overridden from role.
         $permissions = \Cache::remember(
             'acl.getPermissionsById_'.$this->id,
-            config('acl.cacheMinutes'),
+            now()->addMinutes(config('acl.cacheMinutes', 1)),
             function () {
                 return $this->getPermissionsInherited();
             }
@@ -83,7 +83,7 @@ public function hasPermission($permission, $operator = null)
         // all of user role permissions
         $merge =  \Cache::remember(
             'acl.getMergeById_'.$this->id,
-            config('acl.cacheMinutes'),
+            now()->addMinutes(config('acl.cacheMinutes', 1)),
             function () {
                 return $this->getPermissions();
             }

diff --git a/src/Kodeine/Acl/Traits/HasRole.php b/src/Kodeine/Acl/Traits/HasRole.php
@@ -44,7 +44,7 @@ public function getRoles()
     {
         $this_roles = \Cache::remember(
             'acl.getRolesById_'.$this->id,
-            config('acl.cacheMinutes'),
+            now()->addMinutes(config('acl.cacheMinutes', 1)),
             function () {
                 return $this->roles;
             }