@aws-amplify/core 6.0.1-console-preview.4b7d177.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.4b7d177.0+4b7d177",
+	"version": "6.0.1-console-preview.deaebd5.0+deaebd5",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -185,5 +185,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "4b7d177e4da0aad2f1e1dd76c8c788f77f3114a2"
+	"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

@@ -134,7 +134,7 @@ export class I18n {
 	 * @param {Object} vocabularies - Object that has language as key,
 	 *                                vocabularies of each language as value
 	 */
-	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

@@ -103,7 +103,7 @@ export class I18n {
 	 * @param {Object} vocabularies - Object that has language as key,
 	 *                                vocabularies of each language as value
 	 */
-	static putVocabularies(vocabularies: Record<string, string>) {
+	static putVocabularies(vocabularies: Record<string, Record<string, string>>) {
 		I18n.checkConfig();
 		assert(!!_i18n, I18nErrorCode.NotConfigured);
 

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.1-console-preview.4b7d177.0+4b7d177';
+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);
-}