Fix test

transloadit · Jan 14, 2025 · 779f9a5 · 779f9a5
1 parent 4ef4c82
commit 779f9a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts b/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts
@@ -278,16 +278,17 @@ export class HTTPCommunicationQueue<M extends Meta, B extends Body> {
 
     const key = fields?.key
     if (!key) {
-      throw new Error(
+      console.error(
         'Expected `fields.key` to be returend but the backend/Companion',
       )
     }
-    this.#setS3MultipartState(file, { key })
+    this.#setS3MultipartState(file, { key: key! })
 
     return {
       ...result,
-      location: removeMetadataFromURL(url),
-      bucket: fields.bucket,
+      location:
+        (result.location as string | undefined) ?? removeMetadataFromURL(url),
+      bucket: fields?.bucket,
       key,
     }
   }

diff --git a/packages/@uppy/aws-s3/src/index.test.ts b/packages/@uppy/aws-s3/src/index.test.ts
@@ -50,7 +50,10 @@ describe('AwsS3Multipart', () => {
         getUploadParameters: () => ({
           method: 'POST',
           url: 'https://bucket.s3.us-east-2.amazonaws.com/',
-          fields: {},
+          fields: {
+            key: 'file',
+            bucket: 'https://bucket.s3.us-east-2.amazonaws.com/',
+          },
         }),
       })
       const scope = nock(
@@ -89,6 +92,8 @@ describe('AwsS3Multipart', () => {
           ETag: 'test',
           etag: 'test',
           location: 'http://example.com',
+          key: 'file',
+          bucket: 'https://bucket.s3.us-east-2.amazonaws.com/',
         },
         status: 200,
         uploadURL: 'http://example.com',