Fix aws-s3-multipart route ordering and query parameters (#3132)

packages/@uppy/aws-s3-multipart/src/index.js

@@ -105,7 +105,7 @@ module.exports = class AwsS3Multipart extends BasePlugin {
     this.assertHost('prepareUploadParts')
 
     const filename = encodeURIComponent(key)
-    return this.client.get(`s3/multipart/${uploadId}/batch?key=${filename}?partNumbers=${partNumbers.join(',')}`)
+    return this.client.get(`s3/multipart/${uploadId}/batch?key=${filename}&partNumbers=${partNumbers.join(',')}`)
       .then(assertServerError)
   }
 

packages/@uppy/companion/src/server/controllers/s3.js

@@ -340,9 +340,9 @@ module.exports = function s3 (config) {
     .get('/params', getUploadParameters)
     .post('/multipart', createMultipartUpload)
     .get('/multipart/:uploadId', getUploadedParts)
+    .get('/multipart/:uploadId/batch', batchSignPartsUpload)
     .get('/multipart/:uploadId/:partNumber', signPartUpload)
     .post('/multipart/:uploadId/complete', completeMultipartUpload)
-    .get(`/multipart/:uploadId/batch`, batchSignPartsUpload)
     .delete('/multipart/:uploadId', abortMultipartUpload)
 }