fix: download multiparts

michibox · May 25, 2023 · 7a5ed22 · 7a5ed22
1 parent 33847d2
commit 7a5ed22
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/components/DownloadFile/DownloadFile.ts b/src/components/DownloadFile/DownloadFile.ts
@@ -21,7 +21,8 @@ import { AbortController } from '../UploadFile/AbortController';
 export interface detailProps {
     fileStatus: number;
     isDownload: boolean;
-    preSignedUrl?: string | null;
+    urlGet: string;
+    urlHead: string;
     progress: number;
     urlService: string;
 }
@@ -198,7 +199,8 @@ export class DownloadFile extends Evented {
         this.downloader = new Downloader({
             ...downloaderOptions,
             params: {
-                url: downloaderOptions.preSignedUrl,
+                urlGet: downloaderOptions.urlGet,
+                urlHead: downloaderOptions.urlHead,
             },
             controller: this.controller,
             urlService:  downloaderOptions.urlService

diff --git a/src/components/DownloadFile/downloader.ts b/src/components/DownloadFile/downloader.ts
@@ -284,9 +284,9 @@ export class Downloader {
                 xhr.addEventListener('abort', progressListener);
                 xhr.addEventListener('loadend', progressListener);
 
-               // const parameters = `url=${encodeURIComponent(params.url)}`;
+
 
-                xhr.open('GET', params.url , true); // `${this.urlService}?${parameters}`
+                xhr.open('GET', params.urlGet , true);
 
                 xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
                 // xhr.setRequestHeader('Authorization', this.token)
@@ -390,11 +390,9 @@ export class Downloader {
     getContentLength(params: any) {
         return new Promise((resolve, reject) => {
             const xhr = new XMLHttpRequest();
-            // xhr.withCredentials = true;
 
-            // const parameters = `url=${encodeURIComponent(params.url)}`;
 
-            xhr.open('HEAD', params.url); //  `${this.urlService}?${parameters}`
+            xhr.open('HEAD', params.urlHead);
 
             xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
             // xhr.setRequestHeader('Authorization', token)

diff --git a/src/components/useFileDownloadS3Multipart.ts b/src/components/useFileDownloadS3Multipart.ts
@@ -34,7 +34,10 @@ export const useFileDownloadS3Multipart = ({
     const getFile = async (fileUUID: string) => {
         try {
             // @ts-ignore
-            const { preSignedUrl } =
+            const { preSignedUrls : {
+                urlGet,
+                urlHead
+            } } =
                 await TransferService.generateDownloadSignedUrl({
                     fileUUID,
                     urlService,
@@ -46,7 +49,8 @@ export const useFileDownloadS3Multipart = ({
             const detail = {
                 fileStatus: PENDING_STATUS,
                 isDownload: true,
-                preSignedUrl,
+                urlGet,
+                urlHead,
                 progress: 0,
                 urlService
             };