Merge pull request #47 from Noaber/fix-folder-cache-key-tenants

fix folder cache issue for multitenancy installations
RicLeP · Jan 19, 2024 · aebbee8 · aebbee8
2 parents 0bda682 + 38ad9ff
commit aebbee8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Folder.php b/src/Folder.php
@@ -214,9 +214,10 @@ protected function get()
 		if (request()->has('_storyblok') || !config('storyblok.cache')) {
 			$response = $this->makeRequest();
 		} else {
-			$uniqueTag = md5(serialize($this->getSettings()));
+			$apiHash = md5(config('storyblok.api_public_key') ?? config('storyblok.api_preview_key')); // unique id for multitenancy applications
+            $uniqueTag = md5(serialize($this->getSettings()));
 
-			$response = Cache::remember($this->cacheKey . $this->slug . '-' . $uniqueTag, config('storyblok.cache_duration') * 60, function () {
+			$response = Cache::remember($this->cacheKey . $this->slug . '-' . $apiHash . '-' . $uniqueTag, config('storyblok.cache_duration') * 60, function () {
 				return $this->makeRequest();
 			});
 		}
@@ -269,4 +270,4 @@ public function toArray(): array
 	{
 		return $this->stories->toArray();
 	}
-}
+}