Feature 74827 public route

.github/workflows/php.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         include:
           - php-version: 8.2
-            docker-image: anzusystems/php:1.1.0-php82-cli-vipsffmpeg
+            docker-image: anzusystems/php:3.0.0-php83-cli-vipsffmpeg
 
     services:
       elasticsearch:

CHANGELOG.md

@@ -1,3 +1,57 @@
+## [1.5.0](https://github.com/anzusystems/core-dam-bundle/compare/1.4.1...1.5.0) (2024-01-09)
+### Feature
+* php `8.3`
+* `AssetFileRoute` allows to generate public routes to assets
+* image response streaming
+* animated gif response
+
+## [1.4.1](https://github.com/anzusystems/core-dam-bundle/compare/1.4.0...1.4.1) (2023-12-19)
+### Feature
+* Serialize licenceId in AssetAdmListDto
+
+## [1.4.0](https://github.com/anzusystems/core-dam-bundle/compare/1.3.3...1.4.0) (2023-12-18)
+### Feature
+* Added sys apis for create and get asset file from storage
+
+## [1.3.3](https://github.com/anzusystems/core-dam-bundle/compare/1.3.2...1.3.3) (2023-11-28)
+### Feature
+* added API get asset by asset file
+
+## [1.3.2](https://github.com/anzusystems/core-dam-bundle/compare/1.3.1...1.3.2) (2023-11-24)
+### Fixes
+* fixed tracking modification for async image processing
+
+## [1.3.1](https://github.com/anzusystems/core-dam-bundle/compare/1.3.0...1.3.1) (2023-11-24)
+### Fixes
+* fixed allow list config - domain override
+
+## [1.3.0](https://github.com/anzusystems/core-dam-bundle/compare/1.2.0...1.3.0) (2023-11-24)
+### Features
+* method createFromStorage now converts file if convert required
+* public/private image feature
+* removed deprecated column key from entity CustomFormElement
+* custom BigIntType for doctrine (use int instead of string)
+* allow extId in AssetLicence to be nullable
+* PositionTrait position attribute changed from smallint to integer
+* update common bundle -> added prefix
+* package updates (psalm/ecs fixes)
+
+## [1.2.0](https://github.com/anzusystems/core-dam-bundle/compare/1.1.1...1.2.0) (2023-10-26)
+### Features
+* cusomMetadata validation rework
+* duplicate image preview rework
+* youtube default language
+
+### Bug fixes
+* long displayTitle parse fix
+* elastcseach keyword support
+* youtube redistribute change language fix
+
+
+## [1.1.1](https://github.com/anzusystems/core-dam-bundle/compare/1.1.0...1.1.1) (2023-07-21)
+### Bug fixes
+- Set YT thumbnail fix
+
 ## [1.1.0](https://github.com/anzusystems/core-dam-bundle/compare/1.0.0...1.1.0) (2023-06-22)
 
 ### Features

Dockerfile

@@ -1,4 +1,4 @@
-FROM anzusystems/php:1.1.0-php82-cli-vipsffmpeg
+FROM anzusystems/php:3.0.0-php83-cli-vipsffmpeg
 #
 ### Basic arguments and variables
 ARG DOCKER_USER_ID

composer.json

