issue #535 Honor the key_prefix when making requests using cloudfront.

catalyst · Jan 30, 2023 · d2633f5 · d2633f5
1 parent 0b52885
commit d2633f5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/classes/local/store/s3/client.php b/classes/local/store/s3/client.php
@@ -543,7 +543,13 @@ private function generate_presigned_url_cloudfront($contenthash, array $headers
                 $key .= '';
             }
         }
-        $resource = $this->config->cloudfrontresourcedomain . '/' . $key;
+
+        if (!empty($this->bucketkeyprefix)) {
+            $resource = $this->config->cloudfrontresourcedomain . '/' . $this->bucketkeyprefix . $key;
+        } else {
+            $resource = $this->config->cloudfrontresourcedomain . '/' . $key;
+        }
+
         // This is the id of the Cloudfront key pair you generated.
         $keypairid = $this->config->cloudfrontkeypairid;