@aws-amplify/storage 4.4.5 → 4.4.6-unstable.5

package/dist/aws-amplify-storage.js

@@ -44856,6 +44856,8 @@ function Parser(options) {
   this.replaceCDATAstr = replaceCDATAstr;
   this.replaceCDATAarr = replaceCDATAarr;
 
+  this.processTextOrObjNode = processTextOrObjNode
+
   if (this.options.format) {
     this.indentate = indentate;
     this.tagEndChar = '>\n';
@@ -44892,10 +44894,7 @@ Parser.prototype.parse = function(jObj) {
 Parser.prototype.j2x = function(jObj, level) {
   let attrStr = '';
   let val = '';
-  const keys = Object.keys(jObj);
-  const len = keys.length;
-  for (let i = 0; i < len; i++) {
-    const key = keys[i];
+  for (let key in jObj) {
     if (typeof jObj[key] === 'undefined') {
       // supress undefined node
     } else if (jObj[key] === null) {
@@ -44944,8 +44943,7 @@ Parser.prototype.j2x = function(jObj, level) {
           } else if (item === null) {
             val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
           } else if (typeof item === 'object') {
-            const result = this.j2x(item, level + 1);
-            val += this.buildObjNode(result.val, key, result.attrStr, level);
+            val += this.processTextOrObjNode(item, key, level)
           } else {
             val += this.buildTextNode(item, key, '', level);
           }
@@ -44960,14 +44958,22 @@ Parser.prototype.j2x = function(jObj, level) {
           attrStr += ' ' + Ks[j] + '="' + this.options.attrValueProcessor('' + jObj[key][Ks[j]]) + '"';
         }
       } else {
-        const result = this.j2x(jObj[key], level + 1);
-        val += this.buildObjNode(result.val, key, result.attrStr, level);
+        val += this.processTextOrObjNode(jObj[key], key, level)
       }
     }
   }
   return {attrStr: attrStr, val: val};
 };
 
+function processTextOrObjNode (object, key, level) {
+  const result = this.j2x(object, level + 1);
+  if (object[this.options.textNodeName] !== undefined && Object.keys(object).length === 1) {
+    return this.buildTextNode(result.val, key, result.attrStr, level);
+  } else {
+    return this.buildObjNode(result.val, key, result.attrStr, level);
+  }
+}
+
 function replaceCDATAstr(str, cdata) {
   str = this.options.tagValueProcessor('' + str);
   if (this.options.cdataPositionChar === '' || str === '') {
@@ -44990,7 +44996,7 @@ function replaceCDATAarr(str, cdata) {
 }
 
 function buildObjectNode(val, key, attrStr, level) {
-  if (attrStr && !val.includes('<')) {
+  if (attrStr && val.indexOf('<') === -1) {
     return (
       this.indentate(level) +
       '<' +
@@ -47649,16 +47655,23 @@ function () {
 /*!*****************************************!*\
   !*** ./lib-esm/common/S3ClientUtils.js ***!
   \*****************************************/
-/*! exports provided: getPrefix, createPrefixMiddleware, prefixMiddlewareOptions */
+/*! exports provided: getPrefix, createPrefixMiddleware, autoAdjustClockskewMiddleware, autoAdjustClockskewMiddlewareOptions, prefixMiddlewareOptions, credentialsProvider, createS3Client */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getPrefix", function() { return getPrefix; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createPrefixMiddleware", function() { return createPrefixMiddleware; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "autoAdjustClockskewMiddleware", function() { return autoAdjustClockskewMiddleware; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "autoAdjustClockskewMiddlewareOptions", function() { return autoAdjustClockskewMiddlewareOptions; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "prefixMiddlewareOptions", function() { return prefixMiddlewareOptions; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "credentialsProvider", function() { return credentialsProvider; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createS3Client", function() { return createS3Client; });
 /* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
 /* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @aws-sdk/client-s3 */ "../../node_modules/@aws-sdk/client-s3/dist/es/index.js");
+/* harmony import */ var _providers_axios_http_handler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../providers/axios-http-handler */ "./lib-esm/providers/axios-http-handler.js");
+/* harmony import */ var _StorageConstants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./StorageConstants */ "./lib-esm/common/StorageConstants.js");
 var __assign = undefined && undefined.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -47819,6 +47832,15 @@ var __generator = undefined && undefined.__generator || function (thisArg, body)
 };
 
 
+
+
+
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Logger"]('S3ClientUtils'); // placeholder credentials in order to satisfy type requirement, always results in 403 when used
+
+var INVALID_CRED = {
+  accessKeyId: '',
+  secretAccessKey: ''
+};
 var getPrefix = function getPrefix(config) {
   var credentials = config.credentials,
       level = config.level,
@@ -47879,10 +47901,126 @@ var createPrefixMiddleware = function createPrefixMiddleware(opt, key) {
     };
   };
 };
+
+var isTimeSkewedError = function isTimeSkewedError(err) {
+  return err.ServerTime && typeof err.Code === 'string' && err.Code === 'RequestTimeTooSkewed';
+}; // we want to take the S3Client config in parameter so we can modify it's systemClockOffset
+
+
+var autoAdjustClockskewMiddleware = function autoAdjustClockskewMiddleware(config) {
+  return function (next, _context) {
+    return function (args) {
+      return __awaiter(void 0, void 0, void 0, function () {
+        var err_1, serverDate;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              _a.trys.push([0, 2,, 3]);
+
+              return [4
+              /*yield*/
+              , next(args)];
+
+            case 1:
+              return [2
+              /*return*/
+              , _a.sent()];
+
+            case 2:
+              err_1 = _a.sent();
+
+              if (isTimeSkewedError(err_1)) {
+                serverDate = new Date(err_1.ServerTime);
+                config.systemClockOffset = serverDate.getTime() - Date.now();
+              }
+
+              throw err_1;
+
+            case 3:
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+  };
+};
+var autoAdjustClockskewMiddlewareOptions = {
+  step: 'finalizeRequest',
+  name: 'autoAdjustClockskewMiddleware'
+};
 var prefixMiddlewareOptions = {
   step: 'initialize',
   name: 'addPrefixMiddleware'
 };
+var credentialsProvider = function credentialsProvider() {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var credentials, cred, error_1;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          _a.trys.push([0, 2,, 3]);
+
+          return [4
+          /*yield*/
+          , _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Credentials"].get()];
+
+        case 1:
+          credentials = _a.sent();
+          if (!credentials) return [2
+          /*return*/
+          , INVALID_CRED];
+          cred = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Credentials"].shear(credentials);
+          logger.debug('credentials provider get credentials', cred);
+          return [2
+          /*return*/
+          , cred];
+
+        case 2:
+          error_1 = _a.sent();
+          logger.warn('credentials provider error', error_1);
+          return [2
+          /*return*/
+          , INVALID_CRED];
+
+        case 3:
+          return [2
+          /*return*/
+          ];
+      }
+    });
+  });
+};
+var createS3Client = function createS3Client(config, emitter) {
+  var region = config.region,
+      cancelTokenSource = config.cancelTokenSource,
+      dangerouslyConnectToHttpEndpointForTesting = config.dangerouslyConnectToHttpEndpointForTesting,
+      useAccelerateEndpoint = config.useAccelerateEndpoint;
+  var localTestingConfig = {};
+
+  if (dangerouslyConnectToHttpEndpointForTesting) {
+    localTestingConfig = {
+      endpoint: _StorageConstants__WEBPACK_IMPORTED_MODULE_3__["localTestingStorageEndpoint"],
+      tls: false,
+      bucketEndpoint: false,
+      forcePathStyle: true
+    };
+  }
+
+  var s3client = new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["S3Client"](__assign(__assign({
+    region: region,
+    // Using provider instead of a static credentials, so that if an upload task was in progress, but credentials gets
+    // changed or invalidated (e.g user signed out), the subsequent requests will fail.
+    credentials: credentialsProvider,
+    customUserAgent: Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["getAmplifyUserAgent"])()
+  }, localTestingConfig), {
+    requestHandler: new _providers_axios_http_handler__WEBPACK_IMPORTED_MODULE_2__["AxiosHttpHandler"]({}, emitter, cancelTokenSource),
+    useAccelerateEndpoint: useAccelerateEndpoint
+  }));
+  s3client.middlewareStack.remove(_StorageConstants__WEBPACK_IMPORTED_MODULE_3__["SET_CONTENT_LENGTH_HEADER"]);
+  return s3client;
+};
 
 /***/ }),
 
@@ -48326,12 +48464,7 @@ var __generator = undefined && undefined.__generator || function (thisArg, body)
 
 var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["ConsoleLogger"]('AWSS3Provider');
 var DEFAULT_STORAGE_LEVEL = 'public';
-var DEFAULT_PRESIGN_EXPIRATION = 900; // placeholder credentials in order to satisfy type requirement, always results in 403 when used
-
-var INVALID_CRED = {
-  accessKeyId: '',
-  secretAccessKey: ''
-};
+var DEFAULT_PRESIGN_EXPIRATION = 900;
 /**
  * Provide storage methods to use AWS S3
  */
@@ -48551,7 +48684,6 @@ function () {
 
             if (acl) params.ACL = acl;
             s3 = this._createNewS3Client(opt);
-            s3.middlewareStack.remove(_common_StorageConstants__WEBPACK_IMPORTED_MODULE_11__["SET_CONTENT_LENGTH_HEADER"]);
             _c.label = 2;
 
           case 2:
@@ -49089,74 +49221,14 @@ function () {
         return publicPath;
     }
   };
-
-  AWSS3Provider.prototype._credentialsProvider = function () {
-    return __awaiter(this, void 0, void 0, function () {
-      var credentials, cred, error_7;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            _a.trys.push([0, 2,, 3]);
-
-            return [4
-            /*yield*/
-            , _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Credentials"].get()];
-
-          case 1:
-            credentials = _a.sent();
-            if (!credentials) return [2
-            /*return*/
-            , INVALID_CRED];
-            cred = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Credentials"].shear(credentials);
-            logger.debug('credentials provider get credentials', cred);
-            return [2
-            /*return*/
-            , cred];
-
-          case 2:
-            error_7 = _a.sent();
-            logger.warn('credentials provider error', error_7);
-            return [2
-            /*return*/
-            , INVALID_CRED];
-
-          case 3:
-            return [2
-            /*return*/
-            ];
-        }
-      });
-    });
-  };
   /**
    * Creates an S3 client with new V3 aws sdk
    */
 
 
   AWSS3Provider.prototype._createNewS3Client = function (config, emitter) {
-    var region = config.region,
-        cancelTokenSource = config.cancelTokenSource,
-        dangerouslyConnectToHttpEndpointForTesting = config.dangerouslyConnectToHttpEndpointForTesting;
-    var localTestingConfig = {};
-
-    if (dangerouslyConnectToHttpEndpointForTesting) {
-      localTestingConfig = {
-        endpoint: _common_StorageConstants__WEBPACK_IMPORTED_MODULE_11__["localTestingStorageEndpoint"],
-        tls: false,
-        bucketEndpoint: false,
-        forcePathStyle: true
-      };
-    }
-
-    var s3client = new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["S3Client"](__assign(__assign({
-      region: region,
-      // Using provider instead of a static credentials, so that if an upload task was in progress, but credentials gets
-      // changed or invalidated (e.g user signed out), the subsequent requests will fail.
-      credentials: this._credentialsProvider,
-      customUserAgent: Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["getAmplifyUserAgent"])()
-    }, localTestingConfig), {
-      requestHandler: new _axios_http_handler__WEBPACK_IMPORTED_MODULE_5__["AxiosHttpHandler"]({}, emitter, cancelTokenSource)
-    }));
+    var s3client = Object(_common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_8__["createS3Client"])(config, emitter);
+    s3client.middlewareStack.add(Object(_common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_8__["autoAdjustClockskewMiddleware"])(s3client.config), _common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_8__["autoAdjustClockskewMiddlewareOptions"]);
     return s3client;
   };
 
@@ -49188,10 +49260,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @aws-sdk/client-s3 */ "../../node_modules/@aws-sdk/client-s3/dist/es/index.js");
 /* harmony import */ var _axios_http_handler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./axios-http-handler */ "./lib-esm/providers/axios-http-handler.js");
-/* harmony import */ var _common_StorageConstants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../common/StorageConstants */ "./lib-esm/common/StorageConstants.js");
-/* harmony import */ var events__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! events */ "../../node_modules/events/events.js");
-/* harmony import */ var events__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(events__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../common/S3ClientUtils */ "./lib-esm/common/S3ClientUtils.js");
+/* harmony import */ var events__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! events */ "../../node_modules/events/events.js");
+/* harmony import */ var events__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(events__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../common/S3ClientUtils */ "./lib-esm/common/S3ClientUtils.js");
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
@@ -49385,7 +49456,6 @@ var __generator = undefined && undefined.__generator || function (thisArg, body)
 
 
 
