Merge pull request #245 from jshah4517/master

kodeine · web-flow · commit 31932c0bc71c · 2019-11-14T17:25:54.000-05:00
Fix cache TTL
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;
             }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function getPermissions()`
`59`	`59`	`{`
`60`	`60`	`return \Cache::remember(`
`61`	`61`	`'acl.getPermissionsInheritedById_'.$this->id,`
`62`		`- config('acl.cacheMinutes'),`
	`62`	`+ now()->addMinutes(config('acl.cacheMinutes', 1)),`
`63`	`63`	`function () {`
`64`	`64`	`return $this->getPermissionsInherited();`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function getRoles()`
`44`	`44`	`{`
`45`	`45`	`$this_roles = \Cache::remember(`
`46`	`46`	`'acl.getRolesById_'.$this->id,`
`47`		`- config('acl.cacheMinutes'),`
	`47`	`+ now()->addMinutes(config('acl.cacheMinutes', 1)),`
`48`	`48`	`function () {`
`49`	`49`	`return $this->roles;`
`50`	`50`	`}`