Auto-detect and fallback to api url generator

Author: silverbackdan

src/Factory/Uploadable/MediaObjectFactory.php

@@ -23,6 +23,7 @@
 use Silverback\ApiComponentsBundle\Entity\Core\FileInfo;
 use Silverback\ApiComponentsBundle\Entity\Utility\ImagineFiltersInterface;
 use Silverback\ApiComponentsBundle\Exception\InvalidArgumentException;
+use Silverback\ApiComponentsBundle\Flysystem\FilesystemFactory;
 use Silverback\ApiComponentsBundle\Flysystem\FilesystemProvider;
 use Silverback\ApiComponentsBundle\Helper\Uploadable\FileInfoCacheManager;
 use Silverback\ApiComponentsBundle\Imagine\FlysystemDataLoader;
@@ -46,6 +47,7 @@ public function __construct(
         private readonly FlysystemDataLoader $flysystemDataLoader,
         private readonly RequestStack $requestStack,
         private readonly ServiceLocator $urlGenerators,
+        private readonly FilesystemFactory $filesystemFactory,
         private readonly ?FilterService $filterService = null
     ) {
         $this->initRegistry($managerRegistry);
@@ -71,7 +73,19 @@ public function createMediaObjects(object $object): ?ArrayCollection
                 continue;
             }
 
-            $urlGenerator = $this->urlGenerators->get($fieldConfiguration->urlGenerator);
+            $urlGeneratorReference = $fieldConfiguration->urlGenerator ?? 'api';
+            $urlGenerator = $this->urlGenerators->get($urlGeneratorReference);
+            if ($urlGenerator !== 'api') {
+                $adapter = $this->filesystemFactory->getAdapter($fieldConfiguration->adapter);
+                if (
+                    ($urlGenerator instanceof TemporaryUrlGenerator && !($adapter instanceof \League\Flysystem\UrlGeneration\TemporaryUrlGenerator)) ||
+                    ($urlGenerator instanceof PublicUrlGenerator && !($adapter instanceof \League\Flysystem\UrlGeneration\PublicUrlGenerator))
+                ) {
+                    $urlGeneratorReference = 'api';
+                    $urlGenerator = $this->urlGenerators->get($urlGeneratorReference);
+                }
+            }
+
             if (!$urlGenerator instanceof UploadableUrlGeneratorInterface) {
                 throw new InvalidArgumentException(sprintf('The url generator provided must implement %s', UploadableUrlGeneratorInterface::class));
             }

src/Flysystem/FilesystemFactory.php

@@ -31,6 +31,10 @@ public function __construct(private readonly ServiceLocator $adapters)
      */
     public function create(string $name, array $config = []): Filesystem
     {
-        return new Filesystem($this->adapters->get($name), $config);
+        return new Filesystem($this->getAdapter($name), $config);
+    }
+
+    public function getAdapter(string $name) {
+        return $this->adapters->get($name);
     }
 }

src/Flysystem/FilesystemProvider.php

@@ -33,7 +33,6 @@ public function __construct(private readonly ServiceLocator $filesystems)
 
     /**
      * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
      */
     public function getFilesystem(string $name): Filesystem
     {