@aws-amplify/core 6.0.1-api-v6-models.8035dfc.0 → 6.0.1-api-v6-models.3eb7748.0

package/src/singleton/Interactions/types.ts

@@ -0,0 +1,29 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+interface LexV1BotConfig {
+	alias: string;
+	region: string;
+}
+
+interface LexV2BotConfig {
+	botId: string;
+	aliasId: string;
+	localeId: string;
+	region: string;
+}
+
+type InteractionsLexV1Config = {
+	LexV1: Record<string, LexV1BotConfig>;
+};
+
+type InteractionsLexV2Config = {
+	LexV2: Record<string, LexV2BotConfig>;
+};
+
+type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> &
+	U[keyof U];
+
+export type InteractionsConfig = AtLeastOne<
+	InteractionsLexV1Config & InteractionsLexV2Config
+>;

package/src/singleton/Notifications/PushNotification/types.ts

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { PinpointProviderConfig } from '../../../providers/pinpoint/types';
+
+export type PushNotificationConfig = PinpointProviderConfig;

package/src/singleton/Notifications/types.ts

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { InAppMessagingConfig } from './InAppMessaging/types';
+import { PushNotificationConfig } from './PushNotification/types';
 
 export type NotificationsConfig = {
-	InAppMessaging: InAppMessagingConfig;
+	InAppMessaging?: InAppMessagingConfig;
+	PushNotification?: PushNotificationConfig;
 };

package/src/singleton/types.ts

@@ -18,8 +18,8 @@ import {
 	StorageAccessLevel,
 	StorageConfig,
 } from './Storage/types';
-import { I18nConfig } from '../I18n/types';
 import { NotificationsConfig } from './Notifications/types';
