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

package/lib-esm/providers/axios-http-handler.js

@@ -41,6 +41,7 @@ import { HttpResponse } from '@aws-sdk/protocol-http';
 import { buildQueryString } from '@aws-sdk/querystring-builder';
 import axios from 'axios';
 import { ConsoleLogger as Logger, Platform } from '@aws-amplify/core';
+import { AWSS3ProviderUploadErrorStrings } from '../common/StorageErrorStrings';
 var logger = new Logger('axios-http-handler');
 export var SEND_UPLOAD_PROGRESS_EVENT = 'sendUploadProgress';
 export var SEND_DOWNLOAD_PROGRESS_EVENT = 'sendDownloadProgress';
@@ -91,7 +92,9 @@ var AxiosHttpHandler = /** @class */ (function () {
     };
     AxiosHttpHandler.prototype.handle = function (request, options) {
         var requestTimeoutInMs = this.httpOptions.requestTimeout;
-        var emitter = this.emitter;
+        // 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) {
             var queryString = buildQueryString(request.query);
@@ -125,7 +128,7 @@ var AxiosHttpHandler = /** @class */ (function () {
             // This change is a workaround to set the data as null (instead of undefined) to prevent axios from
             // removing the content-type header. Link for the source code
             // https://github.com/axios/axios/blob/dc4bc49673943e35280e5df831f5c3d0347a9393/lib/adapters/xhr.js#L121-L123
-            if (axiosRequest.headers['Content-Type']) {
+            if (axiosRequest.headers[Object.keys(axiosRequest.headers).find(function (key) { return key.toLowerCase() === 'content-type'; })]) {
                 axiosRequest.data = null;
             }
         }
@@ -143,10 +146,13 @@ var AxiosHttpHandler = /** @class */ (function () {
         if (this.cancelTokenSource) {
             axiosRequest.cancelToken = this.cancelTokenSource.token;
         }
+        if (options.cancelTokenSource) {
+            axiosRequest.cancelToken = options.cancelTokenSource.token;
+        }
         // From gamma release, aws-sdk now expects all response type to be of blob or streams
         axiosRequest.responseType = 'blob';
         // In Axios, Blobs are identified by calling Object.prototype.toString on the object. However, on React Native,
-        // calling Object.prototype.toString on a Blob returns '[object Object]' instead of '[object Blob]', which causes 
+        // calling Object.prototype.toString on a Blob returns '[object Object]' instead of '[object Blob]', which causes
         // Axios to treat Blobs as generic Javascript objects. Therefore we need a to use a custom request transformer
         // to correctly handle Blob in React Native.
         if (Platform.isReactNative) {
@@ -165,9 +171,26 @@ var AxiosHttpHandler = /** @class */ (function () {
                 };
             })
                 .catch(function (error) {
+                var _a, _b, _c;
                 // Error
-                logger.error(error.message);
-                throw error;
+                if (error.message !==
+                    AWSS3ProviderUploadErrorStrings.UPLOAD_PAUSED_MESSAGE) {
+                    logger.error(error.message);
+                }
+                // for axios' cancel error, we should re-throw it back so it's not considered an s3client error
+                // if we return empty, or an abitrary error HttpResponse, it will be hard to debug down the line
+                if (axios.isCancel(error)) {
+                    throw error;
+                }
+                // otherwise, we should re-construct an HttpResponse from the error, so that it can be passed down to other
+                // aws sdk middleware (e.g retry, clock skew correction, error message serializing)
+                return {
+                    response: new HttpResponse({
+                        statusCode: (_a = error.response) === null || _a === void 0 ? void 0 : _a.status,
+                        body: (_b = error.response) === null || _b === void 0 ? void 0 : _b.data,
+                        headers: (_c = error.response) === null || _c === void 0 ? void 0 : _c.headers,
+                    }),
+                };
             }),
             requestTimeout(requestTimeoutInMs),
         ];

package/lib-esm/providers/axios-http-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"axios-http-handler.js","sourceRoot":"","sources":["../../src/providers/axios-http-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"axios-http-handler.js","sourceRoot":"","sources":["../../src/providers/axios-http-handler.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,15 @@
 import { GetObjectRequest, GetObjectCommandOutput, PutObjectRequest, CopyObjectRequest, _Object, DeleteObjectCommandOutput } from '@aws-sdk/client-s3';
 import { StorageOptions, StorageAccessLevel } from './Storage';
+import { UploadTaskCompleteEvent, UploadTaskProgressEvent } from '../providers/AWSS3UploadTask';
+import { UploadTask } from './Provider';
 declare type ListObjectsCommandOutputContent = _Object;
+export interface FileMetadata {
+    bucket: string;
+    fileName: string;
+    key: string;
+    lastTouched: number;
+    uploadId: string;
+}
 export declare type CommonStorageOptions = Omit<StorageOptions, 'credentials' | 'region' | 'bucket' | 'dangerouslyConnectToHttpEndpointForTesting'>;
 export declare type S3ProviderGetConfig = CommonStorageOptions & {
     download?: boolean;
@@ -21,7 +30,7 @@ export declare type S3ProviderGetConfig = CommonStorageOptions & {
 export declare type S3ProviderGetOuput<T> = T extends {
     download: true;
 } ? GetObjectCommandOutput : string;
-export declare type S3ProviderPutConfig = CommonStorageOptions & {
+declare type _S3ProviderPutConfig = {
     progressCallback?: (progress: any) => any;
     provider?: 'AWSS3';
     track?: boolean;
@@ -40,10 +49,15 @@ export declare type S3ProviderPutConfig = CommonStorageOptions & {
     metadata?: PutObjectRequest['Metadata'];
     tagging?: PutObjectRequest['Tagging'];
     useAccelerateEndpoint?: boolean;
+    resumable?: boolean;
 };
-export interface S3ProviderPutOutput {
-    key: string;
-}
+export declare type ResumableUploadConfig = {
+    resumable: true;
+    progressCallback?: (progress: UploadTaskProgressEvent) => any;
+    completeCallback?: (event: UploadTaskCompleteEvent) => any;
+    errorCallback?: (err: any) => any;
+};
+export declare type S3ProviderPutConfig = CommonStorageOptions & (_S3ProviderPutConfig | (_S3ProviderPutConfig & ResumableUploadConfig));
 export declare type S3ProviderRemoveConfig = CommonStorageOptions & {
     bucket?: string;
     provider?: 'AWSS3';
@@ -89,4 +103,10 @@ export declare type S3ProviderCopyConfig = Omit<CommonStorageOptions, 'level'> &
 export declare type S3ProviderCopyOutput = {
     key: string;
 };
+export declare type PutResult = {
+    key: string;
+};
+export declare type S3ProviderPutOutput<T> = T extends {
+    resumable: true;
+} ? UploadTask : Promise<PutResult>;
 export {};

package/lib-esm/types/Provider.d.ts

@@ -4,12 +4,18 @@ export interface StorageProvider {
     copy?(src: StorageCopySource, dest: StorageCopyDestination, config?: any): Promise<any>;
     configure(config: object): object;
     get(key: string, options?: any): Promise<string | Object>;
-    put(key: string, object: any, options?: any): Promise<Object>;
+    put(key: string, object: any, options?: any): Promise<Object> | UploadTask;
     remove(key: string, options?: any): Promise<any>;
     list(path: any, options?: any): Promise<any>;
     getCategory(): string;
     getProviderName(): string;
 }
+export interface UploadTask {
+    resume(): any;
+    pause(): any;
+    percent: number;
+    isInProgress: boolean;
+}
 export interface StorageProviderWithCopy extends StorageProvider {
     copy(src: StorageCopySource, dest: StorageCopyDestination, config?: any): Promise<any>;
 }

package/lib-esm/types/Storage.d.ts

@@ -2,7 +2,7 @@
  * Storage instance options
  */
 import { ICredentials } from '@aws-amplify/core';
-import { StorageProvider, StorageProviderApi, AWSS3Provider, StorageProviderWithCopy, S3ProviderGetOuput, S3ProviderPutOutput, S3ProviderRemoveOutput, S3ProviderListOutput, S3ProviderCopyOutput } from '../';
+import { StorageProvider, StorageProviderApi, AWSS3Provider, StorageProviderWithCopy, S3ProviderGetOuput, S3ProviderRemoveOutput, S3ProviderListOutput, S3ProviderCopyOutput, S3ProviderPutOutput } from '../';
 declare type Tail<T extends any[]> = ((...t: T) => void) extends (h: any, ...r: infer R) => void ? R : never;
 declare type Last<T extends any[]> = T[Exclude<keyof T, keyof Tail<T>>];
 declare type LastParameter<F extends (...args: any) => any> = Last<Parameters<F>>;
@@ -55,16 +55,16 @@ export declare type StorageCopyConfig<T> = T extends StorageProviderWithCopy ? S
  * return type.
  * If it's a Record, check if provider is 'AWSS3', use the default type else use any.
  */
-declare type PickProviderOutput<DefaultOutput, T, api extends StorageProviderApi> = T extends StorageProvider ? T['getProviderName'] extends 'AWSS3' ? Promise<DefaultOutput> : T extends StorageProviderWithCopy ? ReturnType<T[api]> : ReturnType<T[Exclude<api, 'copy'>]> : T extends {
+declare type PickProviderOutput<DefaultOutput, T, api extends StorageProviderApi> = T extends StorageProvider ? T['getProviderName'] extends 'AWSS3' ? DefaultOutput : T extends StorageProviderWithCopy ? ReturnType<T[api]> : ReturnType<T[Exclude<api, 'copy'>]> : T extends {
     provider: string;
 } ? T extends {
     provider: 'AWSS3';
-} ? Promise<DefaultOutput> : Promise<any> : Promise<DefaultOutput>;
-export declare type StorageGetOutput<T extends StorageProvider | Record<string, any>> = PickProviderOutput<S3ProviderGetOuput<T>, T, 'get'>;
-export declare type StoragePutOutput<T> = PickProviderOutput<S3ProviderPutOutput, T, 'put'>;
-export declare type StorageRemoveOutput<T> = PickProviderOutput<S3ProviderRemoveOutput, T, 'remove'>;
-export declare type StorageListOutput<T> = PickProviderOutput<S3ProviderListOutput, T, 'list'>;
-export declare type StorageCopyOutput<T> = PickProviderOutput<S3ProviderCopyOutput, T, 'copy'>;
+} ? DefaultOutput : Promise<any> : DefaultOutput;
+export declare type StorageGetOutput<T extends StorageProvider | Record<string, any>> = PickProviderOutput<Promise<S3ProviderGetOuput<T>>, T, 'get'>;
+export declare type StoragePutOutput<T> = PickProviderOutput<S3ProviderPutOutput<T>, T, 'put'>;
+export declare type StorageRemoveOutput<T> = PickProviderOutput<Promise<S3ProviderRemoveOutput>, T, 'remove'>;
+export declare type StorageListOutput<T> = PickProviderOutput<Promise<S3ProviderListOutput>, T, 'list'>;
+export declare type StorageCopyOutput<T> = PickProviderOutput<Promise<S3ProviderCopyOutput>, T, 'copy'>;
 /**
  * Utility type to allow custom provider to use any config keys, if provider is set to AWSS3 then it should use
  * AWSS3Provider's config.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/storage",
-  "version": "4.4.3",
+  "version": "4.4.4-in-app-messaging.35+dcee89ab8",
   "description": "Storage category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -41,7 +41,7 @@
   },
   "homepage": "https://aws-amplify.github.io/",
   "dependencies": {
-    "@aws-amplify/core": "4.3.2",
+    "@aws-amplify/core": "4.3.3-in-app-messaging.35+dcee89ab8",
     "@aws-sdk/client-s3": "3.6.1",
     "@aws-sdk/s3-request-presigner": "3.6.1",
     "@aws-sdk/util-create-request": "3.6.1",
@@ -99,5 +99,5 @@
   "devDependencies": {
     "@types/sinon": "^7.5.1"
   },
-  "gitHead": "1af0b6a2589b42ed378540fc51c06171eea1fa8e"
+  "gitHead": "dcee89ab81dbd6e6e90777abae16194a05e614b0"
 }

package/src/Storage.ts

@@ -28,9 +28,11 @@ import {
 	StorageRemoveOutput,
 	StorageListOutput,
 	StorageCopyOutput,
+	UploadTask,
 } from './types';
 import axios, { CancelTokenSource } from 'axios';
 import { PutObjectCommandInput } from '@aws-sdk/client-s3';
+import { AWSS3UploadTask } from './providers/AWSS3UploadTask';
 
 const logger = new Logger('StorageClass');
 
@@ -98,7 +100,9 @@ export class Storage {
 	 * @param providerName - the name of the plugin
 	 */
 	public getPluggable(providerName: string) {
-		const pluggable = this._pluggables.find(pluggable => pluggable.getProviderName() === providerName);
+		const pluggable = this._pluggables.find(
+			pluggable => pluggable.getProviderName() === providerName
+		);
 		if (pluggable === undefined) {
 			logger.debug('No plugin found with providerName', providerName);
 			return null;
@@ -110,7 +114,9 @@ export class Storage {
 	 * @param providerName - the name of the plugin
 	 */
 	public removePluggable(providerName: string) {
-		this._pluggables = this._pluggables.filter(pluggable => pluggable.getProviderName() !== providerName);
+		this._pluggables = this._pluggables.filter(
+			pluggable => pluggable.getProviderName() !== providerName
+		);
 		return;
 	}
 
@@ -140,8 +146,10 @@ export class Storage {
 			'SSEKMSKeyId',
 		];
 
-		const isInStorageArrayKeys = (k: string) => storageArrayKeys.some(x => x === k);
-		const checkConfigKeysFromArray = (k: string[]) => k.find(k => isInStorageArrayKeys(k));
+		const isInStorageArrayKeys = (k: string) =>
+			storageArrayKeys.some(x => x === k);
+		const checkConfigKeysFromArray = (k: string[]) =>
+			k.find(k => isInStorageArrayKeys(k));
 
 		if (
 			storageKeysFromConfig &&
@@ -183,18 +191,39 @@ export class Storage {
 		return axios.CancelToken.source();
 	}
 
-	private updateRequestToBeCancellable(request: Promise<any>, cancelTokenSource: CancelTokenSource) {
+	private updateRequestToBeCancellable(
+		request: Promise<any>,
+		cancelTokenSource: CancelTokenSource
+	) {
 		this._cancelTokenSourceMap.set(request, cancelTokenSource);
 	}
 
+	private isUploadTask(x: unknown): x is UploadTask {
+		return (
+			typeof x !== 'undefined' &&
+			typeof x['pause'] === 'function' &&
+			typeof x['resume'] === 'function'
+		);
+	}
+
 	/**
 	 * Cancels an inflight request
 	 *
 	 * @param request - The request to cancel
 	 * @param [message] - A message to include in the cancelation exception
 	 */
-	public cancel(request: Promise<any>, message?: string) {
-		const cancelTokenSource = this._cancelTokenSourceMap.get(request);
+	public cancel(request: UploadTask, message?: string): Promise<boolean>;
+	public cancel(request: Promise<any>, message?: string): void;
+	public cancel(
+		request: Promise<any> | UploadTask,
+		message?: string
+	): void | Promise<boolean> {
+		if (request instanceof AWSS3UploadTask) {
+			return request._cancel();
+		}
+		const cancelTokenSource = this._cancelTokenSourceMap.get(
+			request as Promise<any>
+		);
 		if (cancelTokenSource) {
 			cancelTokenSource.cancel(message);
 		} else {
@@ -221,14 +250,20 @@ export class Storage {
 		config?: StorageCopyConfig<T>
 	): StorageCopyOutput<T> {
 		const provider = config?.provider || DEFAULT_PROVIDER;
-		const prov = this._pluggables.find(pluggable => pluggable.getProviderName() === provider);
+		const prov = this._pluggables.find(
+			pluggable => pluggable.getProviderName() === provider
+		);
 		if (prov === undefined) {
 			logger.debug('No plugin found with providerName', provider);
-			return Promise.reject('No plugin found in Storage for the provider') as StorageCopyOutput<T>;
+			return Promise.reject(
+				'No plugin found in Storage for the provider'
+			) as StorageCopyOutput<T>;
 		}
 		const cancelTokenSource = this.getCancellableTokenSource();
 		if (typeof prov.copy !== 'function') {
-			return Promise.reject(`.copy is not implemented on provider ${prov.getProviderName()}`) as StorageCopyOutput<T>;
+			return Promise.reject(
+				`.copy is not implemented on provider ${prov.getProviderName()}`
+			) as StorageCopyOutput<T>;
 		}
 		const responsePromise = prov.copy(src, dest, {
 			...config,
@@ -250,15 +285,18 @@ export class Storage {
 		key: string,
 		config?: StorageGetConfig<T>
 	): StorageGetOutput<T>;
-	public get<T extends StorageProvider | { [key: string]: any; download?: boolean }>(
-		key: string,
-		config?: StorageGetConfig<T>
-	): StorageGetOutput<T> {
+	public get<
+		T extends StorageProvider | { [key: string]: any; download?: boolean }
+	>(key: string, config?: StorageGetConfig<T>): StorageGetOutput<T> {
 		const provider = config?.provider || DEFAULT_PROVIDER;
-		const prov = this._pluggables.find(pluggable => pluggable.getProviderName() === provider);
+		const prov = this._pluggables.find(
+			pluggable => pluggable.getProviderName() === provider
+		);
 		if (prov === undefined) {
 			logger.debug('No plugin found with providerName', provider);
-			return Promise.reject('No plugin found in Storage for the provider') as StorageGetOutput<T>;
+			return Promise.reject(
+				'No plugin found in Storage for the provider'
+			) as StorageGetOutput<T>;
 		}
 		const cancelTokenSource = this.getCancellableTokenSource();
 		const responsePromise = prov.get(key, {
@@ -292,18 +330,24 @@ export class Storage {
 		config?: StoragePutConfig<T>
 	): StoragePutOutput<T> {
 		const provider = config?.provider || DEFAULT_PROVIDER;
-		const prov = this._pluggables.find(pluggable => pluggable.getProviderName() === provider);
+		const prov = this._pluggables.find(
+			pluggable => pluggable.getProviderName() === provider
+		);
 		if (prov === undefined) {
 			logger.debug('No plugin found with providerName', provider);
-			return Promise.reject('No plugin found in Storage for the provider') as StoragePutOutput<T>;
+			return Promise.reject(
+				'No plugin found in Storage for the provider'
+			) as StoragePutOutput<T>;
 		}
 		const cancelTokenSource = this.getCancellableTokenSource();
-		const responsePromise = prov.put(key, object, {
+		const response = prov.put(key, object, {
 			...config,
 			cancelTokenSource,
 		});
-		this.updateRequestToBeCancellable(responsePromise, cancelTokenSource);
-		return responsePromise as StoragePutOutput<T>;
+		if (!this.isUploadTask(response)) {
+			this.updateRequestToBeCancellable(response, cancelTokenSource);
+		}
+		return response as StoragePutOutput<T>;
 	}
 
 	/**
@@ -312,16 +356,23 @@ export class Storage {
 	 * @param [config] - { level : private|protected|public }
 	 * @return - Promise resolves upon successful removal of the object
 	 */
-	public remove<T extends Record<string, any>>(key: string, config?: StorageRemoveConfig<T>): StorageRemoveOutput<T>;
+	public remove<T extends Record<string, any>>(
+		key: string,
+		config?: StorageRemoveConfig<T>
+	): StorageRemoveOutput<T>;
 	public remove<T extends StorageProvider = AWSS3Provider>(
 		key: string,
 		config?: StorageRemoveConfig<T>
 	): StorageRemoveOutput<T> {
 		const provider = config?.provider || DEFAULT_PROVIDER;
-		const prov = this._pluggables.find(pluggable => pluggable.getProviderName() === provider);
+		const prov = this._pluggables.find(
+			pluggable => pluggable.getProviderName() === provider
+		);
 		if (prov === undefined) {
 			logger.debug('No plugin found with providerName', provider);
-			return Promise.reject('No plugin found in Storage for the provider') as StorageRemoveOutput<T>;
+			return Promise.reject(
+				'No plugin found in Storage for the provider'
+			) as StorageRemoveOutput<T>;
 		}
 		return prov.remove(key, config) as StorageRemoveOutput<T>;
 	}
@@ -332,16 +383,23 @@ export class Storage {
 	 * @param [config] - { level : private|protected|public, maxKeys: NUMBER }
 	 * @return - Promise resolves to list of keys for all objects in path
 	 */
-	public list<T extends Record<string, any>>(key: string, config?: StorageListConfig<T>): StorageListOutput<T>;
+	public list<T extends Record<string, any>>(
+		key: string,
+		config?: StorageListConfig<T>
+	): StorageListOutput<T>;
 	public list<T extends StorageProvider = AWSS3Provider>(
 		path: string,
 		config?: StorageListConfig<T>
 	): StorageListOutput<T> {
 		const provider = config?.provider || DEFAULT_PROVIDER;
-		const prov = this._pluggables.find(pluggable => pluggable.getProviderName() === provider);
+		const prov = this._pluggables.find(
+			pluggable => pluggable.getProviderName() === provider
+		);
 		if (prov === undefined) {
 			logger.debug('No plugin found with providerName', provider);
-			return Promise.reject('No plugin found in Storage for the provider') as StorageListOutput<T>;
+			return Promise.reject(
+				'No plugin found in Storage for the provider'
+			) as StorageListOutput<T>;
 		}
 		return prov.list(path, config) as StorageListOutput<T>;
 	}

package/src/common/S3ClientUtils.ts

@@ -0,0 +1,168 @@
+import {
+	Credentials,
+	ICredentials,
+	Logger,
+	getAmplifyUserAgent,
+} from '@aws-amplify/core';
+import { StorageAccessLevel, CustomPrefix } from '../types';
+import {
+	InitializeMiddleware,
+	InitializeHandlerOptions,
+	FinalizeRequestHandlerOptions,
+	FinalizeRequestMiddleware,
+	HandlerExecutionContext,
+} from '@aws-sdk/types';
+import { S3ClientConfig, S3Client } from '@aws-sdk/client-s3';
+import { CancelTokenSource } from 'axios';
+import * as events from 'events';
+import { AxiosHttpHandler } from '../providers/axios-http-handler';
+import {
+	localTestingStorageEndpoint,
+	SET_CONTENT_LENGTH_HEADER,
+} from './StorageConstants';
+
+const logger = new Logger('S3ClientUtils');
+// placeholder credentials in order to satisfy type requirement, always results in 403 when used
+const INVALID_CRED = { accessKeyId: '', secretAccessKey: '' };
+
+export const getPrefix = (config: {
+	credentials: ICredentials;
+	level?: StorageAccessLevel;
+	customPrefix?: CustomPrefix;
+	identityId?: string;
+}): string => {
+	const { credentials, level, customPrefix, identityId } = config;
+
+	const resolvedCustomPrefix = customPrefix || {};
+	const resolvedIdentityId = identityId || credentials.identityId;
+	const privatePath =
+		(resolvedCustomPrefix.private !== undefined
+			? resolvedCustomPrefix.private
+			: 'private/') +
+		resolvedIdentityId +
+		'/';
+	const protectedPath =
+		(resolvedCustomPrefix.protected !== undefined
+			? resolvedCustomPrefix.protected
+			: 'protected/') +
+		resolvedIdentityId +
+		'/';
+	const publicPath =
+		resolvedCustomPrefix.public !== undefined
+			? resolvedCustomPrefix.public
+			: 'public/';
+
+	switch (level) {
+		case 'private':
+			return privatePath;
+		case 'protected':
+			return protectedPath;
+		default:
+			return publicPath;
+	}
+};
+
+export const createPrefixMiddleware = (
+	opt: Record<string, any>,
+	key: string
+): InitializeMiddleware<any, any> => (next, _context) => async args => {
+	const credentials = await Credentials.get();
+	const cred = Credentials.shear(credentials);
+	const prefix = getPrefix({ ...opt, credentials: cred });
+	const clonedInput = Object.assign({}, args.input);
+	if (Object.prototype.hasOwnProperty.call(args.input, 'Key')) {
+		clonedInput.Key = prefix + key;
+		args.input = clonedInput;
+	} else if (Object.prototype.hasOwnProperty.call(args.input, 'Prefix')) {
+		clonedInput.Prefix = prefix + key;
+		args.input = clonedInput;
+	}
+	const result = next(args);
+	return result;
+};
+
+const isTimeSkewedError = (err: any): boolean =>
+	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
+export const autoAdjustClockskewMiddleware = (
+	config: S3ClientConfig
+): FinalizeRequestMiddleware<any, any> => (
+	next,
+	_context: HandlerExecutionContext
+) => async args => {
+	try {
+		return await next(args);
+	} catch (err) {
+		if (isTimeSkewedError(err)) {
+			const serverDate = new Date(err.ServerTime);
+			config.systemClockOffset = serverDate.getTime() - Date.now();
+		}
+		throw err;
+	}
+};
+
+export const autoAdjustClockskewMiddlewareOptions: FinalizeRequestHandlerOptions = {
+	step: 'finalizeRequest',
+	name: 'autoAdjustClockskewMiddleware',
+};
+
+export const prefixMiddlewareOptions: InitializeHandlerOptions = {
+	step: 'initialize',
+	name: 'addPrefixMiddleware',
+};
+
+export const credentialsProvider = async () => {
+	try {
+		const credentials = await Credentials.get();
+		if (!credentials) return INVALID_CRED;
+		const cred = Credentials.shear(credentials);
+		logger.debug('credentials provider get credentials', cred);
+		return cred;
+	} catch (error) {
+		logger.warn('credentials provider error', error);
+		return INVALID_CRED;
+	}
+};
+
+export const createS3Client = (
+	config: {
+		region?: string;
+		cancelTokenSource?: CancelTokenSource;
+		dangerouslyConnectToHttpEndpointForTesting?: boolean;
+		useAccelerateEndpoint?: boolean;
+	},
+	emitter?: events.EventEmitter
+): S3Client => {
+	const {
+		region,
+		cancelTokenSource,
+		dangerouslyConnectToHttpEndpointForTesting,
+		useAccelerateEndpoint,
+	} = config;
+	let localTestingConfig = {};
+
+	if (dangerouslyConnectToHttpEndpointForTesting) {
+		localTestingConfig = {
+			endpoint: localTestingStorageEndpoint,
+			tls: false,
+			bucketEndpoint: false,
+			forcePathStyle: true,
+		};
+	}
+
+	const s3client = new S3Client({
+		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: getAmplifyUserAgent(),
+		...localTestingConfig,
+		requestHandler: new AxiosHttpHandler({}, emitter, cancelTokenSource),
+		useAccelerateEndpoint,
+	});
+	s3client.middlewareStack.remove(SET_CONTENT_LENGTH_HEADER);
+	return s3client;
+};

package/src/common/StorageConstants.ts

@@ -0,0 +1,10 @@
+export const AMPLIFY_SYMBOL = (typeof Symbol !== 'undefined' &&
+typeof Symbol.for === 'function'
+	? Symbol.for('amplify_default')
+	: '@@amplify_default') as Symbol;
+
+export const SET_CONTENT_LENGTH_HEADER = 'contentLengthMiddleware';
+
+export const localTestingStorageEndpoint = 'http://localhost:20005';
+
+export const UPLOADS_STORAGE_KEY = '__uploadInProgress';

package/src/common/StorageErrorStrings.ts

@@ -2,6 +2,7 @@ export enum StorageErrorStrings {
 	NO_CREDENTIALS = 'No credentials',
 	NO_SRC_KEY = 'source param should be an object with the property "key" with value of type string',
 	NO_DEST_KEY = 'destination param should be an object with the property "key" with value of type string',
+	INVALID_BLOB = 'Object must be an instance of Blob',
 }
 
 export enum AWSS3ProviderMultipartCopierErrors {
@@ -11,3 +12,7 @@ export enum AWSS3ProviderMultipartCopierErrors {
 	NO_COPYSOURCE = 'You must specify a copy source',
 	MAX_NUM_PARTS_EXCEEDED = 'Only a maximum of 10000 parts are allowed',
 }
+
+export enum AWSS3ProviderUploadErrorStrings {
+	UPLOAD_PAUSED_MESSAGE = 'paused',
+}