Do not apply path prefix when preparing the URL

Fixes: #12
cedricziel · Feb 2, 2021 · a112f21 · a112f21
1 parent adbeffd
commit a112f21
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/src/GoogleCloudStorageAdapter.php b/src/GoogleCloudStorageAdapter.php
@@ -434,9 +434,7 @@ public function getVisibility($path)
      */
     public function getUrl($path)
     {
-        $path = $this->applyPathPrefix($path);
-
-        return implode('/', [$this->baseUrl, $path]);
+        return sprintf('%s/%s', rtrim($this->baseUrl, '/'), ltrim($path, '/'));
     }
 
     /**

diff --git a/tests/GoogleCloudStorageAdapterTest.php b/tests/GoogleCloudStorageAdapterTest.php
@@ -191,7 +191,7 @@ public function testDeletingNonExistentObjectsWillNotFail(): void
 
     public function testPrefixesCanBeUsed(): void
     {
-        $testId = uniqid();
+        $testId = uniqid('', true);
         $testPrefix = "my/prefix/testPrefixesCanBeUsed-{$testId}/";
 
         $simpleConfig = new Config([]);
@@ -473,4 +473,44 @@ public function bucketPrefixDataProvider()
             ['my-bucket/prefix/in/bucket/', '/bar/baz.txt', GoogleCloudStorageAdapter::GCS_BASE_URL.'/my-bucket/prefix/in/bucket/bar/baz.txt'],
         ];
     }
+
+    /**
+     * @see https://github.com/cedricziel/flysystem-gcs/issues/12
+     *
+     * @covers \CedricZiel\FlysystemGcs\GoogleCloudStorageAdapter::getUrl()
+     */
+    public function testPrefixIsNotAddedTwiceForUrl(): void
+    {
+        $testId = uniqid('', true);
+        $adapterConfig = [
+            'bucket' => $this->bucket,
+            'projectId' => $this->project,
+            'prefix' => sprintf('icon-%s', $testId),
+        ];
+
+        $adapter = new GoogleCloudStorageAdapter(null, $adapterConfig);
+        $url = $adapter->getUrl('test.txt');
+
+        self::assertEquals(sprintf('%s/%s/%s/test.txt', GoogleCloudStorageAdapter::GCS_BASE_URL, $adapterConfig['bucket'], $adapterConfig['prefix']), $url);
+    }
+
+    /**
+     * @see https://github.com/cedricziel/flysystem-gcs/issues/12
+     *
+     * @covers \CedricZiel\FlysystemGcs\GoogleCloudStorageAdapter::getUrl()
+     */
+    public function testUrlCanBeCreated(): void
+    {
+        $testId = uniqid('', true);
+        $adapterConfig = [
+            'bucket' => $this->bucket,
+            'projectId' => $this->project,
+        ];
+
+        $adapter = new GoogleCloudStorageAdapter(null, $adapterConfig);
+        $objectName = sprintf('%s/test.txt', sprintf('icon-%s', $testId));
+        $url = $adapter->getUrl($objectName);
+
+        self::assertEquals(sprintf('%s/%s/%s', GoogleCloudStorageAdapter::GCS_BASE_URL, $adapterConfig['bucket'], $objectName), $url);
+    }
 }