@aws-amplify/core 6.0.1-console-preview.e8aa063.0 → 6.0.1-console-preview.096eee3.0

package/src/singleton/Auth/index.ts

@@ -1,7 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Observable, Observer } from 'rxjs';
-
 import {
 	AWSCredentialsAndIdentityId,
 	AuthConfig,
@@ -25,13 +23,10 @@ export function isTokenExpired({
 }
 
 export class AuthClass {
-	private authSessionObservers: Set<Observer<AuthSession>>;
 	private authConfig?: AuthConfig;
 	private authOptions?: LibraryAuthOptions;
 
-	constructor() {
-		this.authSessionObservers = new Set();
-	}
+	constructor() {}
 
 	/**
 	 * Configure Auth category
@@ -56,6 +51,7 @@ export class AuthClass {
 	): Promise<AuthSession> {
 		let tokens: AuthTokens | undefined;
 		let credentialsAndIdentityId: AWSCredentialsAndIdentityId | undefined;
+		let userSub: string | undefined;
 
 		asserts(!!this.authConfig, {
 			name: AUTH_CONFING_EXCEPTION,
@@ -69,6 +65,8 @@ export class AuthClass {
 			(await this.authOptions?.tokenProvider?.getTokens(options)) ?? undefined;
 
 		if (tokens) {
+			userSub = tokens.accessToken?.payload?.sub;
+
 			// getCredentialsAndIdentityId will throw if cannot get credentials (network or service error)
 			credentialsAndIdentityId =
 				await this.authOptions?.credentialsProvider?.getCredentialsAndIdentityId(
@@ -95,21 +93,13 @@ export class AuthClass {
 			tokens,
 			credentials: credentialsAndIdentityId?.credentials,
 			identityId: credentialsAndIdentityId?.identityId,
+			userSub,
 		};
 	}
 
-	/**
-	 * Obtain an Observable that notifies on session changes
-	 *
-	 * @returns Observable<AmplifyUserSession>
-	 */
-	listenSessionChanges(): Observable<AuthSession> {
-		return new Observable(observer => {
-			this.authSessionObservers.add(observer);
-
-			return () => {
-				this.authSessionObservers.delete(observer);
-			};
-		});
+	async clearCredentials(): Promise<void> {
+		if (this.authOptions?.credentialsProvider) {
+			return await this.authOptions.credentialsProvider.clearCredentials();
+		}
 	}
 }

package/src/singleton/Auth/types.ts

@@ -11,6 +11,7 @@ interface JwtPayloadStandardFields {
 	iat?: number; // issued at: https://tools.ietf.org/html/rfc7519#section-4.1.6
 	scope?: string; // scopes: https://tools.ietf.org/html/rfc6749#section-3.3
 	jti?: string; // JWT ID: https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.7
+	sub?: string; // JWT sub https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.2
 }
 
 /** JSON type */
@@ -32,6 +33,7 @@ export type AuthSession = {
 	tokens?: AuthTokens;
 	credentials?: AWSCredentials;
 	identityId?: string;
+	userSub?: string;
 };
 
 export type LibraryAuthOptions = {

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

@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Buffer } from 'buffer';
 import { asserts } from '../../../Util/errors/AssertError';
 import {
 	AuthConfig,
@@ -77,13 +76,12 @@ export function decodeJWT(token: string): JWT {
 	if (tokenSplitted.length !== 3) {
 		throw new Error('Invalid token');
 	}
-
-	const payloadString = tokenSplitted[1];
-	const payload = JSON.parse(
-		Buffer.from(payloadString, 'base64').toString('utf8')
-	);
-
 	try {
+		const payloadStringb64 = tokenSplitted[1];
+		const payloadArrayBuffer = base64ToBytes(payloadStringb64);
+		const decodeString = new TextDecoder().decode(payloadArrayBuffer);
+		const payload = JSON.parse(decodeString);
+
 		return {
 			toString: () => token,
 			payload,
@@ -92,3 +90,8 @@ export function decodeJWT(token: string): JWT {
 		throw new Error('Invalid token payload');
 	}
 }
+
+function base64ToBytes(base64: string): Uint8Array {
+	const binString = atob(base64);
+	return Uint8Array.from(binString, m => m.codePointAt(0) || 0);
+}

package/src/singleton/apis/clearCredentials.ts

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { Amplify } from '../Amplify';
+
+export function clearCredentials(): Promise<void> {
+	return Amplify.Auth.clearCredentials();
+}

package/src/singleton/index.ts

@@ -3,3 +3,4 @@
 
 export { AmplifyClass, Amplify } from './Amplify';
 export { fetchAuthSession } from './apis/fetchAuthSession';
+export { clearCredentials } from './apis/clearCredentials';

package/polyfills/URL/index.js

@@ -1 +0,0 @@
-(()=>{var e={128:e=>{"use strict";e.exports=require("react-native-url-polyfill/auto")}},r={};var o,t={};"test"!==(null===(o=null===process||void 0===process?void 0:process.env)||void 0===o?void 0:o.NODE_ENV)&&function o(t){var s=r[t];if(void 0!==s)return s.exports;var v=r[t]={exports:{}};return e[t](v,v.exports,o),v.exports}(128);var s=exports;for(var v in t)s[v]=t[v];t.__esModule&&Object.defineProperty(s,"__esModule",{value:!0})})();