@aws-amplify/core 6.0.1-console-preview.0bbe168.0 → 6.0.1-console-preview.deaebd5.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.1-console-preview.0bbe168.0+0bbe168",
+	"version": "6.0.1-console-preview.deaebd5.0+deaebd5",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -92,7 +92,7 @@
 			"name": "Core (I18n)",
 			"path": "./lib-esm/index.js",
 			"import": "{ I18n }",
-			"limit": "2.33 kB"
+			"limit": "4.82 kB"
 		},
 		{
 			"name": "Custom clients (fetch handler)",
@@ -185,5 +185,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "0bbe168c66929877174b331c71f7666bb16529d6"
+	"gitHead": "deaebd5a938733ff2b25aaec39c042843ef2289c"
 }

package/src/Hub/types/AuthTypes.ts

@@ -1,6 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+type AuthUser = {
+	username: string;
+	userId: string;
+};
+
 export type AuthHubEventData =
 	/** Dispatched when a user signs in with an oauth provider such as Google.*/
 	| { event: 'signInWithRedirect' }
@@ -11,4 +16,8 @@ export type AuthHubEventData =
 	/** Dispatched when there is an error in the refresh of tokens.*/
 	| { event: 'tokenRefresh_failure' }
 	/** Dispatched when there is a customState passed in the options of the `signInWithRedirect` API.*/
-	| { event: 'customOAuthState'; data: string };
+	| { event: 'customOAuthState'; data: string }
+	/** Dispatched when the user is signed-in.*/
+	| { event: 'signedIn'; data: AuthUser }
+	/** Dispatched after the user calls the `signOut` API successfully.*/
+	| { event: 'signedOut' };

package/src/I18n/I18n.ts

@@ -3,20 +3,18 @@
 
 import { ConsoleLogger as Logger } from '../Logger';
 import { Amplify } from '../singleton';
