ZKUI-381 // Fix objects dowload in 2.1

scality · Oct 3, 2023 · 5fc8476 · 5fc8476
1 parent 92702f6
commit 5fc8476
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/js/S3Client.ts b/src/js/S3Client.ts
@@ -61,13 +61,23 @@ export default class S3Client {
       ) {
         const result = this.originalAddAuthorization(credentials, date);
 
-        request.endpoint = originalRequest.endpoint;
-        request.headers = {
-          ...originalRequest.headers,
-          ...request.headers,
-          Host: originalRequest.headers.Host,
-        };
-        request.path = originalRequest.path;
+        if (!this.isPresigned()) {
+          request.endpoint = originalRequest.endpoint;
+          request.headers = {
+            ...originalRequest.headers,
+            ...request.headers,
+            Host: originalRequest.headers.Host,
+          };
+          request.path = originalRequest.path;
+        } else {
+          request.endpoint = originalRequest.endpoint;
+          request.headers = {
+            ...originalRequest.headers,
+            ...request.headers,
+            Host: originalRequest.headers.Host,
+          };
+          request.path = s3Path + request.path;
+        }
         return result;
       };