-
 var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["ConsoleLogger"]('AWSS3ProviderManagedUpload');
 
 var AWSS3ProviderManagedUpload =
@@ -49409,11 +49479,12 @@ function () {
     this.params = params;
     this.opts = opts;
     this.emitter = emitter;
+    this.s3client = this._createNewS3Client(opts, emitter);
   }
 
   AWSS3ProviderManagedUpload.prototype.upload = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var _a, putObjectCommand, s3, uploadId, numberOfPartsToUpload, parts, start;
+      var _a, putObjectCommand, uploadId, numberOfPartsToUpload, parts, start;
 
       var _this = this;
 
@@ -49430,36 +49501,30 @@ function () {
             this.totalBytesToUpload = this.byteLength(this.body);
             if (!(this.totalBytesToUpload <= this.minPartSize)) return [3
             /*break*/
-            , 3]; // Multipart upload is not required. Upload the sanitized body as is
+            , 2]; // Multipart upload is not required. Upload the sanitized body as is
 
             this.params.Body = this.body;
             putObjectCommand = new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["PutObjectCommand"](this.params);
-            return [4
-            /*yield*/
-            , this._createNewS3Client(this.opts, this.emitter)];
-
-          case 2:
-            s3 = _b.sent();
             return [2
             /*return*/
-            , s3.send(putObjectCommand)];
+            , this.s3client.send(putObjectCommand)];
 