-import { I18nOptions } from './types';
+import { I18nConfig } from './types';
 
 const logger = new Logger('I18n');
 
 /**
  * Language translation utility.
- * 
- * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
  */
 export class I18n {
 	/**
 	 * @private
 	 */
-	_options: I18nOptions | null = null;
+	_options: I18nConfig | null = null;
 
 	/**
 	 * @private
@@ -32,21 +30,17 @@ export class I18n {
 	 * @constructor
 	 * Initialize with configurations
 	 * @param {Object} options
-	 * 
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	constructor() {}
 
 	/**
 	 * Sets the default language from the configuration when required.
-	 * 
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	setDefaultLanguage() {
-		/*if (!this._lang) {
+		if (!this._lang) {
 			const i18nConfig = Amplify.getConfig().I18n;
 			this._lang = i18nConfig?.language;
-		}*/
+		}
 
 		// Default to window language if not set in config
 		if (
@@ -65,8 +59,6 @@ export class I18n {
 	 * @method
 	 * Explicitly setting language
 	 * @param {String} lang
-	 * 
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	setLanguage(lang: string) {
 		this._lang = lang;
@@ -77,8 +69,6 @@ export class I18n {
 	 * Get value
 	 * @param {String} key
 	 * @param {String} defVal - Default value
-	 * 
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	get(key: string, defVal: string | undefined = undefined) {
 		if (!this._lang) {
@@ -107,8 +97,6 @@ export class I18n {
 	 * @param {String} key
 	 * @param {String} language - Specified langurage to be used
 	 * @param {String} defVal - Default value
-	 * 
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	getByLanguage(key: string, language: string, defVal: string | null = null) {
 		if (!language) {
@@ -128,8 +116,6 @@ export class I18n {
 	 * Add vocabularies for one language
 	 * @param {String} language - Language of the dictionary
 	 * @param {Object} vocabularies - Object that has key-value as dictionary entry
-	 * 
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	putVocabulariesForLanguage(
 		language: string,
@@ -147,10 +133,8 @@ export class I18n {
 	 * Add vocabularies for one language
 	 * @param {Object} vocabularies - Object that has language as key,
 	 *                                vocabularies of each language as value
-	 * 
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
-	putVocabularies(vocabularies: Record<string, any>) {
+	putVocabularies(vocabularies: Record<string, Record<string, string>>) {
 		Object.keys(vocabularies).map(key => {
 			this.putVocabulariesForLanguage(key, vocabularies[key]);
 		});

package/src/I18n/index.ts

@@ -4,18 +4,16 @@
 import { I18n as I18nClass } from './I18n';
 
 import { ConsoleLogger as Logger } from '../Logger';
-import { I18nOptions } from './types';
+import { I18nConfig } from './types';
 import { assert, I18nErrorCode } from './errorHelpers';
 
 const logger = new Logger('I18n');
 
-let _config: I18nOptions = { language: null };
+let _config: I18nConfig = { language: null };
 let _i18n: I18nClass | null = null;
 
 /**
  * Export I18n APIs
- *
- * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
  */
 export class I18n {
 	/**
@@ -45,8 +43,6 @@ export class I18n {
 	 * @static
 	 * @method
 	 * Create an instance of I18n for the library
-	 *
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static createInstance() {
 		logger.debug('create I18n instance');
@@ -60,8 +56,6 @@ export class I18n {
 	 * @static @method
 	 * Explicitly setting language
 	 * @param {String} lang
-	 *
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static setLanguage(lang: string) {
 		I18n.checkConfig();
@@ -75,8 +69,6 @@ export class I18n {
 	 * Get value
 	 * @param {String} key
 	 * @param {String} defVal - Default value
-	 *
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static get(key: string, defVal?: string) {
 		if (!I18n.checkConfig()) {
@@ -93,8 +85,6 @@ export class I18n {
 	 * Add vocabularies for one language
 	 * @param {String} langurage - Language of the dictionary
 	 * @param {Object} vocabularies - Object that has key-value as dictionary entry
-	 *
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static putVocabulariesForLanguage(
 		language: string,
@@ -112,10 +102,8 @@ export class I18n {
 	 * Add vocabularies for one language
 	 * @param {Object} vocabularies - Object that has language as key,
 	 *                                vocabularies of each language as value
-	 *
-	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
-	static putVocabularies(vocabularies: Record<string, string>) {
+	static putVocabularies(vocabularies: Record<string, Record<string, string>>) {
 		I18n.checkConfig();
 		assert(!!_i18n, I18nErrorCode.NotConfigured);
 

package/src/I18n/types.ts

@@ -1,9 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-/**
- * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
- */
-export class I18nOptions {
+export class I18nConfig {
 	language = null;
 }

package/src/Platform/version.ts

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

package/src/libraryUtils.ts

@@ -34,7 +34,7 @@ export {
 	assertOAuthConfig,
 } from './singleton/Auth/utils';
 export { isTokenExpired } from './singleton/Auth';
-export { GraphQLAuthModeKeys } from './singleton/API/types';
+export { GraphQLAuthMode, GraphQLAuthModeKeys } from './singleton/API/types';
 export { Signer } from './Signer';
 
 // Logging utilities

package/src/singleton/Auth/utils/index.ts

@@ -78,15 +78,23 @@ function assertUserPoolAndIdentityPoolConfig(
 }
 
 export function decodeJWT(token: string): JWT {
-	const tokenSplitted = token.split('.');
-	if (tokenSplitted.length !== 3) {
+	const tokenParts = token.split('.');
+
+	if (tokenParts.length !== 3) {
 		throw new Error('Invalid token');
 	}
+
 	try {
-		const payloadStringb64 = tokenSplitted[1];
-		const payloadArrayBuffer = base64ToBytes(payloadStringb64);
-		const decodeString = new TextDecoder().decode(payloadArrayBuffer);
-		const payload = JSON.parse(decodeString);
+		const base64WithUrlSafe = tokenParts[1];
+		const base64 = base64WithUrlSafe.replace(/-/g, '+').replace(/_/g, '/');
+		const jsonStr = decodeURIComponent(
+			base64Decoder
+				.convert(base64)
+				.split('')
+				.map(char => `%${`00${char.charCodeAt(0).toString(16)}`.slice(-2)}`)
+				.join('')
+		);
+		const payload = JSON.parse(jsonStr);
 
 		return {
 			toString: () => token,
@@ -96,8 +104,3 @@ export function decodeJWT(token: string): JWT {
 		throw new Error('Invalid token payload');
 	}
 }
-
-function base64ToBytes(base64: string): Uint8Array {
-	const binString = base64Decoder.convert(base64);
-	return Uint8Array.from(binString, m => m.codePointAt(0) || 0);
-}

package/src/singleton/types.ts

@@ -18,6 +18,7 @@ import {
 	StorageAccessLevel,
 	StorageConfig,
 } from './Storage/types';
+import { I18nConfig } from '../I18n/types';
 
 export type LegacyConfig = {
 	/**
@@ -32,7 +33,7 @@ export type ResourcesConfig = {
 	Auth?: AuthConfig;
 	// Cache?: CacheConfig;
 	// DataStore?: {};
-	// I18n?: I18nOptions;
+	I18n?: I18nConfig;
 	// Interactions?: {};
 	// Notifications?: {};
 	// Predictions?: {};