@aws-amplify/core 6.0.1-console-preview.8d88eef.0 → 6.0.1-console-preview.be08038.0

package/lib-esm/utils/deepFreeze.js

@@ -18,7 +18,7 @@ export var deepFreeze = function (object) {
         for (var propNames_1 = __values(propNames), propNames_1_1 = propNames_1.next(); !propNames_1_1.done; propNames_1_1 = propNames_1.next()) {
             var name_1 = propNames_1_1.value;
             var value = object[name_1];
-            if ((value && typeof value === "object") || typeof value === "function") {
+            if ((value && typeof value === 'object') || typeof value === 'function') {
                 deepFreeze(value);
             }
         }

package/lib-esm/utils/sessionListener/SessionListener.d.ts

@@ -0,0 +1,10 @@
+import { SessionStateChangeListener, SessionListenerInterface } from './types';
+export declare class SessionListener implements SessionListenerInterface {
+    private listenerActive;
+    constructor();
+    addStateChangeListener(listener: SessionStateChangeListener, notifyOnAdd?: boolean): void;
+    removeStateChangeListener(handler: SessionStateChangeListener): void;
+    private handleVisibilityChange;
+    private notifyHandlers;
+    private getSessionState;
+}

package/lib-esm/utils/sessionListener/SessionListener.js

@@ -0,0 +1,52 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { isBrowser } from '../isBrowser';
+var stateChangeListeners = new Set();
+var SessionListener = /** @class */ (function () {
+    function SessionListener() {
+        this.listenerActive = false;
+        this.handleVisibilityChange = this.handleVisibilityChange.bind(this);
+        // Setup state listeners
+        if (isBrowser()) {
+            document.addEventListener('visibilitychange', this.handleVisibilityChange, false);
+            this.listenerActive = true;
+        }
+    }
+    SessionListener.prototype.addStateChangeListener = function (listener, notifyOnAdd) {
+        if (notifyOnAdd === void 0) { notifyOnAdd = 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());
+        }
+    };
+    SessionListener.prototype.removeStateChangeListener = function (handler) {
+        // No-op if document listener is not active
+        if (!this.listenerActive) {
+            return;
+        }
+        stateChangeListeners.delete(handler);
+    };
+    SessionListener.prototype.handleVisibilityChange = function () {
+        this.notifyHandlers();
+    };
+    SessionListener.prototype.notifyHandlers = function () {
+        var sessionState = this.getSessionState();
+        stateChangeListeners.forEach(function (listener) {
+            listener(sessionState);
+        });
+    };
+    SessionListener.prototype.getSessionState = function () {
+        if (isBrowser() && document.visibilityState !== 'hidden') {
+            return 'started';
+        }
+        // If, for any reason, document is undefined the session will never start
+        return 'ended';
+    };
+    return SessionListener;
+}());
+export { SessionListener };

package/lib-esm/utils/sessionListener/SessionListener.native.d.ts

@@ -0,0 +1,10 @@
+import { SessionStateChangeListener, SessionListenerInterface } from './types';
+export declare class SessionListener implements SessionListenerInterface {
+    private currentAppState?;
+    constructor();
+    addStateChangeListener(listener: SessionStateChangeListener, notifyOnAdd?: boolean): void;
+    removeStateChangeListener(handler: SessionStateChangeListener): void;
+    private handleStateChange;
+    private notifyHandlers;
+    private getSessionState;
+}

package/lib-esm/utils/sessionListener/SessionListener.native.js

@@ -0,0 +1,51 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { loadAppState } from '@aws-amplify/react-native';
+var stateChangeListeners = new Set();
+var isActive = function (appState) { return appState === 'active'; };
+var isInactive = function (appState) {
+    return appState === 'inactive' || appState === 'background';
+};
+var SessionListener = /** @class */ (function () {
+    function SessionListener() {
+        this.handleStateChange = this.handleStateChange.bind(this);
+        // Setup state listeners
+        loadAppState().addEventListener('change', this.handleStateChange);
+    }
+    SessionListener.prototype.addStateChangeListener = function (listener, notifyOnAdd) {
+        if (notifyOnAdd === void 0) { notifyOnAdd = 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());
+        }
+    };
+    SessionListener.prototype.removeStateChangeListener = function (handler) {
+        stateChangeListeners.delete(handler);
+    };
+    SessionListener.prototype.handleStateChange = function (nextAppState) {
+        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;
+    };
+    SessionListener.prototype.notifyHandlers = function (state) {
+        stateChangeListeners.forEach(function (listener) {
+            listener(state);
+        });
+    };
+    SessionListener.prototype.getSessionState = function () {
+        if (isActive(this.currentAppState)) {
+            return 'started';
+        }
+        // Consider any other app state as ended
+        return 'ended';
+    };
+    return SessionListener;
+}());
+export { SessionListener };

package/lib-esm/utils/sessionListener/index.d.ts

@@ -0,0 +1,2 @@
+import { SessionListener } from './SessionListener';
+export declare const sessionListener: SessionListener;

