@aws-amplify/storage 4.4.3 → 4.4.4-in-app-messaging.35

package/lib-esm/common/StorageErrorStrings.js

@@ -3,6 +3,7 @@ export var StorageErrorStrings;
     StorageErrorStrings["NO_CREDENTIALS"] = "No credentials";
     StorageErrorStrings["NO_SRC_KEY"] = "source param should be an object with the property \"key\" with value of type string";
     StorageErrorStrings["NO_DEST_KEY"] = "destination param should be an object with the property \"key\" with value of type string";
+    StorageErrorStrings["INVALID_BLOB"] = "Object must be an instance of Blob";
 })(StorageErrorStrings || (StorageErrorStrings = {}));
 export var AWSS3ProviderMultipartCopierErrors;
 (function (AWSS3ProviderMultipartCopierErrors) {
@@ -12,4 +13,8 @@ export var AWSS3ProviderMultipartCopierErrors;
     AWSS3ProviderMultipartCopierErrors["NO_COPYSOURCE"] = "You must specify a copy source";
     AWSS3ProviderMultipartCopierErrors["MAX_NUM_PARTS_EXCEEDED"] = "Only a maximum of 10000 parts are allowed";
 })(AWSS3ProviderMultipartCopierErrors || (AWSS3ProviderMultipartCopierErrors = {}));
+export var AWSS3ProviderUploadErrorStrings;
+(function (AWSS3ProviderUploadErrorStrings) {
+    AWSS3ProviderUploadErrorStrings["UPLOAD_PAUSED_MESSAGE"] = "paused";
+})(AWSS3ProviderUploadErrorStrings || (AWSS3ProviderUploadErrorStrings = {}));
 //# sourceMappingURL=StorageErrorStrings.js.map

package/lib-esm/common/StorageErrorStrings.js.map

