fix: downloader and uploader

michibox · May 25, 2023 · 3230e46 · 3230e46
1 parent d540e5f
commit 3230e46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/components/DownloadFile/downloader.ts b/src/components/DownloadFile/downloader.ts
@@ -284,8 +284,9 @@ export class Downloader {
                 xhr.addEventListener('abort', progressListener);
                 xhr.addEventListener('loadend', progressListener);
 
-                const parameters = `url=${encodeURIComponent(params.url)}`;
-                xhr.open('GET', `${this.urlService}?${parameters}`, true);
+               // const parameters = `url=${encodeURIComponent(params.url)}`;
+
+                xhr.open('GET', params.url , true); // `${this.urlService}?${parameters}`
 
                 xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
                 // xhr.setRequestHeader('Authorization', this.token)
@@ -391,8 +392,9 @@ export class Downloader {
             const xhr = new XMLHttpRequest();
             xhr.withCredentials = true;
 
-            const parameters = `url=${encodeURIComponent(params.url)}`;
-            xhr.open('HEAD', `${this.urlService}?${parameters}`);
+            // const parameters = `url=${encodeURIComponent(params.url)}`;
+
+            xhr.open('HEAD', params.url); //  `${this.urlService}?${parameters}`
 
             xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
             // xhr.setRequestHeader('Authorization', token)

diff --git a/src/components/UploadFile/uploader.ts b/src/components/UploadFile/uploader.ts
@@ -292,9 +292,9 @@ export class Uploader {
                     return reject('eeor'); // return reject(new AbortError())
                 }
 
-                const data = new FormData();
+                /* const data = new FormData();
                 data.append('file', file);
-                data.append('signedUrl', part.signedUrl);
+                data.append('signedUrl', part.signedUrl); */
 
                 const xhr = (this.activeConnections[part.PartNumber - 1] =
                     new XMLHttpRequest());
@@ -319,14 +319,15 @@ export class Uploader {
                 xhr.addEventListener('loadend', progressListener);
 
                // const token = sessionStorage.getItem(NAME_TOKEN);
-                const url = `${this.urlService}/api/file/upload/upload-signed-url`;
+               // const url = `${this.urlService}/api/file/upload/upload-signed-url`;
+                const url = part.signedUrl;
 
                 xhr.open('POST', url);
 
                 xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
                 // xhr.setRequestHeader('Authorization', `Bearer ${token}`);
-                xhr.setRequestHeader('App-UUID', this.appUUID);
-                xhr.setRequestHeader('Module-UUID', this.moduleUUID);
+               // xhr.setRequestHeader('App-UUID', this.appUUID);
+               // xhr.setRequestHeader('Module-UUID', this.moduleUUID);
 
                 xhr.onload = () => {
                     if (xhr.status >= 200 && xhr.status < 400) {