Merge pull request #28 from G4brym/fix-multipart-upload

Fix multipart upload
G4brym · Sep 7, 2023 · 9de48bc · 9de48bc
2 parents 2ca902f + 47949eb
commit 9de48bc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/packages/dashboard/src/api.js b/packages/dashboard/src/api.js
@@ -77,7 +77,6 @@ const apiHandler = {
     });
   },
   multipartComplete: (file, folder, parts, uploadId) => {
-    const key = apiHandler.getKey(folder, file.name);
     return axios.post(`/api/buckets/${store.state.activeBucket}/multipart/complete`, {
       key: encodeKey(file.name, folder),
       uploadId,

diff --git a/worker/package-lock.json b/worker/package-lock.json
diff --git a/worker/package.json b/worker/package.json
@@ -95,7 +95,7 @@
     "wrangler": "^3.6.0"
   },
   "dependencies": {
-    "@cloudflare/itty-router-openapi": "https://prerelease-registry.devprod.cloudflare.dev/itty-router-openapi/runs/5881739194/npm-package-itty-router-openapi-83",
+    "@cloudflare/itty-router-openapi": "^1.0.1",
     "postal-mime": "^1.0.16"
   },
   "bin": {

diff --git a/worker/src/buckets/api/multipart/createUpload.ts b/worker/src/buckets/api/multipart/createUpload.ts
@@ -38,11 +38,6 @@ export class CreateUpload extends OpenAPIRoute {
       httpMetadata = JSON.parse(decodeURIComponent(escape(atob(data.query.httpMetadata))))
     }
 
-    const multipartUpload = await bucket.createMultipartUpload(key, {customMetadata: customMetadata, httpMetadata: httpMetadata});
-
-    return {
-      uploadId: multipartUpload.uploadId,
-      key: multipartUpload.key,
-    }
+    return await bucket.createMultipartUpload(key, {customMetadata: customMetadata, httpMetadata: httpMetadata});
   }
 }