@aws-amplify/core 6.0.1-console-preview.f7f118b.0 → 6.0.1-console-preview.8f82e46.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.1-console-preview.f7f118b.0+f7f118b",
+	"version": "6.0.1-console-preview.8f82e46.0+8f82e46",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -58,14 +58,14 @@
 		"@aws-crypto/sha256-js": "5.0.0",
 		"@aws-sdk/types": "3.398.0",
 		"@smithy/util-hex-encoding": "2.0.0",
-		"js-cookie": "^2.2.1",
+		"js-cookie": "^3.0.5",
 		"rxjs": "^7.8.1",
 		"tslib": "^2.5.0",
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/react-native": "1.0.1-console-preview.f7f118b.0+f7f118b",
-		"@types/js-cookie": "^2.2.7",
+		"@aws-amplify/react-native": "1.0.1-console-preview.8f82e46.0+8f82e46",
+		"@types/js-cookie": "3.0.2",
 		"@types/uuid": "^9.0.0",
 		"find": "^0.2.7",
 		"genversion": "^2.2.0",
@@ -169,5 +169,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "f7f118b047bb772ef12531eab78e059a6a1442f1"
+	"gitHead": "8f82e460c4cdb9e52e0ba7ed8aea90f627a27693"
 }

package/src/Platform/version.ts

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

package/src/ServiceWorker/ServiceWorker.ts

@@ -3,9 +3,11 @@
 
 import { ConsoleLogger as Logger } from '../Logger';
 import { isBrowser } from '../utils';
-import { Amplify } from '../Amplify';
 import { AmplifyError } from '../errors';
 import { assert, ServiceWorkerErrorCode } from './errorHelpers';
+import { record } from '../providers/pinpoint';
+import { Amplify, fetchAuthSession } from '../singleton';
+
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.
@@ -205,15 +207,25 @@ export class ServiceWorkerClass {
 	 * https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker/state
 	 **/
 	_setupListeners() {
-		this.serviceWorker.addEventListener('statechange', event => {
+		this.serviceWorker.addEventListener('statechange', async event => {
 			const currentState = this.serviceWorker.state;
 			this._logger.debug(`ServiceWorker statechange: ${currentState}`);
-			Amplify.Analytics;
-			if (isAmplifyWithAnalytics(Amplify)) {
-				(Amplify as AmplifyWithAnalytics).Analytics.record({
-					name: 'ServiceWorker',
-					attributes: {
-						state: currentState,
+
+			const { appId, region } = Amplify.getConfig().Analytics?.Pinpoint ?? {};
+			const { credentials } = await fetchAuthSession();
+
+			if (appId && region && credentials) {
+				// Pinpoint is configured, record an event
+				record({
+					appId,
+					region,
+					category: 'Core',
+					credentials,
+					event: {
+						name: 'ServiceWorker',
+						attributes: {
+							state: currentState,
+						},
 					},
 				});
 			}
@@ -223,12 +235,3 @@ export class ServiceWorkerClass {
 		});
 	}
 }
-
-type AmplifyWithAnalytics = {
-	Analytics: {
-		record: Function;
-	};
-};
-function isAmplifyWithAnalytics(amplify: any): amplify is AmplifyWithAnalytics {
-	return amplify.Analytics && typeof amplify.Analytics.record === 'function';
-}

package/src/ServiceWorker/index.ts

@@ -1,16 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 
 export { ServiceWorkerClass as ServiceWorker } from './ServiceWorker';

package/src/index.ts

@@ -65,3 +65,6 @@ export { Cache } from './Cache';
 
 // Internationalization utilities
 export { I18n } from './I18n';
+
+// Service worker
+export { ServiceWorker } from './ServiceWorker';

package/src/libraryUtils.ts

@@ -71,9 +71,6 @@ export {
 } from './Platform/types';
 export { setCustomUserAgent } from './Platform/customUserAgent';
 
-// Service worker
-export { ServiceWorker } from './ServiceWorker';
-
 // Other utilities & constants
 export { BackgroundProcessManager } from './BackgroundProcessManager';
 export { Mutex } from './Mutex';

package/src/providers/pinpoint/types/pinpoint.ts

@@ -6,6 +6,7 @@ import { UserProfile } from '../../../types';
 
 export type SupportedCategory =
 	| 'Analytics'
+	| 'Core'
 	| 'InAppMessaging'
 	| 'PushNotification';
 

package/src/singleton/Auth/types.ts

@@ -113,12 +113,12 @@ export type AuthIdentityPoolConfig = {
 	Cognito: CognitoIdentityPoolConfig & {
 		userPoolClientId?: never;
 		userPoolId?: never;
+		userPoolEndpoint?: never;
 		loginWith?: never;
 		signUpVerificationMethod?: never;
 		userAttributes?: never;
 		mfa?: never;
 		passwordFormat?: never;
-		endpoint?: never;
 	};
 };
 
@@ -137,6 +137,7 @@ export type AuthUserPoolConfig = {
 export type CognitoUserPoolConfig = {
 	userPoolClientId: string;
 	userPoolId: string;
+	userPoolEndpoint?: string;
 	signUpVerificationMethod?: 'code' | 'link';
 	loginWith?: {
 		oauth?: OAuthConfig;
@@ -157,7 +158,6 @@ export type CognitoUserPoolConfig = {
 		requireNumbers?: boolean;
 		requireSpecialCharacters?: boolean;
 	};
-	endpoint?: string;
 };
 
 export type OAuthConfig = {

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/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();

package/lib-esm/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-esm/Amplify.js

@@ -1,115 +0,0 @@
-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;
-};
-// @ts-nocheck
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { ConsoleLogger as LoggerClass } from './Logger';
-var logger = new LoggerClass('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 = LoggerClass;
-        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;
-}());
-export { AmplifyClass };
-export var Amplify = new AmplifyClass();

package/src/Amplify.ts

@@ -1,106 +0,0 @@
-// @ts-nocheck
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { ConsoleLogger as LoggerClass } from './Logger';
-
-const logger = new LoggerClass('Amplify');
-
-export class AmplifyClass {
-	// Everything that is `register`ed is tracked here
-	private _components:any[] = [];
-	private _config = {};
-
-	// All modules (with `getModuleName()`) are stored here for dependency injection
-	private _modules = {};
-
-	// for backward compatibility to avoid breaking change
-	// if someone is using like Amplify.Auth
-	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 = LoggerClass;
-	ServiceWorker = null;
-
-	// TODO: update "any" when types are determined
-	public get config(): any {
-		return Object.assign({}, this._config);
-	}
-
-	register(comp:any) {
-		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);
-	}
-
-	configure(config?) {
-		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(([Name, comp]:[any, any]) => {
-			// e.g. Auth.*
-			Object.keys(comp).forEach(property => {
-				// e.g. Auth["Credentials"] = this._modules["Credentials"] when set
-				if (this._modules[property]) {
-					comp[property] = this._modules[property];
-				}
-			});
-		});
-
-		this._components.map(comp => {
-			comp.configure(this._config);
-		});
-
-		return this._config;
-	}
-
-	addPluggable(pluggable) {
-		if (
-			pluggable &&
-			pluggable['getCategory'] &&
-			typeof pluggable['getCategory'] === 'function'
-		) {
-			this._components.map(comp => {
-				if (
-					comp['addPluggable'] &&
-					typeof comp['addPluggable'] === 'function'
-				) {
-					comp.addPluggable(pluggable);
-				}
-			});
-		}
-	}
-}
-
-export const Amplify = new AmplifyClass();