Merge pull request #9 from networkteam/feature-sourceuri-eel-helper

Add SourceUri Eel Helper

Author: hlubek

Classes/Aspects/ThumbnailAspect.php

@@ -2,14 +2,14 @@
 
 namespace Networkteam\ImageProxy\Aspects;
 
+use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Aop\JoinPointInterface;
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Media\Domain\Model\Asset;
 use Neos\Media\Domain\Model\Image;
 use Neos\Media\Domain\Model\ImageVariant;
 use Neos\Media\Domain\Model\ThumbnailConfiguration;
-use Neos\Flow\Annotations as Flow;
+use Networkteam\ImageProxy\Eel\SourceUriHelper;
 use Networkteam\ImageProxy\ImgproxyBuilder;
 use Networkteam\ImageProxy\Model\Dimensions;
 
@@ -32,9 +32,9 @@ class ThumbnailAspect
 
     /**
      * @Flow\Inject
-     * @var ResourceManager
+     * @var SourceUriHelper
      */
-    protected $resourceManager;
+    protected $sourceUriHelper;
 
     /**
      * @Flow\Around("method(Neos\Media\Domain\Service\AssetService->getThumbnailUriAndSizeForAsset())")
@@ -62,17 +62,7 @@ public function generateImgproxyUri(JoinPointInterface $joinPoint): ?array
             $this->settings['salt']
         );
 
-        $sourceUri = '';
-
-        $resourceCollection = $this->resourceManager->getCollection($asset->getResource()->getCollectionName());
-        $resourceStorage = $resourceCollection->getStorage();
-        if (get_class($resourceStorage) === 'Flownative\Aws\S3\S3Storage') {
-            $bucketName = $resourceStorage->getBucketName();
-            $keyPrefix = $resourceStorage->getKeyPrefix();
-            $sourceUri = sprintf('s3://%s/%s/%s', $bucketName, rtrim($keyPrefix, '/'), $asset->getResource()->getSha1());
-        } else {
-            $sourceUri = $this->resourceManager->getPublicPersistentResourceUri($asset->getResource());
-        }
+        $sourceUri = $this->sourceUriHelper->sourceUri($asset->getResource());
 
         $targetHeight = $configuration->getHeight() ?? $configuration->getMaximumHeight() ?? 0;
         $targetWidth = $configuration->getWidth() ?? $configuration->getMaximumWidth() ?? 0;
@@ -140,4 +130,5 @@ protected function getRequest(JoinPointInterface $joinPoint): ActionRequest
     {
         return $joinPoint->getMethodArgument('request');
     }
+
 }

Classes/Eel/SourceUriHelper.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Networkteam\ImageProxy\Eel;
+
+/***************************************************************
+ *  (c) 2022 networkteam GmbH - all rights reserved
+ ***************************************************************/
+
+use Neos\Eel\ProtectedContextAwareInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\ResourceManagement\PersistentResource;
+use Neos\Flow\ResourceManagement\ResourceManager;
+use Neos\Media\Domain\Model\Asset;
+use Networkteam\ImageProxy\Aspects\ThumbnailAspect;
+
+class SourceUriHelper implements ProtectedContextAwareInterface
+{
+
+    /**
+     * @Flow\Inject
+     * @var ResourceManager
+     */
+    protected $resourceManager;
+
+    /**
+     * Get the source URI for fetching a resource.
+     *
+     * @param PersistentResource $resource The resource to generate the URI for
+     * @return string The source URI of the resource (could be either a http or s3 URL depending on the resource storage)
+     */
+    public function sourceUri(PersistentResource $resource): string
+    {
+        $sourceUri = '';
+
+        $resourceCollection = $this->resourceManager->getCollection($resource->getCollectionName());
+        $resourceStorage = $resourceCollection->getStorage();
+        if (get_class($resourceStorage) === 'Flownative\Aws\S3\S3Storage') {
+            $bucketName = $resourceStorage->getBucketName();
+            $keyPrefix = $resourceStorage->getKeyPrefix();
+            $sourceUri = sprintf('s3://%s/%s/%s', $bucketName, rtrim($keyPrefix, '/'), $resource->getSha1());
+        } else {
+            $sourceUri = $this->resourceManager->getPublicPersistentResourceUri($resource);
+        }
+
+        return $sourceUri;
+    }
+
+    /**
+     * All methods are considered safe, i.e. can be executed from within Eel
+     *
+     * @param string $methodName
+     * @return boolean
+     */
+    public function allowsCallOfMethod($methodName)
+    {
+        return true;
+    }
+}

Configuration/Settings.yaml

@@ -1,3 +1,8 @@
+Neos:
+  Fusion:
+    defaultContext:
+      Networkteam.ImageProxy: Networkteam\ImageProxy\Eel\SourceUriHelper
+
 Networkteam:
   ImageProxy:
     # The imgproxy base URL