[0.12] Moved the AccesPointUtils into a Service. (#590)

* Moved AccessPointLogic into a Service

---------

Co-authored-by: Vinzenz Rosenkranz <vinzenz.rosenkranz@uni-tuebingen.de>

Author: Severino

app/Http/Controllers/HomeController.php

@@ -4,6 +4,7 @@
 
 use App\Attribute;
 use App\Registries\AttributeRegistry;
+use App\Services\AccessPointsService;
 use App\Bibliography;
 use App\Entity;
 use App\EntityType;
@@ -16,7 +17,6 @@
 use App\ThConcept;
 use App\User;
 
-use App\Utils\AccesspointUtils;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Str;
@@ -28,7 +28,7 @@ class HomeController extends Controller
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(private readonly AccessPointsService $accessPointsService)
     {
         parent::__construct();
         if(!Preference::hasPublicAccess()) {
@@ -39,16 +39,14 @@ public function __construct()
 
     public function checkAccesspointAccess(Request $request) {
         $user = auth()->user();
-
         $accessPath = Str::finish($request->get('endpoint', '/'), '/');
 
         if(!isset($user->accesspoints)) {
             // do not redirect if user has no access points defined (aka access to everything)
             return response()->json(null, 204);
         }
 
-        $availableAccesspoints = AccesspointUtils::get();
-
+        $availableAccesspoints = $this->accessPointsService->get();
         foreach($user->accesspoints as $accesspointId) {
             if(array_key_exists($accesspointId, $availableAccesspoints)) {
                 if($availableAccesspoints[$accesspointId]['path'] == $accessPath) {
@@ -108,7 +106,7 @@ public function getGlobalData() {
             }
         }
 
-        $accesspoints = AccesspointUtils::get();
+        $accesspoints = $this->accessPointsService->get();
 
         // TODO handle layer relation in Map Plugin
         // $entityTypes = EntityType::with(['sub_entity_types', 'layer', 'attributes'])

app/Plugin.php

@@ -3,6 +3,7 @@
 namespace App;
 
 use App\File\Directory;
+use App\Services\AccessPointsService;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
@@ -353,6 +354,10 @@ public function updateUpdateState($fromInfoVersion): void {
 
     public function clearCache(): void {
         Cache::forget($this->getScopeCacheKey());
+        
+        // TODO: Models are meant for the data layer only, 
+        // we should restructure the code into service classes (e.g. PluginMigrationService) 
+        app(AccessPointsService::class)->clearCache();
     }
 
     public function handleInstallation(bool $isUpdate = false): void {
@@ -484,7 +489,7 @@ private function publishScript(): void {
 
             self::getDirectory()->store(
                 $this->publicName(false),
-                $scriptPath
+                $filehandle
             );
             fclose($filehandle);
         } else {

app/Services/AccessPointsService.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Services;
+
+use App\Plugin;
+use Illuminate\Support\Facades\Cache;
+
+class AccessPointsService {
+    private const CACHE_KEY = 'access_points';
+
+    public const /*array*/ CORE_ACCESSPOINTS = [
+        "Default" => [
+            "label" => "main.user.accesspoints.default",
+            "path" => "/",
+        ],
+    ];
+
+    public function clearCache(): void {
+        Cache::forget(self::CACHE_KEY);
+    }
+
+    public function get(): array {
+        return Cache::rememberForever(self::CACHE_KEY, function() {
+            $accesspoints = self::CORE_ACCESSPOINTS;
+            $accesspoints = array_merge($accesspoints, $this->loadAccessPointsFromPlugins());
+            return $accesspoints;
+        });
+    }
+
+    private function loadAccessPointsFromPlugins(): array {
+        $installedPlugins = Plugin::getInstalled();
+        $accesspoints = [];
+        foreach($installedPlugins as $plugin) {
+            $accesspoints = array_merge($accesspoints, $plugin->getAccessPoints());
+        }
+        return $accesspoints;
+    }
+}