@aws-amplify/storage 5.6.4-graphql-api-functional-options.1 → 5.6.4-unstable.28bc873.6

package/lib/providers/AWSS3Provider.js

@@ -1,28 +1,120 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+exports.AWSS3Provider = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var core_1 = require("@aws-amplify/core");
-var client_s3_1 = require("@aws-sdk/client-s3");
-var util_format_url_1 = require("@aws-sdk/util-format-url");
-var util_create_request_1 = require("@aws-sdk/util-create-request");
-var s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
-var axios_http_handler_1 = require("./axios-http-handler");
+var S3_1 = require("../AwsClients/S3");
+var utils_1 = require("../AwsClients/S3/utils");
 var StorageErrorStrings_1 = require("../common/StorageErrorStrings");
 var StorageUtils_1 = require("../common/StorageUtils");
 var S3ClientUtils_1 = require("../common/S3ClientUtils");
 var AWSS3ProviderManagedUpload_1 = require("./AWSS3ProviderManagedUpload");
 var AWSS3UploadTask_1 = require("./AWSS3UploadTask");
 var StorageConstants_1 = require("../common/StorageConstants");
-var events = tslib_1.__importStar(require("events"));
+var events = __importStar(require("events"));
 var logger = new core_1.ConsoleLogger('AWSS3Provider');
 var DEFAULT_STORAGE_LEVEL = 'public';
 var DEFAULT_PRESIGN_EXPIRATION = 900;
 /**
  * Provide storage methods to use AWS S3
  */
