fix objectUrl

freyo · Apr 8, 2019 · 73dec73 · 73dec73
1 parent 1bc6b8c
commit 73dec73
Showing 1 changed file with 41 additions and 23 deletions.
diff --git a/src/Adapter.php b/src/Adapter.php
@@ -126,12 +126,7 @@ public function getUrl($path)
             $this->getBucket(), $path, null, $options
         );
 
-        $url = parse_url($objectUrl);
-
-        return sprintf(
-            '%s://%s%s',
-            $url['scheme'], $url['host'], rawurldecode($url['path'])
-        );
+        return $objectUrl;
     }
 
     /**
@@ -152,12 +147,7 @@ public function getTemporaryUrl($path, DateTimeInterface $expiration, array $opt
             $this->getBucket(), $path, $expiration->format('c'), $options
         );
 
-        $url = parse_url($objectUrl);
-
-        return sprintf(
-            '%s://%s%s?%s',
-            $url['scheme'], $url['host'], rawurldecode($url['path']), $url['query']
-        );
+        return $objectUrl;
     }
 
     /**
@@ -346,17 +336,9 @@ public function has($path)
     public function read($path)
     {
         try {
-            if (isset($this->config['read_from_cdn']) && $this->config['read_from_cdn']) {
-                $response = $this->getHttpClient()
-                                 ->get($this->applyPathPrefix($path))
-                                 ->getBody()
-                                 ->getContents();
-            } else {
-                $response = $this->client->getObject([
-                    'Bucket' => $this->getBucket(),
-                    'Key'    => $path,
-                ])->get('Body');
-            }
+            $response = $this->forceReadFromCDN()
+                ? $this->readFromCDN($path)
+                : $this->readFromSource($path);
 
             return ['contents' => (string) $response];
         } catch (NoSuchKeyException $e) {
@@ -366,6 +348,42 @@ public function read($path)
         }
     }
 
+    /**
+     * @return bool
+     */
+    protected function forceReadFromCDN()
+    {
+        return $this->config['cdn']
+            && isset($this->config['read_from_cdn'])
+            && $this->config['read_from_cdn'];
+    }
+
+    /**
+     * @param $path
+     *
+     * @return string
+     */
+    protected function readFromCDN($path)
+    {
+        return $this->getHttpClient()
+            ->get($this->applyPathPrefix($path))
+            ->getBody()
+            ->getContents();
+    }
+
+    /**
+     * @param $path
+     *
+     * @return string
+     */
+    protected function readFromSource($path)
+    {
+        return $this->client->getObject([
+            'Bucket' => $this->getBucket(),
+            'Key'    => $path,
+        ])->get('Body');
+    }
+
     /**
      * @return \GuzzleHttp\Client
      */