@@ -1 +1 @@
-{"version":3,"file":"StorageErrorStrings.js","sourceRoot":"","sources":["../../src/common/StorageErrorStrings.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC9B,wDAAiC,CAAA;IACjC,0HAAiG,CAAA;IACjG,gIAAuG,CAAA;AACxG,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B;AAED,MAAM,CAAN,IAAY,kCAMX;AAND,WAAY,kCAAkC;IAC7C,uFAAiD,CAAA;IACjD,+EAAyC,CAAA;IACzC,gGAA0D,CAAA;IAC1D,sFAAgD,CAAA;IAChD,0GAAoE,CAAA;AACrE,CAAC,EANW,kCAAkC,KAAlC,kCAAkC,QAM7C"}
+{"version":3,"file":"StorageErrorStrings.js","sourceRoot":"","sources":["../../src/common/StorageErrorStrings.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAKX;AALD,WAAY,mBAAmB;IAC9B,wDAAiC,CAAA;IACjC,0HAAiG,CAAA;IACjG,gIAAuG,CAAA;IACvG,0EAAmD,CAAA;AACpD,CAAC,EALW,mBAAmB,KAAnB,mBAAmB,QAK9B;AAED,MAAM,CAAN,IAAY,kCAMX;AAND,WAAY,kCAAkC;IAC7C,uFAAiD,CAAA;IACjD,+EAAyC,CAAA;IACzC,gGAA0D,CAAA;IAC1D,sFAAgD,CAAA;IAChD,0GAAoE,CAAA;AACrE,CAAC,EANW,kCAAkC,KAAlC,kCAAkC,QAM7C;AAED,MAAM,CAAN,IAAY,+BAEX;AAFD,WAAY,+BAA+B;IAC1C,mEAAgC,CAAA;AACjC,CAAC,EAFW,+BAA+B,KAA/B,+BAA+B,QAE1C"}

package/lib-esm/common/StorageUtils.d.ts

@@ -0,0 +1,4 @@
+export declare const byteLength: (x: unknown) => number;
+export declare const dispatchStorageEvent: (track: boolean, event: string, attrs: any, metrics: any, message: string) => void;
+export declare const isFile: (x: unknown) => x is File;
+export declare const isBlob: (x: unknown) => x is Blob;

package/lib-esm/common/StorageUtils.js

@@ -0,0 +1,39 @@
+import { Hub } from '@aws-amplify/core';
+import { AMPLIFY_SYMBOL } from './StorageConstants';
+export var byteLength = function (x) {
+    if (typeof x === 'string') {
+        return x.length;
+    }
+    else if (isArrayBuffer(x)) {
+        return x.byteLength;
+    }
+    else if (isBlob(x)) {
+        return x.size;
+    }
+    else {
+        throw new Error('Cannot determine byte length of ' + x);
+    }
+};
+export var dispatchStorageEvent = function (track, event, attrs, metrics, message) {
+    if (track) {
+        var data = { attrs: attrs };
+        if (metrics) {
+            data['metrics'] = metrics;
+        }
+        Hub.dispatch('storage', {
+            event: event,
+            data: data,
+            message: message,
+        }, 'Storage', AMPLIFY_SYMBOL);
+    }
+};
+export var isFile = function (x) {
+    return typeof x !== 'undefined' && x instanceof File;
+};
+export var isBlob = function (x) {
+    return typeof x !== 'undefined' && x instanceof Blob;
+};
+var isArrayBuffer = function (x) {
+    return typeof x !== 'undefined' && x instanceof ArrayBuffer;
+};
+//# sourceMappingURL=StorageUtils.js.map

package/lib-esm/common/StorageUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StorageUtils.js","sourceRoot":"","sources":["../../src/common/StorageUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,CAAU;IACpC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;QAC1B,OAAO,CAAC,CAAC,MAAM,CAAC;KAChB;SAAM,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE;QAC5B,OAAO,CAAC,CAAC,UAAU,CAAC;KACpB;SAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC;KACd;SAAM;QACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,CAAC,CAAC,CAAC;KACxD;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,oBAAoB,GAAG,UACnC,KAAc,EACd,KAAa,EACb,KAAU,EACV,OAAY,EACZ,OAAe;IAEf,IAAI,KAAK,EAAE;QACV,IAAM,IAAI,GAAG,EAAE,KAAK,OAAA,EAAE,CAAC;QACvB,IAAI,OAAO,EAAE;YACZ,IAAI,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;SAC1B;QACD,GAAG,CAAC,QAAQ,CACX,SAAS,EACT;YACC,KAAK,OAAA;YACL,IAAI,MAAA;YACJ,OAAO,SAAA;SACP,EACD,SAAS,EACT,cAAc,CACd,CAAC;KACF;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,MAAM,GAAG,UAAC,CAAU;IAChC,OAAO,OAAO,CAAC,KAAK,WAAW,IAAI,CAAC,YAAY,IAAI,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,MAAM,GAAG,UAAC,CAAU;IAChC,OAAO,OAAO,CAAC,KAAK,WAAW,IAAI,CAAC,YAAY,IAAI,CAAC;AACtD,CAAC,CAAC;AAEF,IAAM,aAAa,GAAG,UAAC,CAAU;IAChC,OAAO,OAAO,CAAC,KAAK,WAAW,IAAI,CAAC,YAAY,WAAW,CAAC;AAC7D,CAAC,CAAC"}

package/lib-esm/providers/AWSS3Provider.d.ts

@@ -1,5 +1,5 @@
 import { PutObjectCommandInput } from '@aws-sdk/client-s3';
-import { StorageOptions, StorageProvider, S3ProviderGetConfig, S3ProviderGetOuput, S3ProviderPutConfig, S3ProviderRemoveConfig, S3ProviderListOutput, S3ProviderListConfig, S3ProviderPutOutput, S3ProviderCopyConfig, S3ProviderCopyOutput, S3CopySource, S3CopyDestination, S3ProviderRemoveOutput } from '../types';
+import { StorageOptions, StorageProvider, S3ProviderGetConfig, S3ProviderGetOuput, S3ProviderPutConfig, S3ProviderRemoveConfig, S3ProviderListOutput, S3ProviderListConfig, S3ProviderCopyConfig, S3ProviderCopyOutput, S3CopySource, S3CopyDestination, S3ProviderRemoveOutput, S3ProviderPutOutput } from '../types';
 /**
  * Provide storage methods to use AWS S3
  */
@@ -7,6 +7,7 @@ export declare class AWSS3Provider implements StorageProvider {
     static readonly CATEGORY = "Storage";
     static readonly PROVIDER_NAME = "AWSS3";
     private _config;
+    private _storage;
     /**
      * Initialize Storage with AWS configurations
      * @param {Object} config - Configuration object for storage
@@ -26,6 +27,7 @@ export declare class AWSS3Provider implements StorageProvider {
      * @return {Object} - Current configuration
      */
     configure(config?: any): object;
+    private startResumableUpload;
     /**
      * Copy an object from a source object to a new object within the same bucket. Can optionally copy files across
      * different level or identityId (if source object's level is 'protected').
@@ -48,12 +50,13 @@ export declare class AWSS3Provider implements StorageProvider {
     get<T extends S3ProviderGetConfig & StorageOptions>(key: string, config?: T): Promise<S3ProviderGetOuput<T>>;
     /**
      * Put a file in S3 bucket specified to configure method
-     * @param {string} key - key of the object
-     * @param {PutObjectCommandInput["Body"]} object - File to be put in Amazon S3 bucket
-     * @param {S3ProviderPutConfig} [config] - Optional configuration for the underlying S3 command
-     * @return {Promise<S3ProviderPutOutput>} - promise resolves to an object with the new object's key on success
+     * @param key - key of the object
+     * @param object - File to be put in Amazon S3 bucket
+     * @param [config] - Optional configuration for the underlying S3 command
+     * @return an instance of AWSS3UploadTask or a promise that resolves to an object with the new object's key on
+     * success.
      */
-    put(key: string, object: PutObjectCommandInput['Body'], config?: S3ProviderPutConfig): Promise<S3ProviderPutOutput>;
+    put<T extends S3ProviderPutConfig>(key: string, object: PutObjectCommandInput['Body'], config?: T): S3ProviderPutOutput<T>;
     /**
      * Remove the object for specified key
      * @param {string} key - key of the object

package/lib-esm/providers/AWSS3Provider.js

@@ -57,36 +57,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
  * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-import { ConsoleLogger as Logger, Hub, Credentials, Parser, getAmplifyUserAgent, } from '@aws-amplify/core';
-import { S3Client, GetObjectCommand, DeleteObjectCommand, ListObjectsCommand, CopyObjectCommand, } from '@aws-sdk/client-s3';
+import { ConsoleLogger as Logger, Credentials, Parser, StorageHelper, Hub, } from '@aws-amplify/core';
+import { GetObjectCommand, DeleteObjectCommand, ListObjectsCommand, CopyObjectCommand, } from '@aws-sdk/client-s3';
 import { formatUrl } from '@aws-sdk/util-format-url';
 import { createRequest } from '@aws-sdk/util-create-request';
 import { S3RequestPresigner } from '@aws-sdk/s3-request-presigner';
-import { AxiosHttpHandler, SEND_DOWNLOAD_PROGRESS_EVENT, SEND_UPLOAD_PROGRESS_EVENT } from './axios-http-handler';
+import { SEND_DOWNLOAD_PROGRESS_EVENT, SEND_UPLOAD_PROGRESS_EVENT, } from './axios-http-handler';
 import { StorageErrorStrings } from '../common/StorageErrorStrings';
+import { dispatchStorageEvent } from '../common/StorageUtils';
+import { createPrefixMiddleware, prefixMiddlewareOptions, getPrefix, autoAdjustClockskewMiddleware, autoAdjustClockskewMiddlewareOptions, createS3Client, } from '../common/S3ClientUtils';
 import { AWSS3ProviderManagedUpload } from './AWSS3ProviderManagedUpload';
+import { AWSS3UploadTask, TaskEvents } from './AWSS3UploadTask';
+import { UPLOADS_STORAGE_KEY } from '../common/StorageConstants';
 import * as events from 'events';
 var logger = new Logger('AWSS3Provider');
-var AMPLIFY_SYMBOL = (typeof Symbol !== 'undefined' && typeof Symbol.for === 'function'
-    ? Symbol.for('amplify_default')
-    : '@@amplify_default');
-var SET_CONTENT_LENGTH_HEADER = 'contentLengthMiddleware';
 var DEFAULT_STORAGE_LEVEL = 'public';
 var DEFAULT_PRESIGN_EXPIRATION = 900;
-var dispatchStorageEvent = function (track, event, attrs, metrics, message) {
-    if (track) {
-        var data = { attrs: attrs };
-        if (metrics) {
-            data['metrics'] = metrics;
-        }
-        Hub.dispatch('storage', {
-            event: event,
-            data: data,
-            message: message,
-        }, 'Storage', AMPLIFY_SYMBOL);
-    }
-};
-var localTestingStorageEndpoint = 'http://localhost:20005';
 /**
  * Provide storage methods to use AWS S3
  */
@@ -96,7 +82,15 @@ var AWSS3Provider = /** @class */ (function () {
      * @param {Object} config - Configuration object for storage
      */
     function AWSS3Provider(config) {
+        var _this = this;
         this._config = config ? config : {};
+        this._storage = new StorageHelper().getStorage();
+        Hub.listen('auth', function (data) {
+            var payload = data.payload;
+            if (payload.event === 'signOut' || payload.event === 'signIn') {
+                _this._storage.removeItem(UPLOADS_STORAGE_KEY);
+            }
+        });
         logger.debug('Storage Options', this._config);
     }
     /**
@@ -127,6 +121,64 @@ var AWSS3Provider = /** @class */ (function () {
         }
         return this._config;
     };
+    AWSS3Provider.prototype.startResumableUpload = function (addTaskInput, config) {
+        var s3Client = addTaskInput.s3Client, emitter = addTaskInput.emitter, key = addTaskInput.key, file = addTaskInput.file, params = addTaskInput.params;
+        var progressCallback = config.progressCallback, completeCallback = config.completeCallback, errorCallback = config.errorCallback, _a = config.track, track = _a === void 0 ? false : _a;
+        if (!(file instanceof Blob)) {
+            throw new Error(StorageErrorStrings.INVALID_BLOB);
+        }
+        emitter.on(TaskEvents.UPLOAD_PROGRESS, function (event) {
+            if (progressCallback) {
+                if (typeof progressCallback === 'function') {
+                    progressCallback(event);
+                }
+                else {
+                    logger.warn('progressCallback should be a function, not a ' +
+                        typeof progressCallback);
+                }
+            }
+        });
+        emitter.on(TaskEvents.UPLOAD_COMPLETE, function (event) {
+            if (completeCallback) {
+                if (typeof completeCallback === 'function') {
+                    completeCallback(event);
+                }
+                else {
+                    logger.warn('completeCallback should be a function, not a ' +
+                        typeof completeCallback);
+                }
+            }
+        });
+        emitter.on(TaskEvents.ERROR, function (err) {
+            if (errorCallback) {
+                if (typeof errorCallback === 'function') {
+                    errorCallback(err);
+                }
+                else {
+                    logger.warn('errorCallback should be a function, not a ' + typeof errorCallback);
+                }
+            }
+        });
+        // we want to keep this function sync so we defer this promise to AWSS3UploadTask to resolve when it's needed
+        // when its doing a final check with _listSingleFile function
+        var prefixPromise = Credentials.get().then(function (credentials) {
+            var cred = Credentials.shear(credentials);
+            return getPrefix(__assign(__assign({}, config), { credentials: cred }));
+        });
+        var task = new AWSS3UploadTask({
+            s3Client: s3Client,
+            file: file,
+            emitter: emitter,
+            level: config.level,
+            storage: this._storage,
+            params: params,
+            prefixPromise: prefixPromise,
+        });
+        dispatchStorageEvent(track, 'upload', { method: 'put', result: 'success' }, null, "Upload Task created successfully for " + key);
+        // automatically start the upload task
+        task.resume();
+        return task;
+    };
     /**
      * Copy an object from a source object to a new object within the same bucket. Can optionally copy files across
      * different level or identityId (if source object's level is 'protected').
@@ -195,7 +247,6 @@ var AWSS3Provider = /** @class */ (function () {
                         if (acl)
                             params.ACL = acl;
                         s3 = this._createNewS3Client(opt);
-                        s3.middlewareStack.remove(SET_CONTENT_LENGTH_HEADER);
                         _c.label = 2;
                     case 2:
                         _c.trys.push([2, 4, , 5]);
@@ -275,7 +326,8 @@ var AWSS3Provider = /** @class */ (function () {
                                 });
                             }
                             else {
-                                logger.warn('progressCallback should be a function, not a ' + typeof progressCallback);
+                                logger.warn('progressCallback should be a function, not a ' +
+                                    typeof progressCallback);
                             }
                         }
                         return [4 /*yield*/, s3.send(getObjectCommand)];
@@ -300,7 +352,9 @@ var AWSS3Provider = /** @class */ (function () {
                     case 6:
                         request = _b.sent();
                         _a = formatUrl;
-                        return [4 /*yield*/, signer.presign(request, { expiresIn: expires || DEFAULT_PRESIGN_EXPIRATION })];
+                        return [4 /*yield*/, signer.presign(request, {
+                                expiresIn: expires || DEFAULT_PRESIGN_EXPIRATION,
+                            })];
                     case 7:
                         url = _a.apply(void 0, [_b.sent()]);
                         dispatchStorageEvent(track, 'getSignedUrl', { method: 'get', result: 'success' }, null, "Signed URL: " + url);
@@ -317,104 +371,102 @@ var AWSS3Provider = /** @class */ (function () {
     };
     /**
      * Put a file in S3 bucket specified to configure method
-     * @param {string} key - key of the object
-     * @param {PutObjectCommandInput["Body"]} object - File to be put in Amazon S3 bucket
-     * @param {S3ProviderPutConfig} [config] - Optional configuration for the underlying S3 command
-     * @return {Promise<S3ProviderPutOutput>} - promise resolves to an object with the new object's key on success
+     * @param key - key of the object
+     * @param object - File to be put in Amazon S3 bucket
+     * @param [config] - Optional configuration for the underlying S3 command
+     * @return an instance of AWSS3UploadTask or a promise that resolves to an object with the new object's key on
+     * success.
      */
     AWSS3Provider.prototype.put = function (key, object, config) {
-        return __awaiter(this, void 0, void 0, function () {
-            var credentialsOK, opt, bucket, track, progressCallback, contentType, contentDisposition, contentEncoding, cacheControl, expires, metadata, tagging, acl, serverSideEncryption, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, SSEKMSKeyId, type, prefix, final_key, params, emitter, uploader, response, error_4;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._ensureCredentials()];
-                    case 1:
-                        credentialsOK = _a.sent();
-                        if (!credentialsOK || !this._isWithCredentials(this._config)) {
-                            throw new Error(StorageErrorStrings.NO_CREDENTIALS);
-                        }
-                        opt = Object.assign({}, this._config, config);
-                        bucket = opt.bucket, track = opt.track, progressCallback = opt.progressCallback;
-                        contentType = opt.contentType, contentDisposition = opt.contentDisposition, contentEncoding = opt.contentEncoding, cacheControl = opt.cacheControl, expires = opt.expires, metadata = opt.metadata, tagging = opt.tagging, acl = opt.acl;
-                        serverSideEncryption = opt.serverSideEncryption, SSECustomerAlgorithm = opt.SSECustomerAlgorithm, SSECustomerKey = opt.SSECustomerKey, SSECustomerKeyMD5 = opt.SSECustomerKeyMD5, SSEKMSKeyId = opt.SSEKMSKeyId;
-                        type = contentType ? contentType : 'binary/octet-stream';
-                        prefix = this._prefix(opt);
-                        final_key = prefix + key;
-                        logger.debug('put ' + key + ' to ' + final_key);
-                        params = {
-                            Bucket: bucket,
-                            Key: final_key,
-                            Body: object,
-                            ContentType: type,
-                        };
-                        if (cacheControl) {
-                            params.CacheControl = cacheControl;
-                        }
-                        if (contentDisposition) {
-                            params.ContentDisposition = contentDisposition;
-                        }
-                        if (contentEncoding) {
-                            params.ContentEncoding = contentEncoding;
-                        }
-                        if (expires) {
-                            params.Expires = expires;
-                        }
-                        if (metadata) {
-                            params.Metadata = metadata;
-                        }
-                        if (tagging) {
-                            params.Tagging = tagging;
-                        }
-                        if (serverSideEncryption) {
-                            params.ServerSideEncryption = serverSideEncryption;
-                        }
-                        if (SSECustomerAlgorithm) {
-                            params.SSECustomerAlgorithm = SSECustomerAlgorithm;
-                        }
-                        if (SSECustomerKey) {
-                            params.SSECustomerKey = SSECustomerKey;
-                        }
-                        if (SSECustomerKeyMD5) {
-                            params.SSECustomerKeyMD5 = SSECustomerKeyMD5;
-                        }
-                        if (SSEKMSKeyId) {
-                            params.SSEKMSKeyId = SSEKMSKeyId;
-                        }
-                        emitter = new events.EventEmitter();
-                        uploader = new AWSS3ProviderManagedUpload(params, opt, emitter);
-                        if (acl) {
-                            params.ACL = acl;
-                        }
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        if (progressCallback) {
-                            if (typeof progressCallback === 'function') {
-                                emitter.on(SEND_UPLOAD_PROGRESS_EVENT, function (progress) {
-                                    progressCallback(progress);
-                                });
-                            }
-                            else {
-                                logger.warn('progressCallback should be a function, not a ' + typeof progressCallback);
-                            }
-                        }
-                        return [4 /*yield*/, uploader.upload()];
-                    case 3:
-                        response = _a.sent();
-                        logger.debug('upload result', response);
-                        dispatchStorageEvent(track, 'upload', { method: 'put', result: 'success' }, null, "Upload success for " + key);
-                        return [2 /*return*/, {
-                                key: key,
-                            }];
-                    case 4:
-                        error_4 = _a.sent();
-                        logger.warn('error uploading', error_4);
-                        dispatchStorageEvent(track, 'upload', { method: 'put', result: 'failed' }, null, "Error uploading " + key);
-                        throw error_4;
-                    case 5: return [2 /*return*/];
+        var opt = Object.assign({}, this._config, config);
+        var bucket = opt.bucket, track = opt.track, progressCallback = opt.progressCallback, level = opt.level, resumable = opt.resumable;
+        var contentType = opt.contentType, contentDisposition = opt.contentDisposition, contentEncoding = opt.contentEncoding, cacheControl = opt.cacheControl, expires = opt.expires, metadata = opt.metadata, tagging = opt.tagging, acl = opt.acl;
+        var serverSideEncryption = opt.serverSideEncryption, SSECustomerAlgorithm = opt.SSECustomerAlgorithm, SSECustomerKey = opt.SSECustomerKey, SSECustomerKeyMD5 = opt.SSECustomerKeyMD5, SSEKMSKeyId = opt.SSEKMSKeyId;
+        var type = contentType ? contentType : 'binary/octet-stream';
+        var params = {
+            Bucket: bucket,
+            Key: key,
+            Body: object,
+            ContentType: type,
+        };
+        if (cacheControl) {
+            params.CacheControl = cacheControl;
+        }
+        if (contentDisposition) {
+            params.ContentDisposition = contentDisposition;
+        }
+        if (contentEncoding) {
+            params.ContentEncoding = contentEncoding;
+        }
+        if (expires) {
+            params.Expires = expires;
+        }
+        if (metadata) {
+            params.Metadata = metadata;
+        }
+        if (tagging) {
+            params.Tagging = tagging;
+        }
+        if (serverSideEncryption) {
+            params.ServerSideEncryption = serverSideEncryption;
+        }
+        if (SSECustomerAlgorithm) {
+            params.SSECustomerAlgorithm = SSECustomerAlgorithm;
+        }
+        if (SSECustomerKey) {
+            params.SSECustomerKey = SSECustomerKey;
+        }
+        if (SSECustomerKeyMD5) {
+            params.SSECustomerKeyMD5 = SSECustomerKeyMD5;
+        }
+        if (SSEKMSKeyId) {
+            params.SSEKMSKeyId = SSEKMSKeyId;
+        }
+        var emitter = new events.EventEmitter();
+        var uploader = new AWSS3ProviderManagedUpload(params, opt, emitter);
+        if (acl) {
+            params.ACL = acl;
+        }
+        if (resumable === true) {
+            var s3Client = this._createNewS3Client(opt);
+            // we are using aws sdk middleware to inject the prefix to key, this way we don't have to call
+            // this._ensureCredentials() which allows us to make this function sync so we can return non-Promise like UploadTask
+            s3Client.middlewareStack.add(createPrefixMiddleware(opt, key), prefixMiddlewareOptions);
+            var addTaskInput = {
+                bucket: bucket,
+                key: key,
+                s3Client: s3Client,
+                file: object,
+                emitter: emitter,
+                accessLevel: level,
+                params: params,
+            };
+            // explicitly asserting the type here as Typescript could not infer that resumable is of type true
+            return this.startResumableUpload(addTaskInput, config);
+        }
+        try {
+            if (progressCallback) {
+                if (typeof progressCallback === 'function') {
+                    emitter.on(SEND_UPLOAD_PROGRESS_EVENT, function (progress) {
+                        progressCallback(progress);
+                    });
+                }
+                else {
+                    logger.warn('progressCallback should be a function, not a ' +
+                        typeof progressCallback);
                 }
+            }
+            return uploader.upload().then(function (response) {
+                logger.debug('upload result', response);
+                dispatchStorageEvent(track, 'upload', { method: 'put', result: 'success' }, null, "Upload success for " + key);
+                return { key: key };
             });
-        });
+        }
+        catch (error) {
+            logger.warn('error uploading', error);
+            dispatchStorageEvent(track, 'upload', { method: 'put', result: 'failed' }, null, "Error uploading " + key);
+            throw error;
+        }
     };
     /**
      * Remove the object for specified key
@@ -424,7 +476,7 @@ var AWSS3Provider = /** @class */ (function () {
      */
     AWSS3Provider.prototype.remove = function (key, config) {
         return __awaiter(this, void 0, void 0, function () {
-            var credentialsOK, opt, bucket, track, prefix, final_key, s3, params, deleteObjectCommand, response, error_5;
+            var credentialsOK, opt, bucket, track, prefix, final_key, s3, params, deleteObjectCommand, response, error_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._ensureCredentials()];
@@ -453,9 +505,9 @@ var AWSS3Provider = /** @class */ (function () {
                         dispatchStorageEvent(track, 'delete', { method: 'remove', result: 'success' }, null, "Deleted " + key + " successfully");
                         return [2 /*return*/, response];
                     case 4:
-                        error_5 = _a.sent();
-                        dispatchStorageEvent(track, 'delete', { method: 'remove', result: 'failed' }, null, "Deletion of " + key + " failed with " + error_5);
-                        throw error_5;
+                        error_4 = _a.sent();
+                        dispatchStorageEvent(track, 'delete', { method: 'remove', result: 'failed' }, null, "Deletion of " + key + " failed with " + error_4);
+                        throw error_4;
                     case 5: return [2 /*return*/];
                 }
             });
@@ -470,7 +522,7 @@ var AWSS3Provider = /** @class */ (function () {
      */
     AWSS3Provider.prototype.list = function (path, config) {
         return __awaiter(this, void 0, void 0, function () {
-            var credentialsOK, opt, bucket, track, maxKeys, prefix, final_path, s3, params, listObjectsCommand, response, list, error_6;
+            var credentialsOK, opt, bucket, track, maxKeys, prefix, final_path, s3, params, listObjectsCommand, response, list, error_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._ensureCredentials()];
@@ -512,10 +564,10 @@ var AWSS3Provider = /** @class */ (function () {
                         logger.debug('list', list);
                         return [2 /*return*/, list];
                     case 4:
-                        error_6 = _a.sent();
-                        logger.warn('list error', error_6);
-                        dispatchStorageEvent(track, 'list', { method: 'list', result: 'failed' }, null, "Listing items failed: " + error_6.message);
-                        throw error_6;
+                        error_5 = _a.sent();
+                        logger.warn('list error', error_5);
+                        dispatchStorageEvent(track, 'list', { method: 'list', result: 'failed' }, null, "Listing items failed: " + error_5.message);
+                        throw error_5;
                     case 5: return [2 /*return*/];
                 }
             });
@@ -523,7 +575,7 @@ var AWSS3Provider = /** @class */ (function () {
     };
     AWSS3Provider.prototype._ensureCredentials = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var credentials, cred, error_7;
+            var credentials, cred, error_6;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -538,8 +590,8 @@ var AWSS3Provider = /** @class */ (function () {
                         this._config.credentials = cred;
                         return [2 /*return*/, true];
                     case 2:
-                        error_7 = _a.sent();
-                        logger.warn('ensure credentials error', error_7);
+                        error_6 = _a.sent();
+                        logger.warn('ensure credentials error', error_6);
                         return [2 /*return*/, false];
                     case 3: return [2 /*return*/];
                 }
@@ -553,8 +605,14 @@ var AWSS3Provider = /** @class */ (function () {
         var credentials = config.credentials, level = config.level;
         var customPrefix = config.customPrefix || {};
         var identityId = config.identityId || credentials.identityId;
-        var privatePath = (customPrefix.private !== undefined ? customPrefix.private : 'private/') + identityId + '/';
-        var protectedPath = (customPrefix.protected !== undefined ? customPrefix.protected : 'protected/') + identityId + '/';
+        var privatePath = (customPrefix.private !== undefined ? customPrefix.private : 'private/') +
+            identityId +
+            '/';
+        var protectedPath = (customPrefix.protected !== undefined
+            ? customPrefix.protected
+            : 'protected/') +
+            identityId +
+            '/';
         var publicPath = customPrefix.public !== undefined ? customPrefix.public : 'public/';
         switch (level) {
             case 'private':
@@ -569,18 +627,8 @@ var AWSS3Provider = /** @class */ (function () {
      * Creates an S3 client with new V3 aws sdk
      */
     AWSS3Provider.prototype._createNewS3Client = function (config, emitter) {
-        var region = config.region, credentials = config.credentials, cancelTokenSource = config.cancelTokenSource, dangerouslyConnectToHttpEndpointForTesting = config.dangerouslyConnectToHttpEndpointForTesting;
-        var localTestingConfig = {};
-        if (dangerouslyConnectToHttpEndpointForTesting) {
-            localTestingConfig = {
-                endpoint: localTestingStorageEndpoint,
-                tls: false,
-                bucketEndpoint: false,
-                forcePathStyle: true,
-            };
-        }
-        var s3client = new S3Client(__assign(__assign({ region: region,
-            credentials: credentials, customUserAgent: getAmplifyUserAgent() }, localTestingConfig), { requestHandler: new AxiosHttpHandler({}, emitter, cancelTokenSource) }));
+        var s3client = createS3Client(config, emitter);
+        s3client.middlewareStack.add(autoAdjustClockskewMiddleware(s3client.config), autoAdjustClockskewMiddlewareOptions);
         return s3client;
     };
     AWSS3Provider.CATEGORY = 'Storage';