package/lib-esm/utils/sessionListener/index.js

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

package/lib-esm/utils/sessionListener/types.d.ts

@@ -0,0 +1,6 @@
+export type SessionState = 'started' | 'ended';
+export type SessionStateChangeListener = (state: SessionState) => void;
+export interface SessionListenerInterface {
+    addStateChangeListener: (listener: SessionStateChangeListener) => void;
+    removeStateChangeListener: (listener: SessionStateChangeListener) => void;
+}

package/lib-esm/utils/sessionListener/types.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.1-console-preview.8d88eef.0+8d88eef",
+	"version": "6.0.1-console-preview.be08038.0+be08038",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -55,7 +55,7 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-crypto/sha256-js": "5.0.0",
+		"@aws-crypto/sha256-js": "5.2.0",
 		"@aws-sdk/types": "3.398.0",
 		"@smithy/util-hex-encoding": "2.0.0",
 		"js-cookie": "^3.0.5",
@@ -64,7 +64,7 @@
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/react-native": "1.0.1-console-preview.8d88eef.0+8d88eef",
+		"@aws-amplify/react-native": "1.0.1-console-preview.be08038.0+be08038",
 		"@types/js-cookie": "3.0.2",
 		"@types/uuid": "^9.0.0",
 		"find": "^0.2.7",
@@ -169,5 +169,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "8d88eef4137cef4fbe03d7d3683b5bec59feb7b8"
+	"gitHead": "be08038c5b37a510243f077c6d3209e5383f8866"
 }

package/src/Cache/StorageCacheCommon.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { Amplify } from '../singleton';
 import { ConsoleLogger as Logger } from '../Logger';
 import { KeyValueStorageInterface } from '../types';
 import { currentSizeKey, defaultConfig } from './constants';
