Support new accessarea file-based structure

Omranic · Omranic · commit d4f62f847535 · 2023-08-31T01:33:48.000+04:00
diff --git a/src/Traits/HashidsTrait.php b/src/Traits/HashidsTrait.php
@@ -58,7 +58,7 @@ public function unhashId($value)
      */
     protected function shouldBeHashed(): bool
     {
-        $accessareas = (array) $this->obscure + app('accessareas')->where('is_obscured', true)->pluck('slug')->toArray();
+        $accessareas = app('accessareas')->active()->obscured()->keys()->when($this->obscure, fn($collection) => $collection->merge(collect($this->obscure)->intersect(app('accessareas')->active()->keys()))->unique())->toArray();
 
         return in_array(request()->accessarea(), $accessareas) && in_array($this->getRouteKeyName(), config('cortex.foundation.obscure.hashed_keys'));
     }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function unhashId($value)`
`58`	`58`	`*/`
`59`	`59`	`protected function shouldBeHashed(): bool`
`60`	`60`	`{`
`61`		`- $accessareas = (array) $this->obscure + app('accessareas')->where('is_obscured', true)->pluck('slug')->toArray();`
	`61`	`+ $accessareas = app('accessareas')->active()->obscured()->keys()->when($this->obscure, fn($collection) => $collection->merge(collect($this->obscure)->intersect(app('accessareas')->active()->keys()))->unique())->toArray();`
`62`	`62`
`63`	`63`	`return in_array(request()->accessarea(), $accessareas) && in_array($this->getRouteKeyName(), config('cortex.foundation.obscure.hashed_keys'));`
`64`	`64`	`}`