Fixed Bugs Url

Author: wanforge

src/actions/FileAction.php

@@ -39,14 +39,6 @@ class FileAction extends Action
      */
     public $component = 'fs';
 
-    /**
-     * @return \diecoding\flysystem\AbstractComponent|mixed
-     */
-    public function getFilesystem()
-    {
-        return Yii::$app->get($this->component);
-    }
-
     /**
      * Runs the action.
      *
@@ -56,18 +48,21 @@ public function getFilesystem()
      */
     public function run($data = null)
     {
+        /** @var \diecoding\flysystem\AbstractComponent|mixed $filesystem */
+        $filesystem = Yii::$app->get($this->component);
+
         try {
-            $params = Json::decode($this->getFilesystem()->decrypt($data));
+            $params = Json::decode($filesystem->decrypt($data));
 
             $now = (int) (new DateTimeImmutable())->getTimestamp();
             $expires = (int) $params['expires'];
 
-            if (!$this->getFilesystem()->fileExists($params['path']) || ($expires > 0 && $expires < $now)) {
+            if (!$filesystem->fileExists($params['path']) || ($expires > 0 && $expires < $now)) {
                 throw new NotFoundHttpException(Yii::t('yii', 'Page not found.'));
             }
 
-            $content = $this->getFilesystem()->read($params['path']);
-            $mimeType = $this->getFilesystem()->mimeType($params['path']);
+            $content = $filesystem->read($params['path']);
+            $mimeType = $filesystem->mimeType($params['path']);
             $attachmentName = (string) pathinfo($params['path'], PATHINFO_BASENAME);
         } catch (\Throwable $th) {
             throw new NotFoundHttpException(Yii::t('yii', 'Page not found.'));

src/adapter/ZipArchiveAdapter.php

@@ -4,8 +4,10 @@
 
 namespace diecoding\flysystem\adapter;
 
+use DateTimeInterface;
+use diecoding\flysystem\AbstractComponent;
 use diecoding\flysystem\traits\ChecksumAdapterTrait;
-use diecoding\flysystem\traits\UrlGeneratorAdapterTrait;
+use diecoding\flysystem\traits\UrlGeneratorComponentTrait;
 use Generator;
 use League\Flysystem\ChecksumProvider;
 use League\Flysystem\Config;
@@ -30,6 +32,8 @@
 use League\MimeTypeDetection\FinfoMimeTypeDetector;
 use League\MimeTypeDetection\MimeTypeDetector;
 use Throwable;
+use yii\helpers\Json;
+use yii\helpers\Url;
 use ZipArchive;
 
 use function fclose;
@@ -42,7 +46,7 @@
  */
 final class ZipArchiveAdapter implements FilesystemAdapter, ChecksumProvider, PublicUrlGenerator, TemporaryUrlGenerator
 {
-    use UrlGeneratorAdapterTrait, ChecksumAdapterTrait;
+    use ChecksumAdapterTrait;
 
     private PathPrefixer $pathPrefixer;
     private MimeTypeDetector $mimeTypeDetector;
@@ -444,4 +448,33 @@ private function setVisibilityAttribute(string $statsName, string $visibility, Z
 
         return $archive->setExternalAttributesName($statsName, ZipArchive::OPSYS_UNIX, $visibility << 16);
     }
+
+    // =================================================
+
+    /**
+     * @var UrlGeneratorComponentTrait|AbstractComponent
+     */
+    public $component;
+
+    public function publicUrl(string $path, Config $config): string
+    {
+        // TODO: Use absolute path and don't encrypt
+        $params = [
+            'path' => $path,
+            'expires' => 0,
+        ];
+
+        return Url::toRoute([$this->component->action, 'data' => $this->component->encrypt(Json::encode($params))], true);
+    }
+
+    public function temporaryUrl(string $path, DateTimeInterface $expiresAt, Config $config): string
+    {
+        // TODO: Use absolute path and don't encrypt
+        $params = [
+            'path' => $path,
+            'expires' => (int) $expiresAt->getTimestamp(),
+        ];
+
+        return Url::toRoute([$this->component->action, 'data' => $this->component->encrypt(Json::encode($params))], true);
+    }
 }

src/traits/UrlGeneratorAdapterTrait.php

@@ -5,6 +5,7 @@
 use DateTimeInterface;
 use diecoding\flysystem\AbstractComponent;
 use League\Flysystem\Config;
+use League\Flysystem\PathPrefixer;
 use yii\helpers\Json;
 use yii\helpers\Url;
 
@@ -18,13 +19,17 @@
 trait UrlGeneratorAdapterTrait
 {
     /**
-     * @var UrlGeneratorComponentTrait
+     * @var UrlGeneratorComponentTrait|AbstractComponent
      */
     public $component;
 
     public function publicUrl(string $path, /** @scrutinizer ignore-unused */Config $config): string
     {
         // TODO: Use absolute path and don't encrypt
+        if ($this->component->prefix) {
+            $prefixer = new PathPrefixer($this->component->prefix);
+            $path = $prefixer->stripPrefix($path);
+        }
         $params = [
             'path' => $path,
             'expires' => 0,
@@ -36,6 +41,10 @@ public function publicUrl(string $path, /** @scrutinizer ignore-unused */Config
     public function temporaryUrl(string $path, DateTimeInterface $expiresAt, /** @scrutinizer ignore-unused */Config $config): string
     {
         // TODO: Use absolute path and don't encrypt
+        if ($this->component->prefix) {
+            $prefixer = new PathPrefixer($this->component->prefix);
+            $path = $prefixer->stripPrefix($path);
+        }
         $params = [
             'path' => $path,
             'expires' => (int) $expiresAt->getTimestamp(),