+import { InteractionsConfig } from './Interactions/types';
 
 export type LegacyConfig = {
 	/**
@@ -32,10 +32,7 @@ export type ResourcesConfig = {
 	API?: APIConfig;
 	Analytics?: AnalyticsConfig;
 	Auth?: AuthConfig;
-	// Cache?: CacheConfig;
-	// DataStore?: {};
-	I18n?: I18nConfig;
-	// Interactions?: {};
+	Interactions?: InteractionsConfig;
 	Notifications?: NotificationsConfig;
 	// Predictions?: {};
 	Storage?: StorageConfig;
@@ -56,6 +53,7 @@ export {
 	AuthIdentityPoolConfig,
 	AuthUserPoolAndIdentityPoolConfig,
 	GetCredentialsOptions,
+	InteractionsConfig,
 	StorageAccessLevel,
 	StorageConfig,
 	AnalyticsConfig,

package/src/storage/CookieStorage.ts

@@ -1,11 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-	get as getJsCookie,
-	remove as removeJsCookie,
-	set as setJsCookie,
-} from 'js-cookie';
+import JsCookie from 'js-cookie';
 import {
 	CookieStorageData,
 	KeyValueStorageInterface,
@@ -42,20 +38,20 @@ export class CookieStorage implements KeyValueStorageInterface {
 	}
 
 	async setItem(key: string, value: string) {
-		setJsCookie(key, value, this.getData());
+		JsCookie.set(key, value, this.getData());
 	}
 
 	async getItem(key: string) {
-		const item = getJsCookie(key);
+		const item = JsCookie.get(key);
 		return item ?? null;
 	}
 
 	async removeItem(key: string) {
-		removeJsCookie(key, this.getData());
+		JsCookie.remove(key, this.getData());
 	}
 
 	async clear() {
-		const cookie = getJsCookie();
+		const cookie = JsCookie.get();
 		const promises = Object.keys(cookie).map(key => this.removeItem(key));
 		await Promise.all(promises);
 	}

package/src/storage/DefaultStorage.ts

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { KeyValueStorage } from './KeyValueStorage';
-import { getDefaultStorageWithFallback } from './utils';
+import { getLocalStorageWithFallback } from './utils';
 
 /**
  * @internal
  */
 export class DefaultStorage extends KeyValueStorage {
 	constructor() {
-		super(getDefaultStorageWithFallback());
+		super(getLocalStorageWithFallback());
 	}
 }

package/src/storage/utils.ts

@@ -7,7 +7,7 @@ import { InMemoryStorage } from './InMemoryStorage';
  * @internal
  * @returns Either a reference to window.localStorage or an in-memory storage as fallback
  */
-export const getDefaultStorageWithFallback = (): Storage =>
+export const getLocalStorageWithFallback = (): Storage =>
 	typeof window !== 'undefined' && window.localStorage
 		? window.localStorage
 		: new InMemoryStorage();

package/src/types/errors.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export enum AmplifyErrorCode {
+	NoEndpointId = 'NoEndpointId',
 	PlatformNotSupported = 'PlatformNotSupported',
 	Unknown = 'Unknown',
 }

package/src/utils/amplifyUrl/index.ts

@@ -0,0 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import './polyfill';
+
+const AmplifyUrl = URL;
+const AmplifyUrlSearchParams = URLSearchParams;
+
+export { AmplifyUrl, AmplifyUrlSearchParams };

package/src/{clients/middleware/signing/signer/signatureV4/polyfills/index.native.ts → utils/amplifyUrl/polyfill.native.ts}

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+
 import { loadUrlPolyfill } from '@aws-amplify/react-native';
 
 loadUrlPolyfill();

package/src/utils/amplifyUuid/index.ts

@@ -0,0 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import './polyfill';
+import { v4 } from 'uuid';
+
+const amplifyUuid = v4;
+
+export { amplifyUuid };

package/src/utils/amplifyUuid/polyfill.native.ts

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { loadGetRandomValues } from '@aws-amplify/react-native';
+
+loadGetRandomValues();

package/src/utils/amplifyUuid/polyfill.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// noop - polyfills not required on platform

package/src/utils/deepFreeze.ts

@@ -0,0 +1,16 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const deepFreeze = (object: any) => {
+	const propNames = Reflect.ownKeys(object);
+
+	for (const name of propNames) {
+		const value = object[name];
+
+		if ((value && typeof value === 'object') || typeof value === 'function') {
+			deepFreeze(value);
+		}
+	}
+
+	return Object.freeze(object);
+};

package/src/{ClientDevice/android.ts → utils/getClientInfo/getClientInfo.android.ts}

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // @ts-ignore: missing type definition
 import { Platform, Dimensions } from 'react-native';
-import { ConsoleLogger as Logger } from '../Logger';
+import { ConsoleLogger as Logger } from '../../Logger';
 
 const logger = new Logger('DeviceInfo');
 
-export const clientInfo = () => {
+export const getClientInfo = () => {
 	const dim = Dimensions.get('screen');
 	logger.debug(Platform, dim);
 

package/src/{ClientDevice/ios.ts → utils/getClientInfo/getClientInfo.ios.ts}

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // @ts-ignore: missing type definition
 import { Platform, Dimensions } from 'react-native';
-import { ConsoleLogger as Logger } from '../Logger';
+import { ConsoleLogger as Logger } from '../../Logger';
 
 const logger = new Logger('DeviceInfo');
 
-export const clientInfo = () => {
+export const getClientInfo = () => {
 	const dim = Dimensions.get('screen');
 	logger.debug(Platform, dim);
 	const OS = 'ios';
@@ -21,7 +21,7 @@ export const clientInfo = () => {
 	};
 };
 
-function dimToMake(dim:{height:number, width:number;}) {
+function dimToMake(dim: { height: number; width: number }) {
 	let { height, width } = dim;
 	if (height < width) {
 		const tmp = height;

package/src/{ClientDevice/browser.ts → utils/getClientInfo/getClientInfo.ts}

@@ -1,10 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { ConsoleLogger as Logger } from '../Logger';
+import { ConsoleLogger as Logger } from '../../Logger';
 
 const logger = new Logger('ClientDevice_Browser');
 
-export function clientInfo() {
+export function getClientInfo() {
 	if (typeof window === 'undefined') {
 		return {};
 	}
@@ -25,7 +25,7 @@ function browserClientInfo() {
 	}
 
 	const { platform, product, vendor, userAgent, language } = nav;
-	const type = browserType(userAgent);
+	const type = getBrowserType(userAgent);
 	const timezone = browserTimezone();
 
 	return {
@@ -39,24 +39,12 @@ function browserClientInfo() {
 	};
 }
 
-export function dimension() {
-	if (typeof window === 'undefined') {
-		logger.warn('No window object available to get browser client info');
-		return { width: 320, height: 320 };
-	}
-
-	return {
-		width: window.innerWidth,
-		height: window.innerHeight,
-	};
-}
-
 function browserTimezone() {
 	const tzMatch = /\(([A-Za-z\s].*)\)/.exec(new Date().toString());
 	return tzMatch ? tzMatch[1] || '' : '';
 }
 
-export function browserType(userAgent: string) {
+function getBrowserType(userAgent: string) {
 	const operaMatch = /.+(Opera[\s[A-Z]*|OPR[\sA-Z]*)\/([0-9\.]+).*/i.exec(
 		userAgent
 	);

package/src/utils/getClientInfo/index.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { getClientInfo } from './getClientInfo';

package/src/utils/index.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export { generateRandomString } from './generateRandomString';
+export { getClientInfo } from './getClientInfo';
 export { isBrowser } from './isBrowser';
 export { isWebWorker } from './isWebWorker';
 export {
@@ -13,3 +14,4 @@ export {
 } from './retry';
 export { urlSafeDecode } from './urlSafeDecode';
 export { urlSafeEncode } from './urlSafeEncode';
+export { deepFreeze } from './deepFreeze';

package/src/utils/sessionListener/SessionListener.native.ts

@@ -0,0 +1,70 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { loadAppState } from '@aws-amplify/react-native';
+import {
+	SessionStateChangeListener,
+	SessionState,
+	SessionListenerInterface,
+} from './types';
+
+const stateChangeListeners = new Set<SessionStateChangeListener>();
+const isActive = (appState?: string) => appState === 'active';
+const isInactive = (appState?: string) =>
+	appState === 'inactive' || appState === 'background';
+
+export class SessionListener implements SessionListenerInterface {
+	private currentAppState?: string;
+
+	constructor() {
+		this.handleStateChange = this.handleStateChange.bind(this);
+
+		// Setup state listeners
+		loadAppState().addEventListener('change', this.handleStateChange);
+	}
+
+	public addStateChangeListener(
+		listener: SessionStateChangeListener,
+		notifyOnAdd: boolean = false
+	) {
+		stateChangeListeners.add(listener);
+
+		// Notify new handlers of the current state on add if the current state has been determined
+		if (notifyOnAdd && this.currentAppState !== undefined) {
+			listener(this.getSessionState());
+		}
+	}
+
+	public removeStateChangeListener(handler: SessionStateChangeListener) {
+		stateChangeListeners.delete(handler);
+	}
+
+	private handleStateChange(nextAppState: string) {
+		if (
+			(this.currentAppState === undefined ||
+				isInactive(this.currentAppState)) &&
+			isActive(nextAppState)
+		) {
+			this.notifyHandlers('started');
+		} else if (isActive(this.currentAppState) && isInactive(nextAppState)) {
+			this.notifyHandlers('ended');
+		}
+
+		this.currentAppState = nextAppState;
+	}
+
+	private notifyHandlers(state: SessionState) {
+		stateChangeListeners.forEach(listener => {
+			listener(state);
+		});
+	}
+
+	private getSessionState() {
+		if (isActive(this.currentAppState)) {
+			return 'started';
+		}
+
+		// Consider any other app state as ended
+		return 'ended';
+	}
+}

package/src/utils/sessionListener/SessionListener.ts

@@ -0,0 +1,74 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { isBrowser } from '../isBrowser';
+import { SessionStateChangeListener, SessionListenerInterface } from './types';
+
+const stateChangeListeners = new Set<SessionStateChangeListener>();
+
+export class SessionListener implements SessionListenerInterface {
+	private listenerActive: boolean;
+
+	constructor() {
+		this.listenerActive = false;
+		this.handleVisibilityChange = this.handleVisibilityChange.bind(this);
+
+		// Setup state listeners
+		if (isBrowser()) {
+			document.addEventListener(
+				'visibilitychange',
+				this.handleVisibilityChange,
+				false
+			);
+
+			this.listenerActive = true;
+		}
+	}
+
+	public addStateChangeListener(
+		listener: SessionStateChangeListener,
+		notifyOnAdd: boolean = false
+	) {
+		// No-op if document listener is not active
+		if (!this.listenerActive) {
+			return;
+		}
+
+		stateChangeListeners.add(listener);
+
+		// Notify new handlers of the current status on add
+		if (notifyOnAdd) {
+			listener(this.getSessionState());
+		}
+	}
+
+	public removeStateChangeListener(handler: SessionStateChangeListener) {
+		// No-op if document listener is not active
+		if (!this.listenerActive) {
+			return;
+		}
+
+		stateChangeListeners.delete(handler);
+	}
+
+	private handleVisibilityChange() {
+		this.notifyHandlers();
+	}
+
+	private notifyHandlers() {
+		const sessionState = this.getSessionState();
+
+		stateChangeListeners.forEach(listener => {
+			listener(sessionState);
+		});
+	}
+
+	private getSessionState() {
+		if (isBrowser() && document.visibilityState !== 'hidden') {
+			return 'started';
+		}
+
+		// If, for any reason, document is undefined the session will never start
+		return 'ended';
+	}
+}

package/src/utils/sessionListener/index.ts

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { SessionListener } from './SessionListener';
+
+export const sessionListener = new SessionListener();

package/src/utils/sessionListener/types.ts

@@ -0,0 +1,11 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export type SessionState = 'started' | 'ended';
+
+export type SessionStateChangeListener = (state: SessionState) => void;
+
+export interface SessionListenerInterface {
+	addStateChangeListener: (listener: SessionStateChangeListener) => void;
+	removeStateChangeListener: (listener: SessionStateChangeListener) => void;
+}

package/lib/Amplify.d.ts

@@ -1,29 +0,0 @@
-import { ConsoleLogger as LoggerClass } from './Logger';
-export declare class AmplifyClass {
-    private _components;
-    private _config;
-    private _modules;
-    Auth: null;
-    Analytics: null;
-    API: null;
-    Credentials: null;
-    Storage: null;
-    I18n: null;
-    Cache: null;
-    PubSub: null;
-    Interactions: null;
-    Pushnotification: null;
-    UI: null;
-    XR: null;
-    Predictions: null;
-    DataStore: null;
-    Geo: null;
-    Notifications: null;
-    Logger: typeof LoggerClass;
-    ServiceWorker: null;
-    get config(): any;
-    register(comp: any): void;
-    configure(config?: any): {};
-    addPluggable(pluggable: any): void;
-}
-export declare const Amplify: AmplifyClass;

package/lib/Amplify.js

@@ -1,118 +0,0 @@
-"use strict";
-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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Amplify = exports.AmplifyClass = void 0;
-// @ts-nocheck
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-var Logger_1 = require("./Logger");
-var logger = new Logger_1.ConsoleLogger('Amplify');
-var AmplifyClass = /** @class */ (function () {
-    function AmplifyClass() {
-        // Everything that is `register`ed is tracked here
-        this._components = [];
-        this._config = {};
-        // All modules (with `getModuleName()`) are stored here for dependency injection
-        this._modules = {};
-        // for backward compatibility to avoid breaking change
-        // if someone is using like Amplify.Auth
-        this.Auth = null;
-        this.Analytics = null;
-        this.API = null;
-        this.Credentials = null;
-        this.Storage = null;
-        this.I18n = null;
-        this.Cache = null;
-        this.PubSub = null;
-        this.Interactions = null;
-        this.Pushnotification = null;
-        this.UI = null;
-        this.XR = null;
-        this.Predictions = null;
-        this.DataStore = null;
-        this.Geo = null;
-        this.Notifications = null;
-        this.Logger = Logger_1.ConsoleLogger;
-        this.ServiceWorker = null;
-    }
-    Object.defineProperty(AmplifyClass.prototype, "config", {
-        // TODO: update "any" when types are determined
-        get: function () {
-            return Object.assign({}, this._config);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    AmplifyClass.prototype.register = function (comp) {
-        logger.debug('component registered in amplify', comp);
-        this._components.push(comp);
-        if (typeof comp.getModuleName === 'function') {
-            this._modules[comp.getModuleName()] = comp;
-            this[comp.getModuleName()] = comp;
-        }
-        else {
-            logger.debug('no getModuleName method for component', comp);
-        }
-        // Finally configure this new component(category) loaded
-        // With the new modularization changes in Amplify V3, all the Amplify
-        // component are not loaded/registered right away but when they are
-        // imported (and hence instantiated) in the client's app. This ensures
-        // that all new components imported get correctly configured with the
-        // configuration that Amplify.configure() was called with.
-        comp.configure(this._config);
-    };
-    AmplifyClass.prototype.configure = function (config) {
-        var _this = this;
-        if (!config)
-            return this._config;
-        this._config = Object.assign(this._config, config);
-        logger.debug('amplify config', this._config);
-        // Dependency Injection via property-setting.
-        // This avoids introducing a public method/interface/setter that's difficult to remove later.
-        // Plus, it reduces `if` statements within the `constructor` and `configure` of each module
-        Object.entries(this._modules).forEach(function (_a) {
-            var _b = __read(_a, 2), Name = _b[0], comp = _b[1];
-            // e.g. Auth.*
-            Object.keys(comp).forEach(function (property) {
-                // e.g. Auth["Credentials"] = this._modules["Credentials"] when set
-                if (_this._modules[property]) {
-                    comp[property] = _this._modules[property];
-                }
-            });
-        });
-        this._components.map(function (comp) {
-            comp.configure(_this._config);
-        });
-        return this._config;
-    };
-    AmplifyClass.prototype.addPluggable = function (pluggable) {
-        if (pluggable &&
-            pluggable['getCategory'] &&
-            typeof pluggable['getCategory'] === 'function') {
-            this._components.map(function (comp) {
-                if (comp['addPluggable'] &&
-                    typeof comp['addPluggable'] === 'function') {
-                    comp.addPluggable(pluggable);
-                }
-            });
-        }
-    };
-    return AmplifyClass;
-}());
-exports.AmplifyClass = AmplifyClass;
-exports.Amplify = new AmplifyClass();