@@ -6,15 +6,15 @@
   "authors": [
   ],
   "require": {
-    "php": ">=8.2",
+    "php": ">=8.3",
     "ext-json": "*",
     "ext-mongodb": "*",
     "ext-redis": "*",
     "ext-simplexml": "*",
     "ext-vips": "*",
     "ext-xmlreader": "*",
     "ext-zend-opcache": "*",
-    "anzusystems/common-bundle": "^3.0",
+    "anzusystems/common-bundle": "^4.0",
     "doctrine/orm": ">=2.10",
     "elasticsearch/elasticsearch": "^8.6",
     "fakerphp/faker": "^1.20",
@@ -27,25 +27,25 @@
     "petitpress/gps-messenger-bundle": "^1.4",
     "php-ffmpeg/php-ffmpeg": "^1.0",
     "phpexiftool/exiftool": "^10.16",
-    "symfony/dependency-injection": "^6.3",
-    "symfony/doctrine-bridge": "^6.3",
-    "symfony/dotenv": "^6.3",
-    "symfony/expression-language": "^6.3",
-    "symfony/framework-bundle": "^6.3",
-    "symfony/http-client": "^6.3",
-    "symfony/http-kernel": "^6.3",
-    "symfony/lock": "^6.3",
-    "symfony/messenger": "^6.3",
-    "symfony/mime": "^6.3",
-    "symfony/options-resolver": "^6.3",
+    "symfony/dependency-injection": "^6.4",
+    "symfony/doctrine-bridge": "^6.4",
+    "symfony/dotenv": "^6.4",
+    "symfony/expression-language": "^6.4",
+    "symfony/framework-bundle": "^6.4",
+    "symfony/http-client": "^6.4",
+    "symfony/http-kernel": "^6.4",
+    "symfony/lock": "^6.4",
+    "symfony/messenger": "^6.4",
+    "symfony/mime": "^6.4",
+    "symfony/options-resolver": "^6.4",
     "symfony/polyfill-uuid": "^1.24",
-    "symfony/process": "^6.3",
-    "symfony/property-access": "^6.3",
-    "symfony/runtime": "^6.3",
-    "symfony/security-bundle": "^6.3",
-    "symfony/uid": "^6.3",
-    "symfony/validator": "^6.3",
-    "symfony/yaml": "^6.3"
+    "symfony/process": "^6.4",
+    "symfony/property-access": "^6.4",
+    "symfony/runtime": "^6.4",
+    "symfony/security-bundle": "^6.4",
+    "symfony/uid": "^6.4",
+    "symfony/validator": "^6.4",
+    "symfony/yaml": "^6.4"
   },
   "require-dev": {
     "doctrine/doctrine-bundle": "^2.4",

src/Cache/AssetFileRouteGenerator.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AnzuSystems\CoreDamBundle\Cache;
+
+use AnzuSystems\CoreDamBundle\Domain\Configuration\ConfigurationProvider;
+use AnzuSystems\CoreDamBundle\Domain\Configuration\ExtSystemConfigurationProvider;
+use AnzuSystems\CoreDamBundle\Entity\AssetFileRoute;
+use AnzuSystems\CoreDamBundle\Helper\UrlHelper;
+use AnzuSystems\CoreDamBundle\Model\Configuration\AssetFileRouteConfigurableInterface;
+
+final readonly class AssetFileRouteGenerator
+{
+    public function __construct(
+        private ExtSystemConfigurationProvider $extSystemConfigurationProvider,
+        private ConfigurationProvider $configurationProvider,
+    ) {
+    }
+
+    public function getFullUrl(
+        AssetFileRoute $route
+    ): string {
+        if (false === $route->getUri()->isMain()) {
+            return UrlHelper::concatPathWithDomain(
+                $this->configurationProvider->getSettings()->getRedirectDomain(),
+                $route->getUri()->getPath()
+            );
+        }
+
+        $config = $this->extSystemConfigurationProvider->getExtSystemConfigurationByAsset(
+            $route->getTargetAssetFile()->getAsset()
+        );
+
+        if ($config instanceof AssetFileRouteConfigurableInterface) {
+            return UrlHelper::concatPathWithDomain(
+                $config->getPublicDomainName(),
+                $route->getUri()->getPath()
+            );
+        }
+
+        return '';
+    }
+}

src/Controller/AbstractImageController.php

@@ -4,9 +4,20 @@
 
 namespace AnzuSystems\CoreDamBundle\Controller;
 
+use AnzuSystems\CoreDamBundle\Domain\Configuration\ConfigurationProvider;
+use AnzuSystems\CoreDamBundle\Domain\Configuration\DomainProvider;
+use AnzuSystems\CoreDamBundle\Domain\Image\Crop\CropFacade;
 use AnzuSystems\CoreDamBundle\Entity\AssetFile;
+use AnzuSystems\CoreDamBundle\Entity\ImageFile;
+use AnzuSystems\CoreDamBundle\Entity\RegionOfInterest;
+use AnzuSystems\CoreDamBundle\Exception\ImageManipulatorException;
+use AnzuSystems\CoreDamBundle\Exception\InvalidCropException;
 use AnzuSystems\CoreDamBundle\FileSystem\FileSystemProvider;
 use AnzuSystems\CoreDamBundle\Helper\FileNameHelper;
+use AnzuSystems\CoreDamBundle\Model\Dto\Image\Crop\RequestedCropDto;
+use AnzuSystems\CoreDamBundle\Repository\ImageFileRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use League\Flysystem\FilesystemException;
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -17,35 +28,58 @@ abstract class AbstractImageController extends AbstractPublicController
 {
     public const CROP_EXTENSION = 'jpeg';
     public const DEFAULT_CROP_MIME_TYPE = 'image/jpeg';
+    protected DomainProvider $domainProvider;
+    protected ImageFileRepository $imageFileRepository;
 
     private FileSystemProvider $fileSystemProvider;
+    private CropFacade $cropFacade;
+    private ConfigurationProvider $configurationProvider;
 
     #[Required]
     public function setFileSystemProvider(FileSystemProvider $fileSystemProvider): void
     {
         $this->fileSystemProvider = $fileSystemProvider;
     }
 
-    protected function streamOriginalResponse(AssetFile $assetFile): StreamedResponse
+    #[Required]
+    public function setCropFacade(CropFacade $cropFacade): void
     {
-        $fileSystem = $this->fileSystemProvider->getFilesystemByStorable($assetFile);
+        $this->cropFacade = $cropFacade;
+    }
 
-        $response = new StreamedResponse(
-            callback: function () use ($fileSystem, $assetFile) {
-                $outputStream = fopen('php://output', 'wb');
-                stream_copy_to_stream(
-                    $fileSystem->readStream($assetFile->getAssetAttributes()->getFilePath()),
-                    $outputStream
-                );
-            },
-            status: Response::HTTP_OK,
-            headers: [
-                'Content-Type' => $assetFile->getAssetAttributes()->getMimeType(),
-                'Content-Disposition' => $this->makeDisposition($assetFile),
-                'Content-Length' => $assetFile->getAssetAttributes()->getSize(),
-            ]
-        );
-        $this->assetFileCacheManager->setCache($response, $assetFile);
+    #[Required]
+    public function setDomainProvider(DomainProvider $domainProvider): void
+    {
+        $this->domainProvider = $domainProvider;
+    }
+
+    #[Required]
+    public function setConfigurationProvider(ConfigurationProvider $configurationProvider): void
+    {
+        $this->configurationProvider = $configurationProvider;
+    }
+
+    #[Required]
+    public function setImageFileRepository(ImageFileRepository $imageFileRepository): void
+    {
+        $this->imageFileRepository = $imageFileRepository;
+    }
+
+    /**
+     * @throws FilesystemException
+     * @throws ImageManipulatorException
+     * @throws InvalidCropException
+     */
+    protected function okImageResponse(
+        ImageFile $image,
+        RegionOfInterest $roi,
+        RequestedCropDto $cropPayload
+    ): Response {
+        $response = $this->getImageResponse(
+            content: $this->cropFacade->applyCropPayload($image, $cropPayload, $roi),
+            assetFile: $image,
+        )->setStatusCode(Response::HTTP_OK);
+        $this->assetFileCacheManager->setCache($response, $image);
 
         return $response;
     }
@@ -58,15 +92,75 @@ protected function okResponse(string $content, AssetFile $asset): Response
         return $response;
     }
 
-    protected function notFoundResponse(string $content, AssetFile $asset): Response
+    protected function notFoundResponse(): Response
     {
-        $response = $this->getImageResponse($content, $asset)->setStatusCode(Response::HTTP_NOT_FOUND);
+        $response = new Response('', Response::HTTP_NOT_FOUND);
         $this->assetFileCacheManager->setNotFoundCache($response);
 
         return $response;
     }
 
-    protected function getImageResponse(string $content, AssetFile $assetFile): Response
+    /**
+     * @throws FilesystemException
+     * @throws ImageManipulatorException
+     * @throws InvalidCropException
+     * @throws NonUniqueResultException
+     */
+    protected function notFoundImageResponse(RequestedCropDto $cropPayload): Response
+    {
+        $notFoundImageId = $this->configurationProvider->getSettings()->getNotFoundImageId();
+        if (empty($notFoundImageId)) {
+            return $this->notFoundResponse();
+        }
+
+        $notFoundImage = $this->imageFileRepository->findProcessedById($notFoundImageId);
+        if (null === $notFoundImage) {
+            return $this->notFoundResponse();
+        }
+
+        $notFoundRoi = $notFoundImage->getRegionsOfInterest()->first();
+        if ($notFoundRoi instanceof RegionOfInterest) {
+            $response = $this->getImageResponse(
+                content: $this->cropFacade->applyCropPayload($notFoundImage, $cropPayload, $notFoundRoi),
+                assetFile: $notFoundImage,
+            )->setStatusCode(Response::HTTP_OK);
+            $this->assetFileCacheManager->setNotFoundCache($response);
+
+            return $response;
+        }
+
+        return $this->notFoundResponse();
+    }
+
+    /**
+     * @throws FilesystemException
+     */
+    protected function streamResponse(AssetFile $assetFile): StreamedResponse
+    {
+        $filesystem = $this->fileSystemProvider->getFilesystemByStorable($assetFile);
+        $fileStream = $filesystem->readStream($assetFile->getAssetAttributes()->getFilePath());
+
+        $response = new StreamedResponse(
+            function () use ($fileStream) {
+                $outputStream = fopen('php://output', 'wb');
+                stream_copy_to_stream($fileStream, $outputStream);
+            },
+            Response::HTTP_OK,
+            [
+                'Content-Transfer-Encoding' => 'binary',
+                'Content-Type' => $assetFile->getAssetAttributes()->getMimeType(),
+                'Content-Length' => fstat($fileStream)['size'],
+            ]
+        );
+        $this->assetFileCacheManager->setCache(
+            $response,
+            $assetFile
+        );
+
+        return $response;
+    }
+
+    private function getImageResponse(string $content, AssetFile $assetFile): Response
     {
         return new Response($content, Response::HTTP_OK, [
             'Content-Type' => self::DEFAULT_CROP_MIME_TYPE,