@@ -31,11 +30,8 @@ export abstract class StorageCacheCommon {
 		config?: CacheConfig;
 		keyValueStorage: KeyValueStorageInterface;
 	}) {
-		const globalCacheConfig = Amplify.getConfig().Cache ?? {};
-
 		this.config = {
 			...defaultConfig,
-			...globalCacheConfig,
 			...config,
 		};
 		this.keyValueStorage = keyValueStorage;

package/src/I18n/I18n.ts

@@ -37,12 +37,7 @@ export class I18n {
 	 * Sets the default language from the configuration when required.
 	 */
 	setDefaultLanguage() {
-		if (!this._lang) {
-			const i18nConfig = Amplify.getConfig().I18n;
-			this._lang = i18nConfig?.language;
-		}
-
-		// Default to window language if not set in config
+		// Default to window language if not set in instance
 		if (
 			!this._lang &&
 			typeof window !== 'undefined' &&

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.1-console-preview.8d88eef.0+8d88eef';
+export const version = '6.0.1-console-preview.be08038.0+be08038';

package/src/Reachability/Reachability.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { CompletionObserver, Observable } from 'rxjs';
+import { CompletionObserver, Observable, from } from 'rxjs';
 import { isWebWorker } from '../libraryUtils';
 import { NetworkStatus } from './types';
 
@@ -9,7 +9,13 @@ export class Reachability {
 	private static _observers: Array<CompletionObserver<NetworkStatus>> = [];
 
 	networkMonitor(_?: unknown): Observable<NetworkStatus> {
-		const globalObj = isWebWorker() ? self : window;
+		const globalObj = isWebWorker()
+			? self
+			: typeof window !== 'undefined' && window;
+
+		if (!globalObj) {
+			return from([{ online: true }]);
+		}
 
 		return new Observable(observer => {
 			observer.next({ online: globalObj.navigator.onLine });

package/src/index.ts

@@ -24,7 +24,6 @@ export {
 	AuthUserPoolConfig,
 	AuthUserPoolAndIdentityPoolConfig,
 	APIConfig,
-	CacheConfig,
 	StorageAccessLevel,
 	StorageConfig,
 	GetCredentialsOptions,
@@ -62,6 +61,7 @@ export { KeyValueStorageInterface } from './types';
 
 // Cache exports
 export { Cache } from './Cache';
+export { CacheConfig } from './Cache/types';
 
 // Internationalization utilities
 export { I18n } from './I18n';

package/src/libraryUtils.ts

@@ -101,3 +101,7 @@ export { getCrypto } from './utils/globalHelpers';
 
 // Hub
 export { HubInternal } from './Hub';
+
+// Session listener
+export { sessionListener } from './utils/sessionListener';
+export { SessionState } from './utils/sessionListener/types';

package/src/parseAWSExports.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ConsoleLogger as Logger } from './Logger';
-import { OAuthConfig, AuthConfigUserAttributes } from './singleton/Auth/types';
+import { OAuthConfig, AuthConfigUserAttributes, OAuthProvider } from './singleton/Auth/types';
 import { ResourcesConfig } from './singleton/types';
 
 const logger = new Logger('parseAWSExports');
@@ -32,6 +32,8 @@ export const parseAWSExports = (
 		aws_appsync_authenticationType,
 		aws_appsync_graphqlEndpoint,
 		aws_appsync_region,
+		aws_bots,
+		aws_bots_config,
 		aws_cognito_identity_pool_id,
 		aws_cognito_sign_up_verification_method,
 		aws_cognito_mfa_configuration,
@@ -39,6 +41,7 @@ export const parseAWSExports = (
 		aws_cognito_password_protection_settings,
 		aws_cognito_verification_mechanisms,
 		aws_cognito_signup_attributes,
+		aws_cognito_social_providers,
 		aws_cognito_username_attributes,
 		aws_mandatory_sign_in,
 		aws_mobile_analytics_app_id,
@@ -89,6 +92,13 @@ export const parseAWSExports = (
 		}
 	}
 
+	// Interactions
+	if (Array.isArray(aws_bots_config)) {
+		amplifyConfig.Interactions = {
+			LexV1: Object.fromEntries(aws_bots_config.map(bot => [bot.name, bot])),
+		};
+	}
+
 	// API
 	if (aws_appsync_graphqlEndpoint) {
 		const defaultAuthMode = authTypeMapping[aws_appsync_authenticationType];
@@ -169,16 +179,26 @@ export const parseAWSExports = (
 					username:
 						loginWithEmailEnabled || loginWithPhoneEnabled ? false : true,
 					email: loginWithEmailEnabled,
-					phone: loginWithPhoneEnabled,
-					...(oauth &&
-						Object.keys(oauth).length > 0 && {
-							oauth: getOAuthConfig(oauth),
-						}),
+					phone: loginWithPhoneEnabled
 				},
 			},
 		};
 	}
 
+	const hasOAuthConfig = oauth ? Object.keys(oauth).length > 0 : false;
+	const hasSocialProviderConfig = aws_cognito_social_providers ? aws_cognito_social_providers.length > 0 : false;
+	if (amplifyConfig.Auth && hasOAuthConfig) {
+		amplifyConfig.Auth.Cognito.loginWith = {
+			...amplifyConfig.Auth.Cognito.loginWith,
+			oauth: {
+				...(getOAuthConfig(oauth)),
+				...(hasSocialProviderConfig && {
+					providers: parseSocialProviders(aws_cognito_social_providers)
+				})
+			},
+		};
+	}
+
 	// Storage
 	if (aws_user_files_s3_bucket) {
 		amplifyConfig.Storage = {
@@ -243,5 +263,12 @@ const getOAuthConfig = ({
 	scopes: scope,
 	redirectSignIn: getRedirectUrl(redirectSignIn),
 	redirectSignOut: getRedirectUrl(redirectSignOut),
-	responseType,
+	responseType
 });
+
+const parseSocialProviders = (aws_cognito_social_providers: string[]) => {
+	return aws_cognito_social_providers.map((provider: string) => {
+		const updatedProvider = provider.toLowerCase();
+		return updatedProvider.charAt(0).toUpperCase() + updatedProvider.slice(1);
+	}) as OAuthProvider[];
+};

package/src/singleton/Auth/types.ts

@@ -166,10 +166,10 @@ export type OAuthConfig = {
 	redirectSignIn: Array<string>;
 	redirectSignOut: Array<string>;
 	responseType: 'code' | 'token';
-	providers?: Array<OAuthProviders | CustomProvider>;
+	providers?: Array<OAuthProvider | CustomProvider>;
 };
 
-type OAuthProviders = 'Google' | 'Facebook' | 'Amazon' | 'Apple';
+export type OAuthProvider = 'Google' | 'Facebook' | 'Amazon' | 'Apple';
 type CustomProvider = { custom: string };
 
 type CustomScope = string & {};

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/types.ts

@@ -12,15 +12,14 @@ import {
 	GetCredentialsOptions,
 	CognitoIdentityPoolConfig,
 } from './Auth/types';
-import { CacheConfig } from './Cache/types';
 import { GeoConfig } from './Geo/types';
 import {
 	LibraryStorageOptions,
 	StorageAccessLevel,
 	StorageConfig,
 } from './Storage/types';
-import { I18nConfig } from '../I18n/types';
 import { NotificationsConfig } from './Notifications/types';
+import { InteractionsConfig } from './Interactions/types';
 
 export type LegacyConfig = {
 	/**
@@ -33,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,8 +52,8 @@ export {
 	AuthUserPoolConfig,
 	AuthIdentityPoolConfig,
 	AuthUserPoolAndIdentityPoolConfig,
-	CacheConfig,
 	GetCredentialsOptions,
+	InteractionsConfig,
 	StorageAccessLevel,
 	StorageConfig,
 	AnalyticsConfig,

package/src/utils/deepFreeze.ts

@@ -7,7 +7,7 @@ export const deepFreeze = (object: any) => {
 	for (const name of propNames) {
 		const value = object[name];
 
-		if ((value && typeof value === "object") || typeof value === "function") {
+		if ((value && typeof value === 'object') || typeof value === 'function') {
 			deepFreeze(value);
 		}
 	}

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;
+}