@aws-amplify/core 6.0.16 → 6.0.17-unstable.0d2aa5d.0

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.16';
+export const version = '6.0.17-unstable.0d2aa5d.0+0d2aa5d';

package/src/Reachability/Reachability.native.ts

@@ -2,14 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Observable } from 'rxjs';
 import { loadNetInfo } from '@aws-amplify/react-native';
+
 import { ConsoleLogger } from '../Logger';
+
 import { NetworkStatus } from './types';
 
 const logger = new ConsoleLogger('Reachability', 'DEBUG');
 
 export class Reachability {
 	networkMonitor(
-		netInfo?: ReturnType<typeof loadNetInfo>
+		netInfo?: ReturnType<typeof loadNetInfo>,
 	): Observable<NetworkStatus> {
 		/**
 		 * Here netinfo refers to @react-native-community/netinfo
@@ -20,9 +22,10 @@ export class Reachability {
 		 */
 		if (!(netInfo && netInfo.addEventListener)) {
 			throw new Error(
-				'NetInfo must be passed to networkMonitor to enable reachability in React Native'
+				'NetInfo must be passed to networkMonitor to enable reachability in React Native',
 			);
 		}
+
 		return new Observable(observer => {
 			logger.log('subscribing to reachability in React Native');
 
@@ -35,7 +38,7 @@ export class Reachability {
 						logger.log('Notifying reachability change', online);
 						observer.next({ online });
 					}
-				}
+				},
 			);
 
 			return () => {

package/src/Reachability/Reachability.ts

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CompletionObserver, Observable, from } from 'rxjs';
-import { NetworkStatus } from './types';
+
 import { isWebWorker } from '../utils';
 
+import { NetworkStatus } from './types';
+
 export class Reachability {
-	private static _observers: Array<CompletionObserver<NetworkStatus>> = [];
+	private static _observers: CompletionObserver<NetworkStatus>[] = [];
 
 	networkMonitor(_?: unknown): Observable<NetworkStatus> {
 		const globalObj = isWebWorker()
@@ -20,8 +22,12 @@ export class Reachability {
 		return new Observable(observer => {
 			observer.next({ online: globalObj.navigator.onLine });
 
-			const notifyOnline = () => observer.next({ online: true });
-			const notifyOffline = () => observer.next({ online: false });
+			const notifyOnline = () => {
+				observer.next({ online: true });
+			};
+			const notifyOffline = () => {
+				observer.next({ online: false });
+			};
 
 			globalObj.addEventListener('online', notifyOnline);
 			globalObj.addEventListener('offline', notifyOffline);
@@ -33,7 +39,7 @@ export class Reachability {
 				globalObj.removeEventListener('offline', notifyOffline);
 
 				Reachability._observers = Reachability._observers.filter(
-					_observer => _observer !== observer
+					_observer => _observer !== observer,
 				);
 			};
 		});
@@ -44,7 +50,7 @@ export class Reachability {
 		for (const observer of this._observers) {
 			if (observer.closed) {
 				this._observers = this._observers.filter(
-					_observer => _observer !== observer
+					_observer => _observer !== observer,
 				);
 				continue;
 			}

package/src/Reachability/types.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export type NetworkStatus = {
+export interface NetworkStatus {
 	online: boolean;
-};
+}

package/src/ServiceWorker/ServiceWorker.ts

@@ -4,10 +4,11 @@
 import { ConsoleLogger } from '../Logger';
 import { isBrowser } from '../utils';
 import { AmplifyError } from '../errors';
-import { assert, ServiceWorkerErrorCode } from './errorHelpers';
 import { record } from '../providers/pinpoint';
 import { Amplify, fetchAuthSession } from '../singleton';
 
+import { ServiceWorkerErrorCode, assert } from './errorHelpers';
+
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.
@@ -37,15 +38,13 @@ export class ServiceWorkerClass {
 	// The AWS Amplify logger
 	private _logger: ConsoleLogger = new ConsoleLogger('ServiceWorker');
 
-	constructor() {}
-
 	/**
 	 * Get the currently active service worker
 	 */
 	get serviceWorker(): ServiceWorker {
 		assert(
 			this._serviceWorker !== undefined,
-			ServiceWorkerErrorCode.UndefinedInstance
+			ServiceWorkerErrorCode.UndefinedInstance,
 		);
 
 		return this._serviceWorker;
@@ -63,9 +62,10 @@ export class ServiceWorkerClass {
 	 *	- resolve(ServiceWorkerRegistration)
 	 *	- reject(Error)
 	 **/
-	register(filePath: string = '/service-worker.js', scope: string = '/') {
+	register(filePath = '/service-worker.js', scope = '/') {
 		this._logger.debug(`registering ${filePath}`);
 		this._logger.debug(`registering service worker with scope ${scope}`);
+
 		return new Promise((resolve, reject) => {
 			if (navigator && 'serviceWorker' in navigator) {
 				navigator.serviceWorker
@@ -83,26 +83,28 @@ export class ServiceWorkerClass {
 						this._registration = registration;
 						this._setupListeners();
 						this._logger.debug(
-							`Service Worker Registration Success: ${registration}`
+							`Service Worker Registration Success: ${registration}`,
 						);
-						return resolve(registration);
+
+						resolve(registration);
 					})
 					.catch(error => {
 						this._logger.debug(`Service Worker Registration Failed ${error}`);
-						return reject(
+
+						reject(
 							new AmplifyError({
 								name: ServiceWorkerErrorCode.Unavailable,
 								message: 'Service Worker not available',
 								underlyingError: error,
-							})
+							}),
 						);
 					});
 			} else {
-				return reject(
+				reject(
 					new AmplifyError({
 						name: ServiceWorkerErrorCode.Unavailable,
 						message: 'Service Worker not available',
-					})
+					}),
 				);
 			}
 		});
@@ -122,34 +124,36 @@ export class ServiceWorkerClass {
 	enablePush(publicKey: string) {
 		assert(
 			this._registration !== undefined,
-			ServiceWorkerErrorCode.UndefinedRegistration
+			ServiceWorkerErrorCode.UndefinedRegistration,
 		);
 		this._publicKey = publicKey;
+
 		return new Promise((resolve, reject) => {
 			if (isBrowser()) {
 				assert(
 					this._registration !== undefined,
-					ServiceWorkerErrorCode.UndefinedRegistration
+					ServiceWorkerErrorCode.UndefinedRegistration,
 				);
 				this._registration.pushManager.getSubscription().then(subscription => {
 					if (subscription) {
 						this._subscription = subscription;
 						this._logger.debug(
-							`User is subscribed to push: ${JSON.stringify(subscription)}`
+							`User is subscribed to push: ${JSON.stringify(subscription)}`,
 						);
 						resolve(subscription);
 					} else {
 						this._logger.debug(`User is NOT subscribed to push`);
+
 						return this._registration!.pushManager.subscribe({
 							userVisibleOnly: true,
 							applicationServerKey: this._urlB64ToUint8Array(publicKey),
 						})
-							.then(subscription => {
-								this._subscription = subscription;
+							.then(pushManagerSubscription => {
+								this._subscription = pushManagerSubscription;
 								this._logger.debug(
-									`User subscribed: ${JSON.stringify(subscription)}`
+									`User subscribed: ${JSON.stringify(pushManagerSubscription)}`,
 								);
-								resolve(subscription);
+								resolve(pushManagerSubscription);
 							})
 							.catch(error => {
 								this._logger.error(error);
@@ -157,11 +161,11 @@ export class ServiceWorkerClass {
 					}
 				});
 			} else {
-				return reject(
+				reject(
 					new AmplifyError({
 						name: ServiceWorkerErrorCode.Unavailable,
 						message: 'Service Worker not available',
-					})
+					}),
 				);
 			}
 		});
@@ -174,7 +178,7 @@ export class ServiceWorkerClass {
 	private _urlB64ToUint8Array(base64String: string) {
 		const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
 		const base64 = (base64String + padding)
-			.replace(/\-/g, '+')
+			.replace(/-/g, '+')
 			.replace(/_/g, '/');
 
 		const rawData = window.atob(base64);
@@ -183,6 +187,7 @@ export class ServiceWorkerClass {
 		for (let i = 0; i < rawData.length; ++i) {
 			outputArray[i] = rawData.charCodeAt(i);
 		}
+
 		return outputArray;
 	}
 
@@ -197,7 +202,7 @@ export class ServiceWorkerClass {
 	send(message: object | string) {
 		if (this._serviceWorker) {
 			this._serviceWorker.postMessage(
-				typeof message === 'object' ? JSON.stringify(message) : message
+				typeof message === 'object' ? JSON.stringify(message) : message,
 			);
 		}
 	}
@@ -207,7 +212,7 @@ export class ServiceWorkerClass {
 	 * https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker/state
 	 **/
 	_setupListeners() {
-		this.serviceWorker.addEventListener('statechange', async event => {
+		this.serviceWorker.addEventListener('statechange', async () => {
 			const currentState = this.serviceWorker.state;
 			this._logger.debug(`ServiceWorker statechange: ${currentState}`);
 

package/src/Signer/DateUtils.ts

@@ -8,16 +8,16 @@
  */
 
 const FIVE_MINUTES_IN_MS = 1000 * 60 * 5;
-type DateUtils = {
+interface DateUtils {
 	clockOffset: number;
-	getDateWithClockOffset: () => Date;
-	getClockOffset: () => number;
-	getHeaderStringFromDate: (date: Date) => string;
-	getDateFromHeaderString: (header: string) => Date;
-	isClockSkewed: (serverDate: Date) => boolean;
-	isClockSkewError: (error: any) => boolean;
-	setClockOffset: (offset: number) => void;
-};
+	getDateWithClockOffset(): Date;
+	getClockOffset(): number;
+	getHeaderStringFromDate(date: Date): string;
+	getDateFromHeaderString(header: string): Date;
+	isClockSkewed(serverDate: Date): boolean;
+	isClockSkewError(error: any): boolean;
+	setClockOffset(offset: number): void;
+}
 
 /**
  * This utility is intended to be deprecated and replaced by `signRequest` and `presignUrl` functions from
@@ -50,12 +50,12 @@ export const DateUtils: DateUtils = {
 	},
 
 	getHeaderStringFromDate(date: Date = DateUtils.getDateWithClockOffset()) {
-		return date.toISOString().replace(/[:\-]|\.\d{3}/g, '');
+		return date.toISOString().replace(/[:-]|\.\d{3}/g, '');
 	},
 
 	getDateFromHeaderString(header: string) {
 		const [, year, month, day, hour, minute, second] = header.match(
-			/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2}).+/
+			/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2}).+/,
 		) as any[];
 
 		return new Date(
@@ -65,8 +65,8 @@ export const DateUtils: DateUtils = {
 				Number(day),
 				Number(hour),
 				Number(minute),
-				Number(second)
-			)
+				Number(second),
+			),
 		);
 	},
 
@@ -74,7 +74,7 @@ export const DateUtils: DateUtils = {
 		// API gateway permits client calls that are off by no more than ±5 minutes
 		return (
 			Math.abs(
-				serverDate.getTime() - DateUtils.getDateWithClockOffset().getTime()
+				serverDate.getTime() - DateUtils.getDateWithClockOffset().getTime(),
 			) >= FIVE_MINUTES_IN_MS
 		);
 	},
@@ -88,9 +88,9 @@ export const DateUtils: DateUtils = {
 
 		return Boolean(
 			['BadRequestException', 'InvalidSignatureException'].includes(
-				headers['x-amzn-errortype']
+				headers['x-amzn-errortype'],
 			) &&
-				(headers.date || headers.Date)
+				(headers.date || headers.Date),
 		);
 	},
 

package/src/Signer/Signer.ts

@@ -1,17 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { DateUtils } from './DateUtils';
 import {
+	TOKEN_QUERY_PARAM,
 	presignUrl,
 	signRequest,
-	TOKEN_QUERY_PARAM,
 } from '../clients/middleware/signing/signer/signatureV4';
 import { AmplifyUrl } from '../utils/amplifyUrl';
 
+import { DateUtils } from './DateUtils';
+
 const IOT_SERVICE_NAME = 'iotdevicegateway';
 // Best practice regex to parse the service and region from an AWS endpoint
-const AWS_ENDPOINT_REGEX = /([^\.]+)\.(?:([^\.]*)\.)?amazonaws\.com(.cn)?$/;
+const AWS_ENDPOINT_REGEX = /([^.]+)\.(?:([^.]*)\.)?amazonaws\.com(.cn)?$/;
 
 /**
  * This class is intended to be deprecated and replaced by `signRequest` and `presignUrl` functions from
@@ -72,13 +73,13 @@ export class Signer {
 			secret_key: string;
 			session_token: string;
 		},
-		serviceInfo: { service: string; region: string }
+		serviceInfo: { service: string; region: string },
 	) {
 		request.headers = request.headers || {};
 
 		if (request.body && !request.data) {
 			throw new Error(
-				'The attribute "body" was found on the request object. Please use the attribute "data" instead.'
+				'The attribute "body" was found on the request object. Please use the attribute "data" instead.',
 			);
 		}
 
@@ -100,6 +101,7 @@ export class Signer {
 			signedRequest.headers['x-amz-security-token'];
 		delete signedRequest.headers.authorization;
 		delete signedRequest.headers['x-amz-security-token'];
+
 		return signedRequest;
 	}
 
@@ -107,19 +109,21 @@ export class Signer {
 		urlToSign: string,
 		accessInfo: any,
 		serviceInfo?: any,
-		expiration?: number
+		expiration?: number,
 	): string;
+
 	static signUrl(
 		request: any,
 		accessInfo: any,
 		serviceInfo?: any,
-		expiration?: number
+		expiration?: number,
 	): string;
+
 	static signUrl(
 		urlOrRequest: string | any,
 		accessInfo: any,
 		serviceInfo?: any,
-		expiration?: number
+		expiration?: number,
 	): string {
 		const urlToSign: string =
 			typeof urlOrRequest === 'object' ? urlOrRequest.url : urlOrRequest;
@@ -138,7 +142,7 @@ export class Signer {
 			presignable,
 			accessInfo,
 			serviceInfo,
-			expiration
+			expiration,
 		);
 		const signedUrl = presignUrl(presignable, options);
 		if (
@@ -147,9 +151,10 @@ export class Signer {
 		) {
 			signedUrl.searchParams.append(
 				TOKEN_QUERY_PARAM,
-				accessInfo.session_token
+				accessInfo.session_token,
 			);
 		}
+
 		return signedUrl.toString();
 	}
 }
@@ -158,11 +163,11 @@ const getOptions = (
 	request: { url: URL } & Record<string, any>,
 	accessInfo: { access_key: string; secret_key: string; session_token: string },
 	serviceInfo: { service: string; region: string },
-	expiration?: number
+	expiration?: number,
 ) => {
 	const { access_key, secret_key, session_token } = accessInfo ?? {};
 	const { region: urlRegion, service: urlService } = parseServiceInfo(
-		request.url
+		request.url,
 	);
 	const { region = urlRegion, service = urlService } = serviceInfo ?? {};
 	const credentials = {
@@ -172,6 +177,7 @@ const getOptions = (
 			? { sessionToken: session_token }
 			: {}),
 	};
+
 	return {
 		credentials,
 		signingDate: DateUtils.getDateWithClockOffset(),
@@ -182,7 +188,7 @@ const getOptions = (
 };
 
 const parseServiceInfo = (url: URL) => {
-	const host = url.host;
+	const { host } = url;
 	const matched = host.match(AWS_ENDPOINT_REGEX) ?? [];
 	let parsed = matched.slice(1, 3);
 

package/src/adapterCore/serverContext/serverContext.ts

@@ -1,12 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { AmplifyServer } from './types';
-import { serverContextRegistry } from './serverContextRegistry';
 import { AmplifyClass } from '../../singleton';
 import { LibraryOptions, ResourcesConfig } from '../../singleton/types';
 import { AmplifyServerContextError } from '../error';
 
+import { serverContextRegistry } from './serverContextRegistry';
+import { AmplifyServer } from './types';
+
 /**
  * Creates an Amplify server context.
  * @param amplifyConfig The Amplify resource config.
@@ -15,7 +16,7 @@ import { AmplifyServerContextError } from '../error';
  */
 export const createAmplifyServerContext = (
 	amplifyConfig: ResourcesConfig,
-	libraryOptions: LibraryOptions
+	libraryOptions: LibraryOptions,
 ): AmplifyServer.ContextSpec => {
 	const amplify = new AmplifyClass();
 	amplify.configure(amplifyConfig, libraryOptions);
@@ -31,7 +32,7 @@ export const createAmplifyServerContext = (
  * @returns The Amplify server context.
  */
 export const getAmplifyServerContext = (
-	contextSpec: AmplifyServer.ContextSpec
+	contextSpec: AmplifyServer.ContextSpec,
 ): AmplifyServer.Context => {
 	assertContextSpec(contextSpec);
 	const context = serverContextRegistry.get(contextSpec);
@@ -53,7 +54,7 @@ export const getAmplifyServerContext = (
  * @param contextSpec The context spec used to destroy the Amplify server context.
  */
 export const destroyAmplifyServerContext = (
-	contextSpec: AmplifyServer.ContextSpec
+	contextSpec: AmplifyServer.ContextSpec,
 ): void => {
 	serverContextRegistry.deregister(contextSpec);
 };

package/src/adapterCore/serverContext/serverContextRegistry.ts

@@ -18,13 +18,14 @@ export const serverContextRegistry = {
 	register(context: AmplifyServer.Context): AmplifyServer.ContextSpec {
 		const token = createToken();
 		storage.set(token, context);
+
 		return { token };
 	},
 	deregister(contextSpec: AmplifyServer.ContextSpec): boolean {
 		return storage.delete(contextSpec.token);
 	},
 	get(
-		contextSpec: AmplifyServer.ContextSpec
+		contextSpec: AmplifyServer.ContextSpec,
 	): AmplifyServer.Context | undefined {
 		return storage.get(contextSpec.token);
 	},

package/src/adapterCore/serverContext/types/amplifyServer.ts

@@ -4,26 +4,24 @@
 import { AmplifyClass } from '../../../singleton';
 import { LibraryOptions, ResourcesConfig } from '../../../singleton/types';
 
-export namespace AmplifyServer {
-	export type ContextToken = {
-		readonly value: Symbol;
-	};
+export declare namespace AmplifyServer {
+	export interface ContextToken {
+		readonly value: symbol;
+	}
 
-	export type ContextSpec = {
+	export interface ContextSpec {
 		readonly token: ContextToken;
-	};
+	}
 
-	export type Context = {
+	export interface Context {
 		amplify: AmplifyClass;
-	};
-
-	export interface RunOperationWithContext {
-		<Result>(
-			amplifyConfig: ResourcesConfig,
-			libraryOptions: LibraryOptions,
-			operation: (
-				contextSpec: AmplifyServer.ContextSpec
-			) => Result | Promise<Result>
-		): Promise<Result>;
 	}
+
+	export type RunOperationWithContext = <Result>(
+		amplifyConfig: ResourcesConfig,
+		libraryOptions: LibraryOptions,
+		operation: (
+			contextSpec: AmplifyServer.ContextSpec,
+		) => Result | Promise<Result>,
+	) => Promise<Result>;
 }

package/src/adapterCore/serverContext/types/cookieStorage.ts

@@ -3,7 +3,7 @@
 
 import { CookieSerializeOptions } from 'cookie';
 
-export namespace CookieStorage {
+export declare namespace CookieStorage {
 	export type SetCookieOptions = Partial<
 		Pick<
 			CookieSerializeOptions,

package/src/awsClients/cognitoIdentity/base.ts

@@ -9,13 +9,13 @@ import {
 	HttpResponse,
 	Middleware,
 	getDnsSuffix,
-	unauthenticatedHandler,
 	parseJsonError,
+	unauthenticatedHandler,
 } from '../../clients';
 import { composeTransferHandler } from '../../clients/internal/composeTransferHandler';
 import {
-	jitteredBackoff,
 	getRetryDecider,
+	jitteredBackoff,
 } from '../../clients/middleware/retry';
 import { getAmplifyUserAgent } from '../../Platform';
 import { observeFrameworkChanges } from '../../Platform/detectFramework';
@@ -31,19 +31,23 @@ const SERVICE_NAME = 'cognito-identity';
  */
 const endpointResolver = ({ region }: EndpointResolverOptions) => ({
 	url: new AmplifyUrl(
-		`https://cognito-identity.${region}.${getDnsSuffix(region)}`
+		`https://cognito-identity.${region}.${getDnsSuffix(region)}`,
 	),
 });
 
 /**
  * A Cognito Identity-specific middleware that disables caching for all requests.
  */
-const disableCacheMiddleware: Middleware<HttpRequest, HttpResponse, {}> =
-	() => (next, context) =>
-		async function disableCacheMiddleware(request) {
-			request.headers['cache-control'] = 'no-store';
-			return next(request);
-		};
+const disableCacheMiddlewareFactory: Middleware<
+	HttpRequest,
+	HttpResponse,
+	Record<string, unknown>
+> = () => next =>
+	async function disableCacheMiddleware(request) {
+		request.headers['cache-control'] = 'no-store';
+
+		return next(request);
+	};
 
 /**
  * A Cognito Identity-specific transfer handler that does NOT sign requests, and
@@ -52,11 +56,11 @@ const disableCacheMiddleware: Middleware<HttpRequest, HttpResponse, {}> =
  * @internal
  */
 export const cognitoIdentityTransferHandler = composeTransferHandler<
-	[Parameters<typeof disableCacheMiddleware>[0]],
+	[Parameters<typeof disableCacheMiddlewareFactory>[0]],
 	HttpRequest,
 	HttpResponse,
 	typeof unauthenticatedHandler
->(unauthenticatedHandler, [disableCacheMiddleware]);
+>(unauthenticatedHandler, [disableCacheMiddlewareFactory]);
 
 /**
  * @internal
@@ -88,7 +92,7 @@ export const getSharedHeaders = (operation: string): Headers => ({
 export const buildHttpRpcRequest = (
 	{ url }: Endpoint,
 	headers: Headers,
-	body: any
+	body: any,
 ): HttpRequest => ({
 	headers,
 	url,