-          case 3:
+          case 2:
             return [4
             /*yield*/
             , this.createMultiPartUpload()];
 
-          case 4:
+          case 3:
             uploadId = _b.sent();
             numberOfPartsToUpload = Math.ceil(this.totalBytesToUpload / this.minPartSize);
             parts = this.createParts();
             start = 0;
-            _b.label = 5;
+            _b.label = 4;
 
-          case 5:
+          case 4:
             if (!(start < numberOfPartsToUpload)) return [3
             /*break*/
-            , 10];
+            , 9];
             /** This first block will try to cancel the upload if the cancel
              *	request came before any parts uploads have started.
              **/
@@ -49468,7 +49533,7 @@ function () {
             /*yield*/
             , this.checkIfUploadCancelled(uploadId)];
 
-          case 6:
+          case 5:
             /** This first block will try to cancel the upload if the cancel
              *	request came before any parts uploads have started.
              **/
@@ -49479,7 +49544,7 @@ function () {
             /*yield*/
             , this.uploadParts(uploadId, parts.slice(start, start + this.queueSize))];
 
-          case 7:
+          case 6:
             // Upload as many as `queueSize` parts simultaneously
             _b.sent();
             /** Call cleanup a second time in case there were part upload requests
@@ -49491,21 +49556,21 @@ function () {
             /*yield*/
             , this.checkIfUploadCancelled(uploadId)];
 
