@uppy/aws-s3: always set S3 meta to UppyFile & include key

[Murderlon]

Closes #5513
Closes #5586
Closes #5565
Closes #5569

• uppy.on('upload-success', (file, response) => {}) now correctly has response.body populated.
• uppy.getFile(someId).s3Multipart is now always populated (previously only for multipart uploads).
• uppy.getFile(someId).meta does not contain S3 related data. Use file.s3Multipart for that.

[github-actions]

Diff output files

diff --git a/packages/@uppy/aws-s3/lib/HTTPCommunicationQueue.js b/packages/@uppy/aws-s3/lib/HTTPCommunicationQueue.js
index 29c5f4b..d1bfe35 100644
--- a/packages/@uppy/aws-s3/lib/HTTPCommunicationQueue.js
+++ b/packages/@uppy/aws-s3/lib/HTTPCommunicationQueue.js
@@ -305,7 +305,7 @@ export class HTTPCommunicationQueue {
         signature = await _classPrivateFieldLooseBase(this, _fetchSignature)[_fetchSignature](
           _classPrivateFieldLooseBase(this, _getFile)[_getFile](file),
           {
-            uploadId,
+            uploadId: uploadId,
             key,
             partNumber,
             body: chunkData,
@@ -389,6 +389,7 @@ async function _shouldRetry2(err, retryDelayIterator) {
   return true;
 }
 async function _nonMultipartUpload2(file, chunk, signal) {
+  var _ref3;
   const {
     method = "POST",
     url,
@@ -429,8 +430,17 @@ async function _nonMultipartUpload2(file, chunk, signal) {
     onComplete,
     signal,
   }).abortOn(signal);
-  return "location" in result ? result : {
-    location: removeMetadataFromURL(url),
+  const key = fields == null ? void 0 : fields.key;
+  if (!key) {
+    console.error("Expected `fields.key` to be returend but the backend/Companion");
+  }
+  _classPrivateFieldLooseBase(this, _setS3MultipartState)[_setS3MultipartState](file, {
+    key: key,
+  });
+  return {
     ...result,
+    location: (_ref3 = result.location) != null ? _ref3 : removeMetadataFromURL(url),
+    bucket: fields == null ? void 0 : fields.bucket,
+    key,
   };
 }
diff --git a/packages/@uppy/companion/lib/server/controllers/s3.js b/packages/@uppy/companion/lib/server/controllers/s3.js
index 7526f30..ff54520 100644
--- a/packages/@uppy/companion/lib/server/controllers/s3.js
+++ b/packages/@uppy/companion/lib/server/controllers/s3.js
@@ -124,6 +124,7 @@ module.exports = function s3(config) {
       res.json({
         key: data.Key,
         uploadId: data.UploadId,
+        bucket: data.Bucket,
       });
     }, next);
   }
@@ -359,6 +360,8 @@ module.exports = function s3(config) {
     ).then(data => {
       res.json({
         location: data.Location,
+        key: data.Key,
+        bucket: data.Bucket,
       });
     }, next);
   }

[mifi]

shouldn't we remove this console.log? make it into a comment instead?

// Expected `fields.key` to be returned by Companion. This means the Companion version is too old

[Murderlon]

Maybe that makes more sense yes 👍

[b-bot]

Does anyone mind please explaining why I'm getting this error after updating?
Everything was working before (and still does) but now this comes up as an error in my react overlay.

Using AwsS3 with getUploadParameters.

I think it has something to do with this return:

      return await res.json().then((data: DataObject) => {
        return {
          method: data?.method,
          url: data?.url,
          fields: {}, // Add an empty fields property
          expires: undefined, // Add expires property with value undefined
          headers: {
            'Content-Type': file.type,
            'Content-Disposition': `${disposition}; filename="${sanitizedFilename}"`,
          },
        };
      });

Can I just add key: '' inside empty fields object?