-var AWSS3Provider = /** @class */ (function () {
+var AWSS3Provider = exports.AWSS3Provider = /** @class */ (function () {
     /**
      * Initialize Storage with AWS configurations
      * @param {Object} config - Configuration object for storage
@@ -60,7 +152,7 @@ var AWSS3Provider = /** @class */ (function () {
         logger.debug('configure Storage', config);
         if (!config)
             return this._config;
-        var amplifyConfig = core_1.parseAWSExports(config);
+        var amplifyConfig = (0, core_1.parseAWSExports)(config);
         this._config = Object.assign({}, this._config, amplifyConfig.Storage);
         if (!this._config.bucket) {
             logger.debug('Do not have bucket yet');
@@ -68,8 +160,9 @@ 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;
+        var _a;
+        var s3Config = addTaskInput.s3Config, emitter = addTaskInput.emitter, key = addTaskInput.key, file = addTaskInput.file, params = addTaskInput.params;
+        var progressCallback = config.progressCallback, completeCallback = config.completeCallback, errorCallback = config.errorCallback, track = (_a = config.track, _a === void 0 ? false : _a);
         if (!(file instanceof Blob)) {
             throw new Error(StorageErrorStrings_1.StorageErrorStrings.INVALID_BLOB);
         }
@@ -109,18 +202,18 @@ var AWSS3Provider = /** @class */ (function () {
         // when its doing a final check with _listSingleFile function
         var prefixPromise = core_1.Credentials.get().then(function (credentials) {
             var cred = core_1.Credentials.shear(credentials);
-            return S3ClientUtils_1.getPrefix(tslib_1.__assign(tslib_1.__assign({}, config), { credentials: cred }));
+            return (0, S3ClientUtils_1.getPrefix)(__assign(__assign({}, config), { level: addTaskInput.accessLevel, credentials: cred }));
         });
         var task = new AWSS3UploadTask_1.AWSS3UploadTask({
-            s3Client: s3Client,
+            s3Config: s3Config,
             file: file,
             emitter: emitter,
-            level: config.level,
+            level: addTaskInput.accessLevel,
             storage: this._storage,
             params: params,
             prefixPromise: prefixPromise,
         });
-        StorageUtils_1.dispatchStorageEvent(track, 'upload', { method: 'put', result: 'success' }, null, "Upload Task created successfully for " + key);
+        (0, StorageUtils_1.dispatchStorageEvent)(track, 'upload', { method: 'put', result: 'success' }, null, "Upload Task created successfully for ".concat(key));
         // automatically start the upload task
         task.resume();
         return task;
@@ -136,9 +229,10 @@ var AWSS3Provider = /** @class */ (function () {
      * @return {Promise<S3ProviderCopyOutput>} The key of the copied object.
      */
     AWSS3Provider.prototype.copy = function (src, dest, config) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var credentialsOK, opt, acl, bucket, cacheControl, expires, track, serverSideEncryption, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, SSEKMSKeyId, _a, srcLevel, srcIdentityId, srcKey, _b, destLevel, destKey, srcPrefix, destPrefix, finalSrcKey, finalDestKey, params, s3, error_1;
-            return tslib_1.__generator(this, function (_c) {
+        return __awaiter(this, void 0, void 0, function () {
+            var credentialsOK, opt, acl, bucket, cacheControl, expires, track, serverSideEncryption, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, SSEKMSKeyId, srcLevel, srcIdentityId, srcKey, destLevel, destKey, srcPrefix, destPrefix, finalSrcKey, finalDestKey, params, error_1;
+            var _a, _b;
+            return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0: return [4 /*yield*/, this._ensureCredentials()];
                     case 1:
@@ -148,8 +242,8 @@ var AWSS3Provider = /** @class */ (function () {
                         }
                         opt = Object.assign({}, this._config, config);
                         acl = opt.acl, bucket = opt.bucket, cacheControl = opt.cacheControl, expires = opt.expires, track = opt.track, serverSideEncryption = opt.serverSideEncryption, SSECustomerAlgorithm = opt.SSECustomerAlgorithm, SSECustomerKey = opt.SSECustomerKey, SSECustomerKeyMD5 = opt.SSECustomerKeyMD5, SSEKMSKeyId = opt.SSEKMSKeyId;
-                        _a = src.level, srcLevel = _a === void 0 ? DEFAULT_STORAGE_LEVEL : _a, srcIdentityId = src.identityId, srcKey = src.key;
-                        _b = dest.level, destLevel = _b === void 0 ? DEFAULT_STORAGE_LEVEL : _b, destKey = dest.key;
+                        srcLevel = (_a = src.level, _a === void 0 ? DEFAULT_STORAGE_LEVEL : _a), srcIdentityId = src.identityId, srcKey = src.key;
+                        destLevel = (_b = dest.level, _b === void 0 ? DEFAULT_STORAGE_LEVEL : _b), destKey = dest.key;
                         if (!srcKey || typeof srcKey !== 'string') {
                             throw new Error(StorageErrorStrings_1.StorageErrorStrings.NO_SRC_KEY);
                         }
@@ -157,13 +251,13 @@ var AWSS3Provider = /** @class */ (function () {
                             throw new Error(StorageErrorStrings_1.StorageErrorStrings.NO_DEST_KEY);
                         }
                         if (srcLevel !== 'protected' && srcIdentityId) {
-                            logger.warn("You may copy files from another user if the source level is \"protected\", currently it's " + srcLevel);
+                            logger.warn("You may copy files from another user if the source level is \"protected\", currently it's ".concat(srcLevel));
                         }
-                        srcPrefix = this._prefix(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, opt), { level: srcLevel }), (srcIdentityId && { identityId: srcIdentityId })));
-                        destPrefix = this._prefix(tslib_1.__assign(tslib_1.__assign({}, opt), { level: destLevel }));
-                        finalSrcKey = bucket + "/" + srcPrefix + srcKey;
-                        finalDestKey = "" + destPrefix + destKey;
-                        logger.debug("copying " + finalSrcKey + " to " + finalDestKey);
+                        srcPrefix = this._prefix(__assign(__assign(__assign({}, opt), { level: srcLevel }), (srcIdentityId && { identityId: srcIdentityId })));
+                        destPrefix = this._prefix(__assign(__assign({}, opt), { level: destLevel }));
+                        finalSrcKey = "".concat(bucket, "/").concat(srcPrefix).concat(srcKey);
+                        finalDestKey = "".concat(destPrefix).concat(destKey);
+                        logger.debug("copying ".concat(finalSrcKey, " to ").concat(finalDestKey));
                         params = {
                             Bucket: bucket,
                             CopySource: finalSrcKey,
@@ -192,26 +286,25 @@ var AWSS3Provider = /** @class */ (function () {
                         }
                         if (acl)
                             params.ACL = acl;
-                        s3 = this._createNewS3Client(opt, core_1.StorageAction.Copy);
                         _c.label = 2;
                     case 2:
                         _c.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, s3.send(new client_s3_1.CopyObjectCommand(params))];
+                        return [4 /*yield*/, (0, S3_1.copyObject)((0, S3ClientUtils_1.loadS3Config)(__assign(__assign({}, opt), { storageAction: core_1.StorageAction.Copy })), params)];
                     case 3:
                         _c.sent();
-                        StorageUtils_1.dispatchStorageEvent(track, 'copy', {
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'copy', {
                             method: 'copy',
                             result: 'success',
-                        }, null, "Copy success from " + srcKey + " to " + destKey);
+                        }, null, "Copy success from ".concat(srcKey, " to ").concat(destKey));
                         return [2 /*return*/, {
                                 key: destKey,
                             }];
                     case 4:
                         error_1 = _c.sent();
-                        StorageUtils_1.dispatchStorageEvent(track, 'copy', {
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'copy', {
                             method: 'copy',
                             result: 'failed',
-                        }, null, "Copy failed from " + srcKey + " to " + destKey);
+                        }, null, "Copy failed from ".concat(srcKey, " to ").concat(destKey));
                         throw error_1;
                     case 5: return [2 /*return*/];
                 }
@@ -220,22 +313,23 @@ var AWSS3Provider = /** @class */ (function () {
     };
     AWSS3Provider.prototype.get = function (key, config) {
         var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var credentialsOK, opt, bucket, download, cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType, expires, track, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, progressCallback, _b, validateObjectExistence, prefix, final_key, emitter, s3, params, getObjectCommand, response, error_2, headObjectCommand, error_3, signer, request, url, _c, error_4;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+        return __awaiter(this, void 0, void 0, function () {
+            var credentialsOK, opt, bucket, download, cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType, expires, track, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, progressCallback, validateObjectExistence, prefix, final_key, emitter, s3Config, params, response, error_2, error_3, url, _b, _c, error_4;
+            var _d, _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0: return [4 /*yield*/, this._ensureCredentials()];
                     case 1:
-                        credentialsOK = _d.sent();
+                        credentialsOK = _f.sent();
                         if (!credentialsOK || !this._isWithCredentials(this._config)) {
                             throw new Error(StorageErrorStrings_1.StorageErrorStrings.NO_CREDENTIALS);
                         }
                         opt = Object.assign({}, this._config, config);
-                        bucket = opt.bucket, download = opt.download, cacheControl = opt.cacheControl, contentDisposition = opt.contentDisposition, contentEncoding = opt.contentEncoding, contentLanguage = opt.contentLanguage, contentType = opt.contentType, expires = opt.expires, track = opt.track, SSECustomerAlgorithm = opt.SSECustomerAlgorithm, SSECustomerKey = opt.SSECustomerKey, SSECustomerKeyMD5 = opt.SSECustomerKeyMD5, progressCallback = opt.progressCallback, _b = opt.validateObjectExistence, validateObjectExistence = _b === void 0 ? false : _b;
+                        bucket = opt.bucket, download = opt.download, cacheControl = opt.cacheControl, contentDisposition = opt.contentDisposition, contentEncoding = opt.contentEncoding, contentLanguage = opt.contentLanguage, contentType = opt.contentType, expires = opt.expires, track = opt.track, SSECustomerAlgorithm = opt.SSECustomerAlgorithm, SSECustomerKey = opt.SSECustomerKey, SSECustomerKeyMD5 = opt.SSECustomerKeyMD5, progressCallback = opt.progressCallback, validateObjectExistence = (_d = opt.validateObjectExistence, _d === void 0 ? false : _d);
                         prefix = this._prefix(opt);
                         final_key = prefix + key;
                         emitter = new events.EventEmitter();
-                        s3 = this._createNewS3Client(opt, core_1.StorageAction.Get, emitter);
+                        s3Config = (0, S3ClientUtils_1.loadS3Config)(__assign(__assign({}, opt), { emitter: emitter, storageAction: core_1.StorageAction.Get }));
                         logger.debug('get ' + key + ' from ' + final_key);
                         params = {
                             Bucket: bucket,
@@ -262,13 +356,12 @@ var AWSS3Provider = /** @class */ (function () {
                             params.SSECustomerKeyMD5 = SSECustomerKeyMD5;
                         }
                         if (!(download === true)) return [3 /*break*/, 5];
-                        getObjectCommand = new client_s3_1.GetObjectCommand(params);
-                        _d.label = 2;
+                        _f.label = 2;
                     case 2:
-                        _d.trys.push([2, 4, , 5]);
+                        _f.trys.push([2, 4, , 5]);
                         if (progressCallback) {
                             if (typeof progressCallback === 'function') {
-                                emitter.on(axios_http_handler_1.SEND_DOWNLOAD_PROGRESS_EVENT, function (progress) {
+                                emitter.on(utils_1.SEND_DOWNLOAD_PROGRESS_EVENT, function (progress) {
                                     progressCallback(progress);
                                 });
                             }
@@ -277,58 +370,54 @@ var AWSS3Provider = /** @class */ (function () {
                                     typeof progressCallback);
                             }
                         }
-                        return [4 /*yield*/, s3.send(getObjectCommand)];
+                        return [4 /*yield*/, (0, S3_1.getObject)(s3Config, params)];
                     case 3:
-                        response = _d.sent();
-                        emitter.removeAllListeners(axios_http_handler_1.SEND_DOWNLOAD_PROGRESS_EVENT);
-                        StorageUtils_1.dispatchStorageEvent(track, 'download', { method: 'get', result: 'success' }, {
+                        response = _f.sent();
+                        emitter.removeAllListeners(utils_1.SEND_DOWNLOAD_PROGRESS_EVENT);
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'download', { method: 'get', result: 'success' }, {
                             fileSize: Number(response.Body['size'] || response.Body['length']),
-                        }, "Download success for " + key);
+                        }, "Download success for ".concat(key));
                         return [2 /*return*/, response];
                     case 4:
-                        error_2 = _d.sent();
-                        StorageUtils_1.dispatchStorageEvent(track, 'download', {
+                        error_2 = _f.sent();
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'download', {
                             method: 'get',
                             result: 'failed',
-                        }, null, "Download failed with " + error_2.message);
+                        }, null, "Download failed with ".concat(error_2.message));
                         throw error_2;
                     case 5:
                         if (!validateObjectExistence) return [3 /*break*/, 9];
-                        headObjectCommand = new client_s3_1.HeadObjectCommand(params);
-                        _d.label = 6;
+                        _f.label = 6;
                     case 6:
-                        _d.trys.push([6, 8, , 9]);
-                        return [4 /*yield*/, s3.send(headObjectCommand)];
+                        _f.trys.push([6, 8, , 9]);
+                        return [4 /*yield*/, (0, S3_1.headObject)(s3Config, params)];
                     case 7:
-                        _d.sent();
+                        _f.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        error_3 = _d.sent();
+                        error_3 = _f.sent();
                         if (((_a = error_3.$metadata) === null || _a === void 0 ? void 0 : _a.httpStatusCode) === 404) {
-                            StorageUtils_1.dispatchStorageEvent(track, 'getSignedUrl', {
+                            (0, StorageUtils_1.dispatchStorageEvent)(track, 'getSignedUrl', {
                                 method: 'get',
                                 result: 'failed',
-                            }, null, key + " not found");
+                            }, null, "".concat(key, " not found"));
                         }
                         throw error_3;
                     case 9:
-                        _d.trys.push([9, 12, , 13]);
-                        signer = new s3_request_presigner_1.S3RequestPresigner(tslib_1.__assign({}, s3.config));
-                        return [4 /*yield*/, util_create_request_1.createRequest(s3, new client_s3_1.GetObjectCommand(params))];
-                    case 10:
-                        request = _d.sent();
-                        _c = util_format_url_1.formatUrl;
-                        return [4 /*yield*/, signer.presign(request, {
-                                expiresIn: expires || DEFAULT_PRESIGN_EXPIRATION,
-                            })];
+                        _f.trys.push([9, 12, , 13]);
+                        _b = S3_1.getPresignedGetObjectUrl;
+                        _c = [__assign({}, s3Config)];
+                        _e = { expiration: expires || DEFAULT_PRESIGN_EXPIRATION };
+                        return [4 /*yield*/, s3Config.credentials()];
+                    case 10: return [4 /*yield*/, _b.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.credentials = _f.sent(), _e.signingRegion = s3Config.region, _e.signingService = S3_1.SERVICE_NAME, _e)])), params])];
                     case 11:
-                        url = _c.apply(void 0, [_d.sent()]);
-                        StorageUtils_1.dispatchStorageEvent(track, 'getSignedUrl', { method: 'get', result: 'success' }, null, "Signed URL: " + url);
+                        url = _f.sent();
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'getSignedUrl', { method: 'get', result: 'success' }, null, "Signed URL: ".concat(url));
                         return [2 /*return*/, url];
                     case 12:
-                        error_4 = _d.sent();
+                        error_4 = _f.sent();
                         logger.warn('get signed url error', error_4);
-                        StorageUtils_1.dispatchStorageEvent(track, 'getSignedUrl', { method: 'get', result: 'failed' }, null, "Could not get a signed URL for " + key);
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'getSignedUrl', { method: 'get', result: 'failed' }, null, "Could not get a signed URL for ".concat(key));
                         throw error_4;
                     case 13: return [2 /*return*/];
                 }
@@ -345,9 +434,10 @@ var AWSS3Provider = /** @class */ (function () {
      */
     AWSS3Provider.prototype.getProperties = function (key, config) {
         var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var credentialsOK, opt, bucket, _b, track, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, prefix, final_key, emitter, s3, params, headObjectCommand, response, getPropertiesResponse, error_5;
-            return tslib_1.__generator(this, function (_c) {
+        return __awaiter(this, void 0, void 0, function () {
+            var credentialsOK, opt, bucket, track, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, prefix, final_key, s3Config, params, response, getPropertiesResponse, error_5;
+            var _b;
+            return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0: return [4 /*yield*/, this._ensureCredentials()];
                     case 1:
@@ -356,12 +446,11 @@ var AWSS3Provider = /** @class */ (function () {
                             throw new Error(StorageErrorStrings_1.StorageErrorStrings.NO_CREDENTIALS);
                         }
                         opt = Object.assign({}, this._config, config);
-                        bucket = opt.bucket, _b = opt.track, track = _b === void 0 ? false : _b, SSECustomerAlgorithm = opt.SSECustomerAlgorithm, SSECustomerKey = opt.SSECustomerKey, SSECustomerKeyMD5 = opt.SSECustomerKeyMD5;
+                        bucket = opt.bucket, track = (_b = opt.track, _b === void 0 ? false : _b), SSECustomerAlgorithm = opt.SSECustomerAlgorithm, SSECustomerKey = opt.SSECustomerKey, SSECustomerKeyMD5 = opt.SSECustomerKeyMD5;
                         prefix = this._prefix(opt);
                         final_key = prefix + key;
-                        emitter = new events.EventEmitter();
-                        s3 = this._createNewS3Client(opt, core_1.StorageAction.GetProperties, emitter);
-                        logger.debug("getProperties " + key + " from " + final_key);
+                        logger.debug("getProperties ".concat(key, " from ").concat(final_key));
+                        s3Config = (0, S3ClientUtils_1.loadS3Config)(__assign(__assign({}, opt), { storageAction: core_1.StorageAction.GetProperties }));
                         params = {
                             Bucket: bucket,
                             Key: final_key,
@@ -375,11 +464,10 @@ var AWSS3Provider = /** @class */ (function () {
                         if (SSECustomerKeyMD5) {
                             params.SSECustomerKeyMD5 = SSECustomerKeyMD5;
                         }
-                        headObjectCommand = new client_s3_1.HeadObjectCommand(params);
                         _c.label = 2;
                     case 2:
                         _c.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, s3.send(headObjectCommand)];
+                        return [4 /*yield*/, (0, S3_1.headObject)(s3Config, params)];
                     case 3:
                         response = _c.sent();
                         getPropertiesResponse = {
@@ -389,15 +477,15 @@ var AWSS3Provider = /** @class */ (function () {
                             lastModified: response.LastModified,
                             metadata: response.Metadata,
                         };
-                        StorageUtils_1.dispatchStorageEvent(track, 'getProperties', { method: 'getProperties', result: 'success' }, null, "getProperties successful for " + key);
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'getProperties', { method: 'getProperties', result: 'success' }, null, "getProperties successful for ".concat(key));
                         return [2 /*return*/, getPropertiesResponse];
                     case 4:
                         error_5 = _c.sent();
                         if (((_a = error_5.$metadata) === null || _a === void 0 ? void 0 : _a.httpStatusCode) === 404) {
-                            StorageUtils_1.dispatchStorageEvent(track, 'getProperties', {
+                            (0, StorageUtils_1.dispatchStorageEvent)(track, 'getProperties', {
                                 method: 'getProperties',
                                 result: 'failed',
-                            }, null, key + " not found");
+                            }, null, "".concat(key, " not found"));
                         }
                         throw error_5;
                     case 5: return [2 /*return*/];
@@ -464,14 +552,11 @@ var AWSS3Provider = /** @class */ (function () {
             params.ACL = acl;
         }
         if (resumable === true) {
-            var s3Client = this._createNewS3Client(opt, core_1.StorageAction.Put);
-            // 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(S3ClientUtils_1.createPrefixMiddleware(opt, key), S3ClientUtils_1.prefixMiddlewareOptions);
+            var s3Config = (0, S3ClientUtils_1.loadS3Config)(__assign(__assign({}, opt), { storageAction: core_1.StorageAction.Put }));
             var addTaskInput = {
                 bucket: bucket,
                 key: key,
-                s3Client: s3Client,
+                s3Config: s3Config,
                 file: object,
                 emitter: emitter,
                 accessLevel: level,
@@ -483,7 +568,7 @@ var AWSS3Provider = /** @class */ (function () {
         try {
             if (progressCallback) {
                 if (typeof progressCallback === 'function') {
-                    emitter.on(axios_http_handler_1.SEND_UPLOAD_PROGRESS_EVENT, function (progress) {
+                    emitter.on(utils_1.SEND_UPLOAD_PROGRESS_EVENT, function (progress) {
                         progressCallback(progress);
                     });
                 }
@@ -494,13 +579,13 @@ var AWSS3Provider = /** @class */ (function () {
             }
             return uploader.upload().then(function (response) {
                 logger.debug('upload result', response);
-                StorageUtils_1.dispatchStorageEvent(track, 'upload', { method: 'put', result: 'success' }, null, "Upload success for " + key);
+                (0, StorageUtils_1.dispatchStorageEvent)(track, 'upload', { method: 'put', result: 'success' }, null, "Upload success for ".concat(key));
                 return { key: key };
             });
         }
         catch (error) {
             logger.warn('error uploading', error);
-            StorageUtils_1.dispatchStorageEvent(track, 'upload', { method: 'put', result: 'failed' }, null, "Error uploading " + key);
+            (0, StorageUtils_1.dispatchStorageEvent)(track, 'upload', { method: 'put', result: 'failed' }, null, "Error uploading ".concat(key));
             throw error;
         }
     };
@@ -511,9 +596,9 @@ var AWSS3Provider = /** @class */ (function () {
      * @return {Promise<S3ProviderRemoveOutput>} - Promise resolves upon successful removal of the object
      */
     AWSS3Provider.prototype.remove = function (key, config) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var credentialsOK, opt, bucket, track, prefix, final_key, s3, params, deleteObjectCommand, response, error_6;
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var credentialsOK, opt, bucket, track, prefix, final_key, params, s3Config, response, error_6;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._ensureCredentials()];
                     case 1:
@@ -525,24 +610,23 @@ var AWSS3Provider = /** @class */ (function () {
                         bucket = opt.bucket, track = opt.track;
                         prefix = this._prefix(opt);
                         final_key = prefix + key;
-                        s3 = this._createNewS3Client(opt, core_1.StorageAction.Remove);
                         logger.debug('remove ' + key + ' from ' + final_key);
                         params = {
                             Bucket: bucket,
                             Key: final_key,
                         };
-                        deleteObjectCommand = new client_s3_1.DeleteObjectCommand(params);
+                        s3Config = (0, S3ClientUtils_1.loadS3Config)(__assign(__assign({}, opt), { storageAction: core_1.StorageAction.Remove }));
                         _a.label = 2;
                     case 2:
                         _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, s3.send(deleteObjectCommand)];
+                        return [4 /*yield*/, (0, S3_1.deleteObject)(s3Config, params)];
                     case 3:
                         response = _a.sent();
-                        StorageUtils_1.dispatchStorageEvent(track, 'delete', { method: 'remove', result: 'success' }, null, "Deleted " + key + " successfully");
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'delete', { method: 'remove', result: 'success' }, null, "Deleted ".concat(key, " successfully"));
                         return [2 /*return*/, response];
                     case 4:
                         error_6 = _a.sent();
-                        StorageUtils_1.dispatchStorageEvent(track, 'delete', { method: 'remove', result: 'failed' }, null, "Deletion of " + key + " failed with " + error_6);
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'delete', { method: 'remove', result: 'failed' }, null, "Deletion of ".concat(key, " failed with ").concat(error_6));
                         throw error_6;
                     case 5: return [2 /*return*/];
                 }
@@ -550,18 +634,16 @@ var AWSS3Provider = /** @class */ (function () {
         });
     };
     AWSS3Provider.prototype._list = function (params, opt, prefix) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var list, s3, listObjectsV2Command, response;
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var list, response;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         list = {
                             results: [],
                             hasNextToken: false,
                         };
-                        s3 = this._createNewS3Client(opt, core_1.StorageAction.List);
-                        listObjectsV2Command = new client_s3_1.ListObjectsV2Command(tslib_1.__assign({}, params));
-                        return [4 /*yield*/, s3.send(listObjectsV2Command)];
+                        return [4 /*yield*/, (0, S3_1.listObjectsV2)((0, S3ClientUtils_1.loadS3Config)(__assign(__assign({}, opt), { storageAction: core_1.StorageAction.List })), __assign({}, params))];
                     case 1:
                         response = _a.sent();
                         if (response && response.Contents) {
@@ -589,15 +671,14 @@ var AWSS3Provider = /** @class */ (function () {
      * and file size for all objects in path
      */
     AWSS3Provider.prototype.list = function (path, config) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var credentialsOK, opt, bucket, track, pageSize, nextToken, prefix, final_path, list, MAX_PAGE_SIZE, listResult, params, error_7;
-            var _b, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0: return [4 /*yield*/, this._ensureCredentials()];
                     case 1:
-                        credentialsOK = _d.sent();
+                        credentialsOK = _c.sent();
                         if (!credentialsOK || !this._isWithCredentials(this._config)) {
                             throw new Error(StorageErrorStrings_1.StorageErrorStrings.NO_CREDENTIALS);
                         }
@@ -606,9 +687,9 @@ var AWSS3Provider = /** @class */ (function () {
                         prefix = this._prefix(opt);
                         final_path = prefix + path;
                         logger.debug('list ' + path + ' from ' + final_path);
-                        _d.label = 2;
+                        _c.label = 2;
                     case 2:
-                        _d.trys.push([2, 10, , 11]);
+                        _c.trys.push([2, 10, , 11]);
                         list = {
                             results: [],
                             hasNextToken: false,
@@ -623,17 +704,17 @@ var AWSS3Provider = /** @class */ (function () {
                         };
                         params.ContinuationToken = nextToken;
                         if (!(pageSize === 'ALL')) return [3 /*break*/, 7];
-                        _d.label = 3;
+                        _c.label = 3;
                     case 3: return [4 /*yield*/, this._list(params, opt, prefix)];
                     case 4:
-                        listResult = _d.sent();
-                        (_b = list.results).push.apply(_b, tslib_1.__spread(listResult.results));
+                        listResult = _c.sent();
+                        (_a = list.results).push.apply(_a, __spreadArray([], __read(listResult.results), false));
                         if (listResult.nextToken)
                             params.ContinuationToken = listResult.nextToken;
-                        _d.label = 5;
+                        _c.label = 5;
                     case 5:
                         if (listResult.nextToken) return [3 /*break*/, 3];
-                        _d.label = 6;
+                        _c.label = 6;
                     case 6: return [3 /*break*/, 9];
                     case 7:
                         if (pageSize &&
@@ -641,22 +722,22 @@ var AWSS3Provider = /** @class */ (function () {
                             typeof pageSize === 'number')
                             params.MaxKeys = pageSize;
                         else
-                            logger.warn("pageSize should be from 0 - " + MAX_PAGE_SIZE + ".");
+                            logger.warn("pageSize should be from 0 - ".concat(MAX_PAGE_SIZE, "."));
                         return [4 /*yield*/, this._list(params, opt, prefix)];
                     case 8:
-                        listResult = _d.sent();
-                        (_c = list.results).push.apply(_c, tslib_1.__spread(listResult.results));
+                        listResult = _c.sent();
+                        (_b = list.results).push.apply(_b, __spreadArray([], __read(listResult.results), false));
                         list.hasNextToken = listResult.hasNextToken;
-                        list.nextToken = (_a = null) !== null && _a !== void 0 ? _a : listResult.nextToken;
-                        _d.label = 9;
+                        list.nextToken = null !== null && null !== void 0 ? null : listResult.nextToken;
+                        _c.label = 9;
                     case 9:
-                        StorageUtils_1.dispatchStorageEvent(track, 'list', { method: 'list', result: 'success' }, null, list.results.length + " items returned from list operation");
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'list', { method: 'list', result: 'success' }, null, "".concat(list.results.length, " items returned from list operation"));
                         logger.debug('list', list);
                         return [2 /*return*/, list];
                     case 10:
-                        error_7 = _d.sent();
+                        error_7 = _c.sent();
                         logger.error('list InvalidArgument', error_7);
-                        StorageUtils_1.dispatchStorageEvent(track, 'list', { method: 'list', result: 'failed' }, null, "Listing items failed: " + error_7.message);
+                        (0, StorageUtils_1.dispatchStorageEvent)(track, 'list', { method: 'list', result: 'failed' }, null, "Listing items failed: ".concat(error_7.message));
                         throw error_7;
                     case 11: return [2 /*return*/];
                 }
@@ -664,9 +745,9 @@ var AWSS3Provider = /** @class */ (function () {
         });
     };
     AWSS3Provider.prototype._ensureCredentials = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var credentials, cred, error_8;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -713,17 +794,7 @@ var AWSS3Provider = /** @class */ (function () {
                 return publicPath;
         }
     };
-    /**
-     * Creates an S3 client with new V3 aws sdk
-     */
-    AWSS3Provider.prototype._createNewS3Client = function (config, storageAction, emitter) {
-        var s3client = S3ClientUtils_1.createS3Client(config, storageAction, emitter);
-        s3client.middlewareStack.add(S3ClientUtils_1.autoAdjustClockskewMiddleware(s3client.config), S3ClientUtils_1.autoAdjustClockskewMiddlewareOptions);
-        return s3client;
-    };
     AWSS3Provider.CATEGORY = 'Storage';
     AWSS3Provider.PROVIDER_NAME = 'AWSS3';
     return AWSS3Provider;
 }());
-exports.AWSS3Provider = AWSS3Provider;
-//# sourceMappingURL=AWSS3Provider.js.map