-          case 8:
+          case 7:
             /** Call cleanup a second time in case there were part upload requests
              *  in flight. This is to ensure that all parts are cleaned up.
              */
             _b.sent();
 
-            _b.label = 9;
+            _b.label = 8;
 
-          case 9:
+          case 8:
             start += this.queueSize;
             return [3
             /*break*/
-            , 5];
+            , 4];
 
-          case 10:
+          case 9:
             parts.map(function (part) {
               _this.removeEventListener(part);
             });
@@ -49513,7 +49578,7 @@ function () {
             /*yield*/
             , this.finishMultiPartUpload(uploadId)];
 
-          case 11:
+          case 10:
             // Step 3: Finalize the upload such that S3 can recreate the file
             return [2
             /*return*/
@@ -49531,7 +49596,7 @@ function () {
       parts.push({
         bodyPart: this.body.slice(bodyStart, bodyEnd),
         partNumber: parts.length + 1,
-        emitter: new events__WEBPACK_IMPORTED_MODULE_4__["EventEmitter"](),
+        emitter: new events__WEBPACK_IMPORTED_MODULE_3__["EventEmitter"](),
         _lastUploadedBytes: 0
       });
       bodyStart += this.minPartSize;
@@ -49542,22 +49607,16 @@ function () {
 
   AWSS3ProviderManagedUpload.prototype.createMultiPartUpload = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var createMultiPartUploadCommand, s3, response;
+      var createMultiPartUploadCommand, response;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             createMultiPartUploadCommand = new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["CreateMultipartUploadCommand"](this.params);
             return [4
             /*yield*/
-            , this._createNewS3Client(this.opts)];
+            , this.s3client.send(createMultiPartUploadCommand)];
 
           case 1:
-            s3 = _a.sent();
-            return [4
-            /*yield*/
-            , s3.send(createMultiPartUploadCommand)];
-
-          case 2:
             response = _a.sent();
             logger.debug(response.UploadId);
             return [2
@@ -49588,22 +49647,19 @@ function () {
             /*yield*/
             , Promise.all(parts.map(function (part) {
               return __awaiter(_this, void 0, void 0, function () {
-                var s3, _a, Key, Bucket, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5;
+                var options, _a, Key, Bucket, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, res;
 
                 return __generator(this, function (_b) {
                   switch (_b.label) {
                     case 0:
                       this.setupEventListener(part);
+                      options = {
+                        emitter: part.emitter
+                      };
+                      _a = this.params, Key = _a.Key, Bucket = _a.Bucket, SSECustomerAlgorithm = _a.SSECustomerAlgorithm, SSECustomerKey = _a.SSECustomerKey, SSECustomerKeyMD5 = _a.SSECustomerKeyMD5;
                       return [4
                       /*yield*/
-                      , this._createNewS3Client(this.opts, part.emitter)];
-
-                    case 1:
-                      s3 = _b.sent();
-                      _a = this.params, Key = _a.Key, Bucket = _a.Bucket, SSECustomerAlgorithm = _a.SSECustomerAlgorithm, SSECustomerKey = _a.SSECustomerKey, SSECustomerKeyMD5 = _a.SSECustomerKeyMD5;
-                      return [2
-                      /*return*/
-                      , s3.send(new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["UploadPartCommand"](__assign(__assign(__assign({
+                      , this.s3client.send(new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["UploadPartCommand"](__assign(__assign(__assign({
                         PartNumber: part.partNumber,
                         Body: part.bodyPart,
                         UploadId: uploadId,
@@ -49615,7 +49671,13 @@ function () {
                         SSECustomerKey: SSECustomerKey
                       }), SSECustomerKeyMD5 && {
                         SSECustomerKeyMD5: SSECustomerKeyMD5
-                      })))];
+                      })), options)];
+
+                    case 1:
+                      res = _b.sent();
+                      return [2
+                      /*return*/
+                      , res];
                   }
                 });
               });
@@ -49654,7 +49716,7 @@ function () {
 
   AWSS3ProviderManagedUpload.prototype.finishMultiPartUpload = function (uploadId) {
     return __awaiter(this, void 0, void 0, function () {
-      var input, completeUploadCommand, s3, data, error_2;
+      var input, completeUploadCommand, data, error_2;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -49667,28 +49729,22 @@ function () {
               }
             };
             completeUploadCommand = new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["CompleteMultipartUploadCommand"](input);
-            return [4
-            /*yield*/
-            , this._createNewS3Client(this.opts)];
+            _a.label = 1;
 
           case 1:
-            s3 = _a.sent();
-            _a.label = 2;
-
-          case 2:
-            _a.trys.push([2, 4,, 5]);
+            _a.trys.push([1, 3,, 4]);
 
             return [4
             /*yield*/
-            , s3.send(completeUploadCommand)];
+            , this.s3client.send(completeUploadCommand)];
 
-          case 3:
+          case 2:
             data = _a.sent();
             return [2
             /*return*/
             , data.Key];
 
-          case 4:
+          case 3:
             error_2 = _a.sent();
             logger.error('error happened while finishing the upload. Cancelling the multipart upload', error_2);
             this.cancelUpload();
@@ -49696,7 +49752,7 @@ function () {
             /*return*/
             ];
 
-          case 5:
+          case 4:
             return [2
             /*return*/
             ];
@@ -49756,7 +49812,7 @@ function () {
 
   AWSS3ProviderManagedUpload.prototype.cleanup = function (uploadId) {
     return __awaiter(this, void 0, void 0, function () {
-      var input, s3, data;
+      var input, data;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -49772,22 +49828,16 @@ function () {
             };
             return [4
             /*yield*/
-            , this._createNewS3Client(this.opts)];
+            , this.s3client.send(new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["AbortMultipartUploadCommand"](input))];
 
           case 1:
-            s3 = _a.sent();
-            return [4
-            /*yield*/
-            , s3.send(new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["AbortMultipartUploadCommand"](input))];
-
-          case 2:
             _a.sent();
 
             return [4
             /*yield*/
-            , s3.send(new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["ListPartsCommand"](input))];
+            , this.s3client.send(new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["ListPartsCommand"](input))];
 
-          case 3:
+          case 2:
             data = _a.sent();
 
             if (data && data.Parts && data.Parts.length > 0) {
@@ -49880,68 +49930,12 @@ function () {
 
     return false;
   };
-  /**
-   * @private
-   * creates an S3 client with new V3 aws sdk
-   */
-
 
   AWSS3ProviderManagedUpload.prototype._createNewS3Client = function (config, emitter) {
-    return __awaiter(this, void 0, void 0, function () {
-      var credentials, region, dangerouslyConnectToHttpEndpointForTesting, cancelTokenSource, useAccelerateEndpoint, localTestingConfig, client;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [4
-            /*yield*/
-            , this._getCredentials()];
-
-          case 1:
-            credentials = _a.sent();
-            region = config.region, dangerouslyConnectToHttpEndpointForTesting = config.dangerouslyConnectToHttpEndpointForTesting, cancelTokenSource = config.cancelTokenSource, useAccelerateEndpoint = config.useAccelerateEndpoint;
-            localTestingConfig = {};
-
-            if (dangerouslyConnectToHttpEndpointForTesting) {
-              localTestingConfig = {
-                endpoint: _common_StorageConstants__WEBPACK_IMPORTED_MODULE_3__["localTestingStorageEndpoint"],
-                tls: false,
-                bucketEndpoint: false,
-                forcePathStyle: true
-              };
-            }
-
-            client = new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["S3Client"](__assign(__assign({
-              region: region,
-              credentials: credentials,
-              useAccelerateEndpoint: useAccelerateEndpoint
-            }, localTestingConfig), {
-              requestHandler: new _axios_http_handler__WEBPACK_IMPORTED_MODULE_2__["AxiosHttpHandler"]({}, emitter, cancelTokenSource),
-              customUserAgent: Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["getAmplifyUserAgent"])()
-            }));
-            client.middlewareStack.remove(_common_StorageConstants__WEBPACK_IMPORTED_MODULE_3__["SET_CONTENT_LENGTH_HEADER"]);
-            client.middlewareStack.add(Object(_common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_5__["createPrefixMiddleware"])(this.opts, this.params.Key), _common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_5__["prefixMiddlewareOptions"]);
-            return [2
-            /*return*/
-            , client];
-        }
-      });
-    });
-  };
-  /**
-   * @private
-   */
-
-
-  AWSS3ProviderManagedUpload.prototype._getCredentials = function () {
-    return _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Credentials"].get().then(function (credentials) {
-      if (!credentials) return false;
-      var cred = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Credentials"].shear(credentials);
-      logger.debug('set credentials for storage', cred);
-      return cred;
-    })["catch"](function (error) {
-      logger.warn('ensure credentials error', error);
-      return false;
-    });
+    var s3client = Object(_common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_4__["createS3Client"])(config, emitter);
+    s3client.middlewareStack.add(Object(_common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_4__["createPrefixMiddleware"])(this.opts, this.params.Key), _common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_4__["prefixMiddlewareOptions"]);
+    s3client.middlewareStack.add(Object(_common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_4__["autoAdjustClockskewMiddleware"])(s3client.config), _common_S3ClientUtils__WEBPACK_IMPORTED_MODULE_4__["autoAdjustClockskewMiddlewareOptions"]);
+    return s3client;
   };
 
   return AWSS3ProviderManagedUpload;
@@ -51060,8 +51054,10 @@ function () {
   };
 
   AxiosHttpHandler.prototype.handle = function (request, options) {
-    var requestTimeoutInMs = this.httpOptions.requestTimeout;
-    var emitter = this.emitter;
+    var requestTimeoutInMs = this.httpOptions.requestTimeout; // prioritize the call specific event emitter, this is useful for multipart upload as each individual parts has
+    // their own event emitter, without having to create s3client for every individual calls.
+
+    var emitter = options.emitter || this.emitter;
     var path = request.path;
 
     if (request.query) {