From e78c8e44ccaec6be7b0bdbd6db5d83574aa6d31c Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 7 Jun 2024 14:20:25 -0700
Subject: [PATCH 01/40] Resumable Sign In

---
 .../providers/cognito/utils/signInStore.ts    | 87 +++++++++++++++++--
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 0028ab71067..1963b98db6f 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -1,6 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { ConsoleLogger } from '@aws-amplify/core';
+
 import { CognitoAuthSignInDetails } from '../types';
 
 import { ChallengeName } from './clients/CognitoIdentityProvider/types';
@@ -27,6 +29,22 @@ type Store<State, Action> = (reducer: Reducer<State, Action>) => {
 
 type Reducer<State, Action> = (state: State, action: Action) => State;
 
+const logger = new ConsoleLogger('Auth signInStore');
+
+// Minutes until stored session invalidates
+const EXPIRATION_MINUTES = 5;
+const MS_TO_EXPIRY = 1000 * 60 * EXPIRATION_MINUTES;
+const SIGN_IN_STATE_KEYS = [
+	'username',
+	'challengeName',
+	'signInSession',
+	'expiry',
+].reduce((keys: Record<string, string>, key) => {
+	keys[key] = `CognitoSignInState.${key}`;
+
+	return keys;
+}, {});
+
 const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 	switch (action.type) {
 		case 'SET_SIGN_IN_SESSION':
@@ -49,22 +67,58 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 				username: action.value,
 			};
 		case 'SET_INITIAL_STATE':
-			return defaultState();
+			return getInitialState();
 		default:
 			return state;
 	}
 };
 
-function defaultState(): SignInState {
+const isExpired = (expiryDate: string): boolean => {
+	const expiryTimestamp = Number(expiryDate);
+	const currentTimestamp = Date.now();
+
+	return expiryTimestamp <= currentTimestamp;
+};
+
+const clearPersistedSignInState = () => {
+	for (const key in SIGN_IN_STATE_KEYS) {
+		sessionStorage.removeItem(key);
+	}
+};
+
+const getDefaultState = (): SignInState => ({
+	username: undefined,
+	challengeName: undefined,
+	signInSession: undefined,
+});
+
+// Hydrate signInStore from sessionStorage
+const getInitialState = (): SignInState => {
+	const expiry = sessionStorage.getItem(SIGN_IN_STATE_KEYS.expiry) as string;
+	if (isExpired(expiry)) {
+		logger.warn('Sign-in session expired');
+		clearPersistedSignInState();
+
+		return getDefaultState();
+	}
+
+	const username =
+		sessionStorage.getItem(SIGN_IN_STATE_KEYS.username) ?? ('' as string);
+	const challengeName = (sessionStorage.getItem(
+		SIGN_IN_STATE_KEYS.challengeName,
+	) ?? '') as ChallengeName;
+	const signInSession =
+		sessionStorage.getItem(SIGN_IN_STATE_KEYS.signInSession) ?? ('' as string);
+
 	return {
-		username: undefined,
-		challengeName: undefined,
-		signInSession: undefined,
+		username,
+		challengeName,
+		signInSession,
 	};
-}
+};
 
 const createStore: Store<SignInState, SignInAction> = reducer => {
-	let currentState = reducer(defaultState(), { type: 'SET_INITIAL_STATE' });
+	let currentState = reducer(getDefaultState(), { type: 'SET_INITIAL_STATE' });
 
 	return {
 		getState: () => currentState,
@@ -81,8 +135,27 @@ export function setActiveSignInState(state: SignInState): void {
 		type: 'SET_SIGN_IN_STATE',
 		value: state,
 	});
+
+	// Save the local state into sessionStorage
+	persistSignInState(state);
 }
 
+// Free saved sign in states up from both memory and sessionStorage
 export function cleanActiveSignInState(): void {
 	signInStore.dispatch({ type: 'SET_INITIAL_STATE' });
+	clearPersistedSignInState();
 }
+
+const persistSignInState = ({
+	challengeName = '' as ChallengeName,
+	signInSession = '',
+	username = '',
+}: SignInState) => {
+	sessionStorage.setItem(SIGN_IN_STATE_KEYS.username, username);
+	sessionStorage.setItem(SIGN_IN_STATE_KEYS.challengeName, challengeName);
+	sessionStorage.setItem(SIGN_IN_STATE_KEYS.signInSession, signInSession);
+	sessionStorage.setItem(
+		SIGN_IN_STATE_KEYS.expiry,
+		String(Date.now() + MS_TO_EXPIRY),
+	);
+};

From 49bb952fd55864b5937818ab42ad550673de9fd0 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 7 Jun 2024 16:28:47 -0700
Subject: [PATCH 02/40] Add clear after rehydration

---
 packages/auth/src/providers/cognito/utils/signInStore.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 1963b98db6f..802ffe6f94e 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -110,6 +110,9 @@ const getInitialState = (): SignInState => {
 	const signInSession =
 		sessionStorage.getItem(SIGN_IN_STATE_KEYS.signInSession) ?? ('' as string);
 
+	// Clear SignInStage from sessionStorage after re-hydration
+	clearPersistedSignInState();
+
 	return {
 		username,
 		challengeName,
@@ -140,7 +143,7 @@ export function setActiveSignInState(state: SignInState): void {
 	persistSignInState(state);
 }
 
-// Free saved sign in states up from both memory and sessionStorage
+// Clear saved sign in states from both memory and sessionStorage
 export function cleanActiveSignInState(): void {
 	signInStore.dispatch({ type: 'SET_INITIAL_STATE' });
 	clearPersistedSignInState();

From 611357a24b3a2da2e2001fef3b2c96a611c3f119 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Tue, 11 Jun 2024 13:37:32 -0700
Subject: [PATCH 03/40] Synchronous Session Storage implementation

---
 .../auth/src/providers/cognito/types/index.ts |  2 +
 .../src/providers/cognito/types/storage.ts    |  9 +++
 .../providers/cognito/utils/signInStore.ts    | 63 +++++++++----------
 .../providers/cognito/utils/storage/index.ts  |  4 ++
 .../utils/storage/syncSessionStorage.ts       | 59 +++++++++++++++++
 5 files changed, 105 insertions(+), 32 deletions(-)
 create mode 100644 packages/auth/src/providers/cognito/types/storage.ts
 create mode 100644 packages/auth/src/providers/cognito/utils/storage/index.ts
 create mode 100644 packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts

diff --git a/packages/auth/src/providers/cognito/types/index.ts b/packages/auth/src/providers/cognito/types/index.ts
index 0b72451e925..050cd028371 100644
--- a/packages/auth/src/providers/cognito/types/index.ts
+++ b/packages/auth/src/providers/cognito/types/index.ts
@@ -73,3 +73,5 @@ export {
 	SendUserAttributeVerificationCodeOutput,
 	FetchDevicesOutput,
 } from './outputs';
+
+export { SyncKeyValueStorageInterface } from './storage';
diff --git a/packages/auth/src/providers/cognito/types/storage.ts b/packages/auth/src/providers/cognito/types/storage.ts
new file mode 100644
index 00000000000..32dabf7fced
--- /dev/null
+++ b/packages/auth/src/providers/cognito/types/storage.ts
@@ -0,0 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export interface SyncKeyValueStorageInterface {
+	setItem(key: string, value: string): void;
+	getItem(key: string): string | null;
+	removeItem(key: string): void;
+	clear(): void;
+}
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 802ffe6f94e..a0e1554ff3f 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -5,6 +5,7 @@ import { ConsoleLogger } from '@aws-amplify/core';
 
 import { CognitoAuthSignInDetails } from '../types';
 
+import { SyncKeyValueStorage } from './storage';
 import { ChallengeName } from './clients/CognitoIdentityProvider/types';
 
 // TODO: replace all of this implementation with state machines
@@ -32,18 +33,14 @@ type Reducer<State, Action> = (state: State, action: Action) => State;
 const logger = new ConsoleLogger('Auth signInStore');
 
 // Minutes until stored session invalidates
-const EXPIRATION_MINUTES = 5;
+const EXPIRATION_MINUTES = 3;
 const MS_TO_EXPIRY = 1000 * 60 * EXPIRATION_MINUTES;
-const SIGN_IN_STATE_KEYS = [
-	'username',
-	'challengeName',
-	'signInSession',
-	'expiry',
-].reduce((keys: Record<string, string>, key) => {
-	keys[key] = `CognitoSignInState.${key}`;
-
-	return keys;
-}, {});
+const SIGN_IN_STATE_KEYS: Record<string, string> = {
+	username: 'CognitoSignInState.username',
+	challengeName: 'CognitoSignInState.challengeName',
+	signInSession: 'CognitoSignInState.signInSession',
+	expiry: 'CognitoSignInState.expiry',
+};
 
 const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 	switch (action.type) {
@@ -67,7 +64,7 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 				username: action.value,
 			};
 		case 'SET_INITIAL_STATE':
-			return getInitialState();
+			return setInitialState();
 		default:
 			return state;
 	}
@@ -80,9 +77,9 @@ const isExpired = (expiryDate: string): boolean => {
 	return expiryTimestamp <= currentTimestamp;
 };
 
-const clearPersistedSignInState = () => {
-	for (const key in SIGN_IN_STATE_KEYS) {
-		sessionStorage.removeItem(key);
+const clearPersistedSignInState = (keys: Record<string, string>) => {
+	for (const key in keys) {
+		syncedSessionStorage.removeItem(key);
 	}
 };
 
@@ -92,26 +89,25 @@ const getDefaultState = (): SignInState => ({
 	signInSession: undefined,
 });
 
-// Hydrate signInStore from sessionStorage
-const getInitialState = (): SignInState => {
-	const expiry = sessionStorage.getItem(SIGN_IN_STATE_KEYS.expiry) as string;
+// Hydrate signInStore from Synced Session Storage
+const setInitialState = (): SignInState => {
+	const expiry = syncedSessionStorage.getItem(
+		SIGN_IN_STATE_KEYS.expiry,
+	) as string;
 	if (isExpired(expiry)) {
 		logger.warn('Sign-in session expired');
-		clearPersistedSignInState();
+		clearPersistedSignInState(SIGN_IN_STATE_KEYS);
 
 		return getDefaultState();
 	}
 
 	const username =
-		sessionStorage.getItem(SIGN_IN_STATE_KEYS.username) ?? ('' as string);
-	const challengeName = (sessionStorage.getItem(
+		syncedSessionStorage.getItem(SIGN_IN_STATE_KEYS.username) ?? undefined;
+	const challengeName = (syncedSessionStorage.getItem(
 		SIGN_IN_STATE_KEYS.challengeName,
 	) ?? '') as ChallengeName;
 	const signInSession =
-		sessionStorage.getItem(SIGN_IN_STATE_KEYS.signInSession) ?? ('' as string);
-
-	// Clear SignInStage from sessionStorage after re-hydration
-	clearPersistedSignInState();
+		syncedSessionStorage.getItem(SIGN_IN_STATE_KEYS.signInSession) ?? undefined;
 
 	return {
 		username,
@@ -133,20 +129,23 @@ const createStore: Store<SignInState, SignInAction> = reducer => {
 
 export const signInStore = createStore(signInReducer);
 
+// Synchronous Session Storage
+export const syncedSessionStorage = new SyncKeyValueStorage();
+
 export function setActiveSignInState(state: SignInState): void {
 	signInStore.dispatch({
 		type: 'SET_SIGN_IN_STATE',
 		value: state,
 	});
 
-	// Save the local state into sessionStorage
+	// Save the local state into Synced Session Storage
 	persistSignInState(state);
 }
 
-// Clear saved sign in states from both memory and sessionStorage
+// Clear saved sign in states from both memory and Synced Session Storage
 export function cleanActiveSignInState(): void {
 	signInStore.dispatch({ type: 'SET_INITIAL_STATE' });
-	clearPersistedSignInState();
+	clearPersistedSignInState(SIGN_IN_STATE_KEYS);
 }
 
 const persistSignInState = ({
@@ -154,10 +153,10 @@ const persistSignInState = ({
 	signInSession = '',
 	username = '',
 }: SignInState) => {
-	sessionStorage.setItem(SIGN_IN_STATE_KEYS.username, username);
-	sessionStorage.setItem(SIGN_IN_STATE_KEYS.challengeName, challengeName);
-	sessionStorage.setItem(SIGN_IN_STATE_KEYS.signInSession, signInSession);
-	sessionStorage.setItem(
+	syncedSessionStorage.setItem(SIGN_IN_STATE_KEYS.username, username);
+	syncedSessionStorage.setItem(SIGN_IN_STATE_KEYS.challengeName, challengeName);
+	syncedSessionStorage.setItem(SIGN_IN_STATE_KEYS.signInSession, signInSession);
+	syncedSessionStorage.setItem(
 		SIGN_IN_STATE_KEYS.expiry,
 		String(Date.now() + MS_TO_EXPIRY),
 	);
diff --git a/packages/auth/src/providers/cognito/utils/storage/index.ts b/packages/auth/src/providers/cognito/utils/storage/index.ts
new file mode 100644
index 00000000000..87089db8ec4
--- /dev/null
+++ b/packages/auth/src/providers/cognito/utils/storage/index.ts
@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { SyncKeyValueStorage } from './syncSessionStorage';
diff --git a/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts b/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts
new file mode 100644
index 00000000000..ef322291951
--- /dev/null
+++ b/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts
@@ -0,0 +1,59 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { PlatformNotSupportedError } from '@aws-amplify/core/src/errors';
+
+import { SyncKeyValueStorageInterface } from '../../types';
+
+/**
+ * @internal
+ */
+export class SyncKeyValueStorage implements SyncKeyValueStorageInterface {
+	storage?: Storage;
+
+	constructor(storage?: Storage) {
+		this.storage = storage;
+	}
+
+	/**
+	 * This is used to set a specific item in storage
+	 * @param {string} key - the key for the item
+	 * @param {object} value - the value
+	 * @returns {string} value that was set
+	 */
+	setItem(key: string, value: string) {
+		if (!this.storage) throw new PlatformNotSupportedError();
+		this.storage.setItem(key, value);
+	}
+
+	/**
+	 * This is used to get a specific key from storage
+	 * @param {string} key - the key for the item
+	 * This is used to clear the storage
+	 * @returns {string} the data item
+	 */
+	getItem(key: string) {
+		if (!this.storage) throw new PlatformNotSupportedError();
+
+		return this.storage.getItem(key);
+	}
+
+	/**
+	 * This is used to remove an item from storage
+	 * @param {string} key - the key being set
+	 * @returns {string} value - value that was deleted
+	 */
+	removeItem(key: string) {
+		if (!this.storage) throw new PlatformNotSupportedError();
+		this.storage.removeItem(key);
+	}
+
+	/**
+	 * This is used to clear the storage
+	 * @returns {string} nothing
+	 */
+	clear() {
+		if (!this.storage) throw new PlatformNotSupportedError();
+		this.storage.clear();
+	}
+}

From 814ccf34f53ee1d863017eb64333d23aecda5892 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Tue, 11 Jun 2024 18:35:53 -0700
Subject: [PATCH 04/40] Fix error dependency path

---
 .../src/providers/cognito/utils/storage/syncSessionStorage.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts b/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts
index ef322291951..1db417e054d 100644
--- a/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts
+++ b/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PlatformNotSupportedError } from '@aws-amplify/core/src/errors';
+import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
 
 import { SyncKeyValueStorageInterface } from '../../types';
 

From a41377967eb5f5286cc7325caf7b8946650a8f30 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Tue, 11 Jun 2024 19:13:19 -0700
Subject: [PATCH 05/40] Modify init sequence

---
 packages/auth/src/providers/cognito/utils/signInStore.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index a0e1554ff3f..5c7d8655714 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -91,6 +91,7 @@ const getDefaultState = (): SignInState => ({
 
 // Hydrate signInStore from Synced Session Storage
 const setInitialState = (): SignInState => {
+
 	const expiry = syncedSessionStorage.getItem(
 		SIGN_IN_STATE_KEYS.expiry,
 	) as string;
@@ -127,11 +128,11 @@ const createStore: Store<SignInState, SignInAction> = reducer => {
 	};
 };
 
-export const signInStore = createStore(signInReducer);
-
 // Synchronous Session Storage
 export const syncedSessionStorage = new SyncKeyValueStorage();
 
+export const signInStore = createStore(signInReducer);
+
 export function setActiveSignInState(state: SignInState): void {
 	signInStore.dispatch({
 		type: 'SET_SIGN_IN_STATE',

From 4532bc85b96a61cfa42147096f72c07b7283e99d Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Tue, 11 Jun 2024 19:50:13 -0700
Subject: [PATCH 06/40] Bug fix

---
 packages/auth/src/providers/cognito/utils/signInStore.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 5c7d8655714..3785557fc00 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -91,7 +91,6 @@ const getDefaultState = (): SignInState => ({
 
 // Hydrate signInStore from Synced Session Storage
 const setInitialState = (): SignInState => {
-
 	const expiry = syncedSessionStorage.getItem(
 		SIGN_IN_STATE_KEYS.expiry,
 	) as string;
@@ -129,7 +128,9 @@ const createStore: Store<SignInState, SignInAction> = reducer => {
 };
 
 // Synchronous Session Storage
-export const syncedSessionStorage = new SyncKeyValueStorage();
+export const syncedSessionStorage = new SyncKeyValueStorage(
+	window.sessionStorage,
+);
 
 export const signInStore = createStore(signInReducer);
 

From 2dd0fd9b9dd368826a26d9f5f2ead3f9750d91c2 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Thu, 13 Jun 2024 11:13:34 -0700
Subject: [PATCH 07/40]  Move SyncSessionStorage to core

---
 .../auth/src/providers/cognito/types/index.ts |  2 -
 .../src/providers/cognito/types/storage.ts    |  9 ---
 .../providers/cognito/utils/signInStore.ts    | 72 +++++++++----------
 .../providers/cognito/utils/storage/index.ts  |  4 --
 packages/aws-amplify/src/utils/index.ts       |  1 +
 packages/core/src/index.ts                    |  1 +
 .../src/storage/SyncKeyValueStorage.ts}       |  7 +-
 .../core/src/storage/SyncSessionStorage.ts    | 14 ++++
 packages/core/src/storage/index.ts            |  2 +
 packages/core/src/types/storage.ts            |  7 ++
 10 files changed, 63 insertions(+), 56 deletions(-)
 delete mode 100644 packages/auth/src/providers/cognito/types/storage.ts
 delete mode 100644 packages/auth/src/providers/cognito/utils/storage/index.ts
 rename packages/{auth/src/providers/cognito/utils/storage/syncSessionStorage.ts => core/src/storage/SyncKeyValueStorage.ts} (85%)
 create mode 100644 packages/core/src/storage/SyncSessionStorage.ts

diff --git a/packages/auth/src/providers/cognito/types/index.ts b/packages/auth/src/providers/cognito/types/index.ts
index 050cd028371..0b72451e925 100644
--- a/packages/auth/src/providers/cognito/types/index.ts
+++ b/packages/auth/src/providers/cognito/types/index.ts
@@ -73,5 +73,3 @@ export {
 	SendUserAttributeVerificationCodeOutput,
 	FetchDevicesOutput,
 } from './outputs';
-
-export { SyncKeyValueStorageInterface } from './storage';
diff --git a/packages/auth/src/providers/cognito/types/storage.ts b/packages/auth/src/providers/cognito/types/storage.ts
deleted file mode 100644
index 32dabf7fced..00000000000
--- a/packages/auth/src/providers/cognito/types/storage.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-export interface SyncKeyValueStorageInterface {
-	setItem(key: string, value: string): void;
-	getItem(key: string): string | null;
-	removeItem(key: string): void;
-	clear(): void;
-}
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 3785557fc00..17d3b801341 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -1,11 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ConsoleLogger } from '@aws-amplify/core';
+import { ConsoleLogger, syncSessionStorage } from '@aws-amplify/core';
 
 import { CognitoAuthSignInDetails } from '../types';
 
-import { SyncKeyValueStorage } from './storage';
 import { ChallengeName } from './clients/CognitoIdentityProvider/types';
 
 // TODO: replace all of this implementation with state machines
@@ -35,7 +34,7 @@ const logger = new ConsoleLogger('Auth signInStore');
 // Minutes until stored session invalidates
 const EXPIRATION_MINUTES = 3;
 const MS_TO_EXPIRY = 1000 * 60 * EXPIRATION_MINUTES;
-const SIGN_IN_STATE_KEYS: Record<string, string> = {
+const signInStateKeys: Record<string, string> = {
 	username: 'CognitoSignInState.username',
 	challengeName: 'CognitoSignInState.challengeName',
 	signInSession: 'CognitoSignInState.signInSession',
@@ -79,10 +78,21 @@ const isExpired = (expiryDate: string): boolean => {
 
 const clearPersistedSignInState = (keys: Record<string, string>) => {
 	for (const key in keys) {
-		syncedSessionStorage.removeItem(key);
+		syncSessionStorage.removeItem(key);
 	}
 };
 
+// Clear saved sign in states from both memory and Synced Session Storage
+export function cleanActiveSignInState(): void {
+	signInStore.dispatch({ type: 'SET_INITIAL_STATE' });
+	clearSignInStateKeysFromSessionStorage();
+}
+
+// Clear stored values for sign in state keys in Synced Session Storage
+export function clearSignInStateKeysFromSessionStorage(): void {
+	clearPersistedSignInState(signInStateKeys);
+}
+
 const getDefaultState = (): SignInState => ({
 	username: undefined,
 	challengeName: undefined,
@@ -91,23 +101,22 @@ const getDefaultState = (): SignInState => ({
 
 // Hydrate signInStore from Synced Session Storage
 const setInitialState = (): SignInState => {
-	const expiry = syncedSessionStorage.getItem(
-		SIGN_IN_STATE_KEYS.expiry,
-	) as string;
+	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry) as string;
 	if (isExpired(expiry)) {
 		logger.warn('Sign-in session expired');
-		clearPersistedSignInState(SIGN_IN_STATE_KEYS);
+		clearPersistedSignInState(signInStateKeys);
 
 		return getDefaultState();
 	}
 
 	const username =
-		syncedSessionStorage.getItem(SIGN_IN_STATE_KEYS.username) ?? undefined;
-	const challengeName = (syncedSessionStorage.getItem(
-		SIGN_IN_STATE_KEYS.challengeName,
-	) ?? '') as ChallengeName;
+		syncSessionStorage.getItem(signInStateKeys.username) ?? undefined;
+
+	const challengeName = (syncSessionStorage.getItem(
+		signInStateKeys.challengeName,
+	) ?? undefined) as ChallengeName;
 	const signInSession =
-		syncedSessionStorage.getItem(SIGN_IN_STATE_KEYS.signInSession) ?? undefined;
+		syncSessionStorage.getItem(signInStateKeys.signInSession) ?? undefined;
 
 	return {
 		username,
@@ -127,11 +136,6 @@ const createStore: Store<SignInState, SignInAction> = reducer => {
 	};
 };
 
-// Synchronous Session Storage
-export const syncedSessionStorage = new SyncKeyValueStorage(
-	window.sessionStorage,
-);
-
 export const signInStore = createStore(signInReducer);
 
 export function setActiveSignInState(state: SignInState): void {
@@ -141,25 +145,19 @@ export function setActiveSignInState(state: SignInState): void {
 	});
 
 	// Save the local state into Synced Session Storage
-	persistSignInState(state);
-}
-
-// Clear saved sign in states from both memory and Synced Session Storage
-export function cleanActiveSignInState(): void {
-	signInStore.dispatch({ type: 'SET_INITIAL_STATE' });
-	clearPersistedSignInState(SIGN_IN_STATE_KEYS);
+	persistSignInState(syncSessionStorage, state);
 }
 
-const persistSignInState = ({
-	challengeName = '' as ChallengeName,
-	signInSession = '',
-	username = '',
-}: SignInState) => {
-	syncedSessionStorage.setItem(SIGN_IN_STATE_KEYS.username, username);
-	syncedSessionStorage.setItem(SIGN_IN_STATE_KEYS.challengeName, challengeName);
-	syncedSessionStorage.setItem(SIGN_IN_STATE_KEYS.signInSession, signInSession);
-	syncedSessionStorage.setItem(
-		SIGN_IN_STATE_KEYS.expiry,
-		String(Date.now() + MS_TO_EXPIRY),
-	);
+const persistSignInState = (
+	storage = syncSessionStorage,
+	{
+		challengeName = '' as ChallengeName,
+		signInSession = '',
+		username = '',
+	}: SignInState,
+) => {
+	storage.setItem(signInStateKeys.username, username);
+	storage.setItem(signInStateKeys.challengeName, challengeName);
+	storage.setItem(signInStateKeys.signInSession, signInSession);
+	storage.setItem(signInStateKeys.expiry, String(Date.now() + MS_TO_EXPIRY));
 };
diff --git a/packages/auth/src/providers/cognito/utils/storage/index.ts b/packages/auth/src/providers/cognito/utils/storage/index.ts
deleted file mode 100644
index 87089db8ec4..00000000000
--- a/packages/auth/src/providers/cognito/utils/storage/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-export { SyncKeyValueStorage } from './syncSessionStorage';
diff --git a/packages/aws-amplify/src/utils/index.ts b/packages/aws-amplify/src/utils/index.ts
index 35093e8e864..58f896d90a6 100644
--- a/packages/aws-amplify/src/utils/index.ts
+++ b/packages/aws-amplify/src/utils/index.ts
@@ -14,6 +14,7 @@ export {
 	CookieStorage,
 	defaultStorage,
 	sessionStorage,
+	syncSessionStorage,
 	sharedInMemoryStorage,
 	KeyValueStorageInterface,
 } from '@aws-amplify/core';
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index f17968928c6..2ead3026682 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -59,6 +59,7 @@ export {
 	CookieStorage,
 	defaultStorage,
 	sessionStorage,
+	syncSessionStorage,
 	sharedInMemoryStorage,
 } from './storage';
 export { KeyValueStorageInterface } from './types';
diff --git a/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts b/packages/core/src/storage/SyncKeyValueStorage.ts
similarity index 85%
rename from packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts
rename to packages/core/src/storage/SyncKeyValueStorage.ts
index 1db417e054d..11f992f495e 100644
--- a/packages/auth/src/providers/cognito/utils/storage/syncSessionStorage.ts
+++ b/packages/core/src/storage/SyncKeyValueStorage.ts
@@ -1,14 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
-
-import { SyncKeyValueStorageInterface } from '../../types';
+import { PlatformNotSupportedError } from '../errors';
+import { SyncSessionStorageInterface } from '../types';
 
 /**
  * @internal
  */
-export class SyncKeyValueStorage implements SyncKeyValueStorageInterface {
+export class SyncKeyValueStorage implements SyncSessionStorageInterface {
 	storage?: Storage;
 
 	constructor(storage?: Storage) {
diff --git a/packages/core/src/storage/SyncSessionStorage.ts b/packages/core/src/storage/SyncSessionStorage.ts
new file mode 100644
index 00000000000..83224bfc878
--- /dev/null
+++ b/packages/core/src/storage/SyncSessionStorage.ts
@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { SyncKeyValueStorage } from './SyncKeyValueStorage';
+import { getSessionStorageWithFallback } from './utils';
+
+/**
+ * @internal
+ */
+export class SyncSessionStorage extends SyncKeyValueStorage {
+	constructor() {
+		super(getSessionStorageWithFallback());
+	}
+}
diff --git a/packages/core/src/storage/index.ts b/packages/core/src/storage/index.ts
index 29fba0b3dea..72219167521 100644
--- a/packages/core/src/storage/index.ts
+++ b/packages/core/src/storage/index.ts
@@ -5,9 +5,11 @@ import { DefaultStorage } from './DefaultStorage';
 import { InMemoryStorage } from './InMemoryStorage';
 import { KeyValueStorage } from './KeyValueStorage';
 import { SessionStorage } from './SessionStorage';
+import { SyncSessionStorage } from './SyncSessionStorage';
 
 export { CookieStorage } from './CookieStorage';
 
 export const defaultStorage = new DefaultStorage();
 export const sessionStorage = new SessionStorage();
+export const syncSessionStorage = new SyncSessionStorage();
 export const sharedInMemoryStorage = new KeyValueStorage(new InMemoryStorage());
diff --git a/packages/core/src/types/storage.ts b/packages/core/src/types/storage.ts
index d664a95b446..2d6dc6deeda 100644
--- a/packages/core/src/types/storage.ts
+++ b/packages/core/src/types/storage.ts
@@ -21,3 +21,10 @@ export interface CookieStorageData {
 	secure?: boolean;
 	sameSite?: SameSite;
 }
+
+export interface SyncSessionStorageInterface {
+	setItem(key: string, value: string): void;
+	getItem(key: string): string | null;
+	removeItem(key: string): void;
+	clear(): void;
+}

From a54055ed008d60d453e7ddbda72116591d44d634 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 14 Jun 2024 14:21:39 -0700
Subject: [PATCH 08/40] Fix defaulting state

---
 .../providers/cognito/utils/signInStore.ts    | 22 ++++++++++---------
 packages/core/src/storage/utils.ts            | 20 +++++++++++++++--
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 17d3b801341..e7176bf3709 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -17,6 +17,7 @@ interface SignInState {
 
 type SignInAction =
 	| { type: 'SET_INITIAL_STATE' }
+	| { type: 'SET_EMPTY_STATE' }
 	| { type: 'SET_SIGN_IN_STATE'; value: SignInState }
 	| { type: 'SET_USERNAME'; value?: string }
 	| { type: 'SET_CHALLENGE_NAME'; value?: ChallengeName }
@@ -64,6 +65,8 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 			};
 		case 'SET_INITIAL_STATE':
 			return setInitialState();
+		case 'SET_EMPTY_STATE':
+			return getDefaultState();
 		default:
 			return state;
 	}
@@ -76,21 +79,16 @@ const isExpired = (expiryDate: string): boolean => {
 	return expiryTimestamp <= currentTimestamp;
 };
 
-const clearPersistedSignInState = (keys: Record<string, string>) => {
-	for (const key in keys) {
+const clearPersistedSignInState = () => {
+	for (const key in signInStateKeys) {
 		syncSessionStorage.removeItem(key);
 	}
 };
 
 // Clear saved sign in states from both memory and Synced Session Storage
 export function cleanActiveSignInState(): void {
-	signInStore.dispatch({ type: 'SET_INITIAL_STATE' });
-	clearSignInStateKeysFromSessionStorage();
-}
-
-// Clear stored values for sign in state keys in Synced Session Storage
-export function clearSignInStateKeysFromSessionStorage(): void {
-	clearPersistedSignInState(signInStateKeys);
+	signInStore.dispatch({ type: 'SET_EMPTY_STATE' });
+	cleanActiveSignInState();
 }
 
 const getDefaultState = (): SignInState => ({
@@ -101,10 +99,14 @@ const getDefaultState = (): SignInState => ({
 
 // Hydrate signInStore from Synced Session Storage
 const setInitialState = (): SignInState => {
+	if (!syncSessionStorage) {
+		return getDefaultState();
+	}
+
 	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry) as string;
 	if (isExpired(expiry)) {
 		logger.warn('Sign-in session expired');
-		clearPersistedSignInState(signInStateKeys);
+		clearPersistedSignInState();
 
 		return getDefaultState();
 	}
diff --git a/packages/core/src/storage/utils.ts b/packages/core/src/storage/utils.ts
index 527d91d7f4e..ce862c3d12c 100644
--- a/packages/core/src/storage/utils.ts
+++ b/packages/core/src/storage/utils.ts
@@ -3,6 +3,14 @@
 
 import { InMemoryStorage } from './InMemoryStorage';
 
+const cachedMemoryStorageInstances: Record<
+	'local' | 'session',
+	InMemoryStorage
+> = {
+	local: new InMemoryStorage(),
+	session: new InMemoryStorage(),
+};
+
 /**
  * @internal
  * @returns Either a reference to window.localStorage or an in-memory storage as fallback
@@ -10,7 +18,7 @@ import { InMemoryStorage } from './InMemoryStorage';
 export const getLocalStorageWithFallback = (): Storage =>
 	typeof window !== 'undefined' && window.localStorage
 		? window.localStorage
-		: new InMemoryStorage();
+		: getSessionMemoryStorage('local');
 
 /**
  * @internal
@@ -19,4 +27,12 @@ export const getLocalStorageWithFallback = (): Storage =>
 export const getSessionStorageWithFallback = (): Storage =>
 	typeof window !== 'undefined' && window.sessionStorage
 		? window.sessionStorage
-		: new InMemoryStorage();
+		: getSessionMemoryStorage('session');
+
+const getSessionMemoryStorage = (key: 'local' | 'session') => {
+	if (!cachedMemoryStorageInstances[key]) {
+		cachedMemoryStorageInstances[key] = new InMemoryStorage();
+	}
+
+	return cachedMemoryStorageInstances[key];
+};

From 3816f2f215864e655b6b1057a6dddebb273fc35c Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 14 Jun 2024 22:05:10 -0700
Subject: [PATCH 09/40] Fix calling wrong method

---
 .../providers/cognito/utils/signInStore.ts    | 26 +++++++++----------
 .../storage-mechanisms-node-runtime.test.ts   | 15 ++++++++++-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index e7176bf3709..f1341f2f758 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -17,11 +17,11 @@ interface SignInState {
 
 type SignInAction =
 	| { type: 'SET_INITIAL_STATE' }
-	| { type: 'SET_EMPTY_STATE' }
 	| { type: 'SET_SIGN_IN_STATE'; value: SignInState }
 	| { type: 'SET_USERNAME'; value?: string }
 	| { type: 'SET_CHALLENGE_NAME'; value?: ChallengeName }
-	| { type: 'SET_SIGN_IN_SESSION'; value?: string };
+	| { type: 'SET_SIGN_IN_SESSION'; value?: string }
+	| { type: 'RESET_STATE' };
 
 type Store<State, Action> = (reducer: Reducer<State, Action>) => {
 	getState(): ReturnType<Reducer<State, Action>>;
@@ -64,15 +64,18 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 				username: action.value,
 			};
 		case 'SET_INITIAL_STATE':
-			return setInitialState();
-		case 'SET_EMPTY_STATE':
+			return initializeState();
+		case 'RESET_STATE':
 			return getDefaultState();
 		default:
 			return state;
 	}
 };
 
-const isExpired = (expiryDate: string): boolean => {
+const isExpired = (expiryDate: string | null): boolean => {
+	if (!expiryDate) {
+		return true;
+	}
 	const expiryTimestamp = Number(expiryDate);
 	const currentTimestamp = Date.now();
 
@@ -87,8 +90,8 @@ const clearPersistedSignInState = () => {
 
 // Clear saved sign in states from both memory and Synced Session Storage
 export function cleanActiveSignInState(): void {
-	signInStore.dispatch({ type: 'SET_EMPTY_STATE' });
-	cleanActiveSignInState();
+	signInStore.dispatch({ type: 'RESET_STATE' });
+	clearPersistedSignInState();
 }
 
 const getDefaultState = (): SignInState => ({
@@ -98,12 +101,8 @@ const getDefaultState = (): SignInState => ({
 });
 
 // Hydrate signInStore from Synced Session Storage
-const setInitialState = (): SignInState => {
-	if (!syncSessionStorage) {
-		return getDefaultState();
-	}
-
-	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry) as string;
+const initializeState = (): SignInState => {
+	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry);
 	if (isExpired(expiry)) {
 		logger.warn('Sign-in session expired');
 		clearPersistedSignInState();
@@ -150,6 +149,7 @@ export function setActiveSignInState(state: SignInState): void {
 	persistSignInState(syncSessionStorage, state);
 }
 
+// Save local state into Session Storage
 const persistSignInState = (
 	storage = syncSessionStorage,
 	{
diff --git a/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts b/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
index 0566237962b..3436275c9f8 100644
--- a/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
+++ b/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
@@ -3,7 +3,11 @@
  */
 
 import { AmplifyError, AmplifyErrorCode } from '../../src/libraryUtils';
-import { defaultStorage, sessionStorage } from '../../src/storage';
+import {
+	defaultStorage,
+	sessionStorage,
+	syncSessionStorage,
+} from '../../src/storage';
 
 const key = 'k';
 const value = 'value';
@@ -26,4 +30,13 @@ describe('test mechanisms', () => {
 			expect(error.name).toBe(AmplifyErrorCode.PlatformNotSupported);
 		}
 	});
+
+	test('test syncSessionStorage operations in node environment', () => {
+		try {
+			syncSessionStorage.setItem(key, value);
+		} catch (error: any) {
+			expect(error).toBeInstanceOf(AmplifyError);
+			expect(error.name).toBe(AmplifyErrorCode.PlatformNotSupported);
+		}
+	});
 });

From 20cd81284a18628523268f83639c2b42afa4422a Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 14 Jun 2024 22:05:38 -0700
Subject: [PATCH 10/40] Add Unittest for SyncSessionstorage

---
 .../storage/SyncSessionStorage.test.ts        | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 packages/core/__tests__/storage/SyncSessionStorage.test.ts

diff --git a/packages/core/__tests__/storage/SyncSessionStorage.test.ts b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
new file mode 100644
index 00000000000..21c6276852d
--- /dev/null
+++ b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
@@ -0,0 +1,89 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { SyncSessionStorage } from '../../src/storage/SyncSessionStorage';
+
+jest.mock('@aws-amplify/core/internals/utils', () => ({
+	...jest.requireActual('@aws-amplify/core/internals/utils'),
+	isBrowser: jest.fn(() => false),
+}));
+
+describe('SyncSessionStorage', () => {
+	let sessionStorage: SyncSessionStorage;
+	const signInStateKeys: Record<string, string> = {
+		username: 'CognitoSignInState.username',
+		challengeName: 'CognitoSignInState.challengeName',
+		signInSession: 'CognitoSignInState.signInSession',
+		expiry: 'CognitoSignInState.expiry',
+	};
+
+	const user1: Record<string, string> = {
+		username: 'joonchoi',
+		challengeName: 'CUSTOM_CHALLENGE',
+		signInSession: '888577-ltfgo-42d8-891d-666l858766g7',
+		expiry: '1234567',
+	};
+
+	beforeEach(() => {
+		sessionStorage = new SyncSessionStorage();
+	});
+
+	afterEach(() => {
+		sessionStorage.clear();
+	});
+
+	test('should accept a value and retrieve the same value without any issue', () => {
+		sessionStorage.setItem(signInStateKeys.username, user1.username);
+		sessionStorage.setItem(signInStateKeys.challengeName, user1.challengeName);
+		sessionStorage.setItem(signInStateKeys.signInSession, user1.signInSession);
+		sessionStorage.setItem(signInStateKeys.expiry, user1.expiry);
+
+		expect(sessionStorage.getItem(signInStateKeys.username)).toEqual(
+			user1.username,
+		);
+		expect(sessionStorage.getItem(signInStateKeys.challengeName)).toEqual(
+			user1.challengeName,
+		);
+		expect(sessionStorage.getItem(signInStateKeys.signInSession)).toEqual(
+			user1.signInSession,
+		);
+		expect(sessionStorage.getItem(signInStateKeys.expiry)).toEqual(
+			user1.expiry,
+		);
+	});
+
+	test('will update key if setItem on the same key is called again', () => {
+		const newUserName = 'joonchoi+test';
+		sessionStorage.setItem(signInStateKeys.username, user1.username);
+		sessionStorage.setItem(signInStateKeys.username, newUserName);
+
+		expect(sessionStorage.getItem(signInStateKeys.username)).toEqual(
+			newUserName,
+		);
+	});
+
+	test('should set a value and retrieve it with the same key', () => {
+		const newUserName = 'joonchoi+tobedeleted';
+		sessionStorage.setItem(signInStateKeys.username, newUserName);
+		expect(sessionStorage.getItem(signInStateKeys.username)).toEqual(
+			newUserName,
+		);
+		sessionStorage.removeItem(signInStateKeys.username);
+		expect(sessionStorage.getItem(signInStateKeys.username)).toBeNull();
+	});
+
+	test('should clear out storage', () => {
+		sessionStorage.clear();
+		expect(sessionStorage.getItem(signInStateKeys.username)).toBeNull();
+		expect(sessionStorage.getItem(signInStateKeys.challengeName)).toBeNull();
+		expect(sessionStorage.getItem(signInStateKeys.signInSession)).toBeNull();
+		expect(sessionStorage.getItem(signInStateKeys.expiry)).toBeNull();
+	});
+
+	test('should not throw if trying to delete a non existing key', () => {
+		const badKey = 'nonExistingKey';
+
+		expect(() => {
+			sessionStorage.removeItem(badKey);
+		}).not.toThrow();
+	});
+});

From 5f99aadd782dcfcccae05f5f2c9841cd8b164443 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 14 Jun 2024 22:57:22 -0700
Subject: [PATCH 11/40] Adjust bundle size, fix exports

---
 .../auth/src/providers/cognito/utils/signInStore.ts    |  4 ++++
 packages/aws-amplify/__tests__/exports.test.ts         |  1 +
 packages/aws-amplify/package.json                      | 10 +++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index f1341f2f758..98d886107ee 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -102,6 +102,10 @@ const getDefaultState = (): SignInState => ({
 
 // Hydrate signInStore from Synced Session Storage
 const initializeState = (): SignInState => {
+	if (!syncSessionStorage) {
+		return getDefaultState();
+	}
+
 	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry);
 	if (isExpired(expiry)) {
 		logger.warn('Sign-in session expired');
diff --git a/packages/aws-amplify/__tests__/exports.test.ts b/packages/aws-amplify/__tests__/exports.test.ts
index c6425ad7c93..52b3b7c55aa 100644
--- a/packages/aws-amplify/__tests__/exports.test.ts
+++ b/packages/aws-amplify/__tests__/exports.test.ts
@@ -41,6 +41,7 @@ describe('aws-amplify Exports', () => {
 					'defaultStorage',
 					'parseAmplifyConfig',
 					'sessionStorage',
+					'syncSessionstorage',
 					'sharedInMemoryStorage',
 				].sort(),
 			);
diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
index a3c44a89861..bd894f6a816 100644
--- a/packages/aws-amplify/package.json
+++ b/packages/aws-amplify/package.json
@@ -383,7 +383,7 @@
 			"name": "[Auth] confirmSignIn (Cognito)",
 			"path": "./dist/esm/auth/index.mjs",
 			"import": "{ confirmSignIn }",
-			"limit": "28.27 kB"
+			"limit": "28.60 kB"
 		},
 		{
 			"name": "[Auth] updateMFAPreference (Cognito)",
@@ -437,7 +437,7 @@
 			"name": "[Auth] signInWithRedirect (Cognito)",
 			"path": "./dist/esm/auth/index.mjs",
 			"import": "{ signInWithRedirect }",
-			"limit": "21.10 kB"
+			"limit": "21.15 kB"
 		},
 		{
 			"name": "[Auth] fetchUserAttributes (Cognito)",
@@ -449,13 +449,13 @@
 			"name": "[Auth] Basic Auth Flow (Cognito)",
 			"path": "./dist/esm/auth/index.mjs",
 			"import": "{ signIn, signOut, fetchAuthSession, confirmSignIn }",
-			"limit": "30.06 kB"
+			"limit": "30.45 kB"
 		},
 		{
 			"name": "[Auth] OAuth Auth Flow (Cognito)",
 			"path": "./dist/esm/auth/index.mjs",
 			"import": "{ signInWithRedirect, signOut, fetchAuthSession }",
-			"limit": "21.47 kB"
+			"limit": "21.60 kB"
 		},
 		{
 			"name": "[Storage] copy (S3)",
@@ -497,7 +497,7 @@
 			"name": "[Storage] uploadData (S3)",
 			"path": "./dist/esm/storage/index.mjs",
 			"import": "{ uploadData }",
-			"limit": "19.64 kB"
+			"limit": "19.70 kB"
 		}
 	]
 }

From f040d106d7911269484eee19c1cad5a697f98dd6 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 14 Jun 2024 23:07:02 -0700
Subject: [PATCH 12/40] Adjust bundle size, fix typo

---
 packages/aws-amplify/__tests__/exports.test.ts | 2 +-
 packages/aws-amplify/package.json              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/aws-amplify/__tests__/exports.test.ts b/packages/aws-amplify/__tests__/exports.test.ts
index 52b3b7c55aa..a707b120694 100644
--- a/packages/aws-amplify/__tests__/exports.test.ts
+++ b/packages/aws-amplify/__tests__/exports.test.ts
@@ -41,7 +41,7 @@ describe('aws-amplify Exports', () => {
 					'defaultStorage',
 					'parseAmplifyConfig',
 					'sessionStorage',
-					'syncSessionstorage',
+					'syncSessionStorage',
 					'sharedInMemoryStorage',
 				].sort(),
 			);
diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
index bd894f6a816..894c67fbfb5 100644
--- a/packages/aws-amplify/package.json
+++ b/packages/aws-amplify/package.json
@@ -293,7 +293,7 @@
 			"name": "[Analytics] record (Pinpoint)",
 			"path": "./dist/esm/analytics/index.mjs",
 			"import": "{ record }",
-			"limit": "17.09 kB"
+			"limit": "17.15 kB"
 		},
 		{
 			"name": "[Analytics] record (Kinesis)",
@@ -311,13 +311,13 @@
 			"name": "[Analytics] record (Personalize)",
 			"path": "./dist/esm/analytics/personalize/index.mjs",
 			"import": "{ record }",
-			"limit": "49.50 kB"
+			"limit": "49.55 kB"
 		},
 		{
 			"name": "[Analytics] identifyUser (Pinpoint)",
 			"path": "./dist/esm/analytics/index.mjs",
 			"import": "{ identifyUser }",
-			"limit": "15.59 kB"
+			"limit": "15.65 kB"
 		},
 		{
 			"name": "[Analytics] enable",

From c4642cf5d3afa937193646d2f1ca6d55fcd4743a Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 14 Jun 2024 23:27:31 -0700
Subject: [PATCH 13/40] Loosen jest cov for src/utils

---
 packages/aws-amplify/jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/aws-amplify/jest.config.js b/packages/aws-amplify/jest.config.js
index 5254f524623..9047be1a892 100644
--- a/packages/aws-amplify/jest.config.js
+++ b/packages/aws-amplify/jest.config.js
@@ -3,7 +3,7 @@ module.exports = {
 	coverageThreshold: {
 		global: {
 			branches: 85,
-			functions: 65.5,
+			functions: 63.3,
 			lines: 90,
 			statements: 91,
 		},

From 82376950806d156537bb477aab9929b6f7ffe25c Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Thu, 20 Jun 2024 13:46:18 -0700
Subject: [PATCH 14/40] ResumableSignIn Unit Tests

---
 .../providers/cognito/signInResumable.test.ts | 299 ++++++++++++++++++
 .../storage/SyncSessionStorage.test.ts        |  34 ++
 2 files changed, 333 insertions(+)
 create mode 100644 packages/auth/__tests__/providers/cognito/signInResumable.test.ts

diff --git a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
new file mode 100644
index 00000000000..1f753aa0619
--- /dev/null
+++ b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
@@ -0,0 +1,299 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { Amplify, syncSessionStorage } from '@aws-amplify/core';
+
+import {
+	cleanActiveSignInState,
+	setActiveSignInState,
+	signInStore,
+} from '../../../src/providers/cognito/utils/signInStore';
+import { cognitoUserPoolsTokenProvider } from '../../../src/providers/cognito/tokenProvider';
+import {
+	ChallengeName,
+	RespondToAuthChallengeCommandOutput,
+} from '../../../src/providers/cognito/utils/clients/CognitoIdentityProvider/types';
+import * as signInHelpers from '../../../src/providers/cognito/utils/signInHelpers';
+import { signIn } from '../../../src/providers/cognito';
+
+import { setUpGetConfig } from './testUtils/setUpGetConfig';
+import { authAPITestParams } from './testUtils/authApiTestParams';
+
+jest.mock('../../../src/providers/cognito/apis/getCurrentUser');
+jest.mock('@aws-amplify/core', () => ({
+	...(jest.createMockFromModule('@aws-amplify/core') as object),
+	Amplify: { getConfig: jest.fn(() => ({})) },
+	syncSessionStorage: {
+		setItem: jest.fn((key, value) => {
+			window.sessionStorage.setItem(key, value);
+		}),
+		getItem: jest.fn((key: string) => {
+			return window.sessionStorage.getItem(key);
+		}),
+		removeItem: jest.fn((key: string) => {
+			window.sessionStorage.removeItem(key);
+		}),
+	},
+}));
+
+jest.mock('@aws-amplify/core/internals/utils', () => ({
+	...jest.requireActual('@aws-amplify/core/internals/utils'),
+	isBrowser: jest.fn(() => false),
+}));
+
+jest.mock(
+	'../../../src/providers/cognito/utils/clients/CognitoIdentityProvider',
+);
+
+const signInStateKeys: Record<string, string> = {
+	username: 'CognitoSignInState.username',
+	challengeName: 'CognitoSignInState.challengeName',
+	signInSession: 'CognitoSignInState.signInSession',
+	expiry: 'CognitoSignInState.expiry',
+};
+
+const user1: Record<string, string> = {
+	username: 'joonchoi',
+	challengeName: 'CUSTOM_CHALLENGE',
+	signInSession: '888577-ltfgo-42d8-891d-666l858766g7',
+	expiry: '1234567',
+};
+
+describe('signInStore UnitTest', () => {
+	const authConfig = {
+		Cognito: {
+			userPoolClientId: '888577-ltfgo-42d8-891d-666l858766g7',
+			userPoolId: 'us-west-7_ampjc',
+		},
+	};
+
+	const session = '1234234232';
+	const challengeName = 'SMS_MFA';
+	const { username } = authAPITestParams.user1;
+	const { password } = authAPITestParams.user1;
+
+	beforeEach(() => {
+		cognitoUserPoolsTokenProvider.setAuthConfig(authConfig);
+	});
+
+	beforeAll(() => {
+		setUpGetConfig(Amplify);
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	afterAll(() => {
+		jest.restoreAllMocks();
+	});
+
+	test('LocalSignInState is empty after initialization', async () => {
+		syncSessionStorage.setItem(signInStateKeys.username, 'pikapi');
+		syncSessionStorage.setItem(
+			signInStateKeys.expiry,
+			(new Date().getTime() + 9999999).toString(),
+		);
+		const localSignInState = signInStore.getState();
+
+		expect(localSignInState).toEqual({
+			challengeName: undefined,
+			signInSession: undefined,
+			username: undefined,
+		});
+		cleanActiveSignInState();
+	});
+
+	test('State is set after calling setActiveSignInState', async () => {
+		setActiveSignInState(user1);
+		const localSignInState = signInStore.getState();
+
+		expect(localSignInState).toEqual(user1);
+		cleanActiveSignInState();
+	});
+
+	test('State is updated after ', async () => {
+		const handleUserSRPAuthflowSpy = jest
+			.spyOn(signInHelpers, 'handleUserSRPAuthFlow')
+			.mockImplementationOnce(
+				async (): Promise<RespondToAuthChallengeCommandOutput> => ({
+					ChallengeName: challengeName,
+					Session: session,
+					$metadata: {},
+					ChallengeParameters: {
+						CODE_DELIVERY_DELIVERY_MEDIUM: 'SMS',
+						CODE_DELIVERY_DESTINATION: '*******9878',
+					},
+				}),
+			);
+
+		await signIn({
+			username,
+			password,
+		});
+		const newLocalSignInState = signInStore.getState();
+
+		expect(handleUserSRPAuthflowSpy).toHaveBeenCalledTimes(1);
+		expect(newLocalSignInState).toEqual({
+			challengeName,
+			signInSession: session,
+			username,
+			signInDetails: {
+				loginId: username,
+				authFlowType: 'USER_SRP_AUTH',
+			},
+		});
+		handleUserSRPAuthflowSpy.mockClear();
+	});
+
+	test('State saved in sessionStorage from the previous test is successfully retrieved', async () => {
+		const localSignInState = signInStore.getState();
+
+		expect(localSignInState).toEqual({
+			challengeName,
+			signInSession: session,
+			username,
+			signInDetails: {
+				loginId: username,
+				authFlowType: 'USER_SRP_AUTH',
+			},
+		});
+		cleanActiveSignInState();
+	});
+
+	test('Stored session is not expired thus State should be rehydrated', () => {
+		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
+		syncSessionStorage.setItem(
+			signInStateKeys.signInSession,
+			user1.signInSession,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.challengeName,
+			user1.challengeName,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.expiry,
+			(new Date().getTime() + 9999999).toString(),
+		);
+
+		signInStore.dispatch({
+			type: 'SET_INITIAL_STATE',
+		});
+
+		const localSignInState = signInStore.getState();
+
+		expect(localSignInState).toEqual({
+			username: user1.username,
+			challengeName: user1.challengeName,
+			signInSession: user1.signInSession,
+		});
+		cleanActiveSignInState();
+	});
+
+	test('Stored session is expired thus State should default to undefined', async () => {
+		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
+		syncSessionStorage.setItem(
+			signInStateKeys.signInSession,
+			user1.signInSession,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.challengeName,
+			user1.challengeName,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.expiry,
+			(new Date().getTime() - 500000).toString(),
+		);
+		signInStore.dispatch({
+			type: 'SET_INITIAL_STATE',
+		});
+
+		const localSignInState = signInStore.getState();
+
+		expect(localSignInState).toEqual({
+			username: undefined,
+			challengeName: undefined,
+			signInSession: undefined,
+		});
+		cleanActiveSignInState();
+	});
+
+	test('State SignInSession is updated after dispatching custom session value', () => {
+		const newSignInSessionID = '135790-dodge-2468-9aaa-kersh23lad00';
+		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
+		syncSessionStorage.setItem(
+			signInStateKeys.signInSession,
+			user1.signInSession,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.challengeName,
+			user1.challengeName,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.expiry,
+			(new Date().getTime() + 5000).toString(),
+		);
+
+		signInStore.dispatch({
+			type: 'SET_INITIAL_STATE',
+		});
+
+		const localSignInState = signInStore.getState();
+		expect(localSignInState).toEqual({
+			username: user1.username,
+			challengeName: user1.challengeName,
+			signInSession: user1.signInSession,
+		});
+
+		signInStore.dispatch({
+			type: 'SET_SIGN_IN_SESSION',
+			value: newSignInSessionID,
+		});
+
+		const newLocalSignInState = signInStore.getState();
+		expect(newLocalSignInState).toEqual({
+			username: user1.username,
+			challengeName: user1.challengeName,
+			signInSession: newSignInSessionID,
+		});
+	});
+
+	test('State Challenge Name is updated after dispatching custom challenge name', () => {
+		const newChallengeName = 'RANDOM_CHALLENGE' as ChallengeName;
+		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
+		syncSessionStorage.setItem(
+			signInStateKeys.signInSession,
+			user1.signInSession,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.challengeName,
+			user1.challengeName,
+		);
+		syncSessionStorage.setItem(
+			signInStateKeys.expiry,
+			(new Date().getTime() + 5000).toString(),
+		);
+
+		signInStore.dispatch({
+			type: 'SET_INITIAL_STATE',
+		});
+
+		const localSignInState = signInStore.getState();
+		expect(localSignInState).toEqual({
+			username: user1.username,
+			challengeName: user1.challengeName,
+			signInSession: user1.signInSession,
+		});
+
+		signInStore.dispatch({
+			type: 'SET_CHALLENGE_NAME',
+			value: newChallengeName,
+		});
+
+		const newLocalSignInState = signInStore.getState();
+		expect(newLocalSignInState).toEqual({
+			username: user1.username,
+			challengeName: newChallengeName,
+			signInSession: user1.signInSession,
+		});
+	});
+});
diff --git a/packages/core/__tests__/storage/SyncSessionStorage.test.ts b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
index 21c6276852d..23605e29b44 100644
--- a/packages/core/__tests__/storage/SyncSessionStorage.test.ts
+++ b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { SyncSessionStorage } from '../../src/storage/SyncSessionStorage';
+import { syncSessionStorage } from '../../src';
 
 jest.mock('@aws-amplify/core/internals/utils', () => ({
 	...jest.requireActual('@aws-amplify/core/internals/utils'),
@@ -86,4 +87,37 @@ describe('SyncSessionStorage', () => {
 			sessionStorage.removeItem(badKey);
 		}).not.toThrow();
 	});
+
+	test('syncSessionStorage instance should show the same behavior', () => {
+		sessionStorage.clear();
+		syncSessionStorage.clear();
+		sessionStorage.setItem(signInStateKeys.username, user1.username);
+		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
+		sessionStorage.setItem(signInStateKeys.challengeName, user1.challengeName);
+		syncSessionStorage.setItem(
+			signInStateKeys.challengeName,
+			user1.challengeName,
+		);
+		sessionStorage.setItem(signInStateKeys.signInSession, user1.signInSession);
+		syncSessionStorage.setItem(
+			signInStateKeys.signInSession,
+			user1.signInSession,
+		);
+
+		sessionStorage.setItem(signInStateKeys.expiry, user1.expiry);
+		syncSessionStorage.setItem(signInStateKeys.expiry, user1.expiry);
+
+		expect(syncSessionStorage.getItem(signInStateKeys.username)).toEqual(
+			sessionStorage.getItem(signInStateKeys.username),
+		);
+		expect(syncSessionStorage.getItem(signInStateKeys.challengeName)).toEqual(
+			sessionStorage.getItem(signInStateKeys.challengeName),
+		);
+		expect(syncSessionStorage.getItem(signInStateKeys.signInSession)).toEqual(
+			sessionStorage.getItem(signInStateKeys.signInSession),
+		);
+		expect(syncSessionStorage.getItem(signInStateKeys.expiry)).toEqual(
+			sessionStorage.getItem(signInStateKeys.expiry),
+		);
+	});
 });

From bf370d27bf95a5e8427f66dd97a36bac7053b555 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Mon, 24 Jun 2024 15:34:33 -0700
Subject: [PATCH 15/40] Modified signInStore implementation

---
 .../providers/cognito/signInResumable.test.ts | 32 ++++---------
 .../providers/cognito/utils/signInStore.ts    | 30 ++++++------
 .../storage/SyncSessionStorage.test.ts        | 46 +++----------------
 .../storage-mechanisms-node-runtime.test.ts   | 13 +++---
 .../core/src/storage/SyncKeyValueStorage.ts   |  4 +-
 packages/core/src/storage/utils.ts            | 20 +-------
 packages/core/src/types/storage.ts            |  2 +-
 7 files changed, 42 insertions(+), 105 deletions(-)

diff --git a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
index 1f753aa0619..e549e39a6f0 100644
--- a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
@@ -18,10 +18,14 @@ import { signIn } from '../../../src/providers/cognito';
 import { setUpGetConfig } from './testUtils/setUpGetConfig';
 import { authAPITestParams } from './testUtils/authApiTestParams';
 
+jest.mock('@aws-amplify/core/internals/utils');
 jest.mock('../../../src/providers/cognito/apis/getCurrentUser');
 jest.mock('@aws-amplify/core', () => ({
 	...(jest.createMockFromModule('@aws-amplify/core') as object),
-	Amplify: { getConfig: jest.fn(() => ({})) },
+	Amplify: {
+		getConfig: jest.fn(() => ({})),
+		ADD_OAUTH_LISTENER: jest.fn(() => ({})),
+	},
 	syncSessionStorage: {
 		setItem: jest.fn((key, value) => {
 			window.sessionStorage.setItem(key, value);
@@ -35,11 +39,6 @@ jest.mock('@aws-amplify/core', () => ({
 	},
 }));
 
-jest.mock('@aws-amplify/core/internals/utils', () => ({
-	...jest.requireActual('@aws-amplify/core/internals/utils'),
-	isBrowser: jest.fn(() => false),
-}));
-
 jest.mock(
 	'../../../src/providers/cognito/utils/clients/CognitoIdentityProvider',
 );
@@ -58,10 +57,10 @@ const user1: Record<string, string> = {
 	expiry: '1234567',
 };
 
-describe('signInStore UnitTest', () => {
+describe('signInStore', () => {
 	const authConfig = {
 		Cognito: {
-			userPoolClientId: '888577-ltfgo-42d8-891d-666l858766g7',
+			userPoolClientId: '123456-abcde-42d8-891d-666l858766g7',
 			userPoolId: 'us-west-7_ampjc',
 		},
 	};
@@ -111,7 +110,7 @@ describe('signInStore UnitTest', () => {
 		cleanActiveSignInState();
 	});
 
-	test('State is updated after ', async () => {
+	test('State is updated after calling SignIn', async () => {
 		const handleUserSRPAuthflowSpy = jest
 			.spyOn(signInHelpers, 'handleUserSRPAuthFlow')
 			.mockImplementationOnce(
@@ -145,21 +144,6 @@ describe('signInStore UnitTest', () => {
 		handleUserSRPAuthflowSpy.mockClear();
 	});
 
-	test('State saved in sessionStorage from the previous test is successfully retrieved', async () => {
-		const localSignInState = signInStore.getState();
-
-		expect(localSignInState).toEqual({
-			challengeName,
-			signInSession: session,
-			username,
-			signInDetails: {
-				loginId: username,
-				authFlowType: 'USER_SRP_AUTH',
-			},
-		});
-		cleanActiveSignInState();
-	});
-
 	test('Stored session is not expired thus State should be rehydrated', () => {
 		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
 		syncSessionStorage.setItem(
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 98d886107ee..e1da7dfcbec 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -35,7 +35,7 @@ const logger = new ConsoleLogger('Auth signInStore');
 // Minutes until stored session invalidates
 const EXPIRATION_MINUTES = 3;
 const MS_TO_EXPIRY = 1000 * 60 * EXPIRATION_MINUTES;
-const signInStateKeys: Record<string, string> = {
+const signInStateKeys = {
 	username: 'CognitoSignInState.username',
 	challengeName: 'CognitoSignInState.challengeName',
 	signInSession: 'CognitoSignInState.signInSession',
@@ -67,6 +67,8 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 			return initializeState();
 		case 'RESET_STATE':
 			return getDefaultState();
+
+		// this state is never reachable
 		default:
 			return state;
 	}
@@ -150,20 +152,20 @@ export function setActiveSignInState(state: SignInState): void {
 	});
 
 	// Save the local state into Synced Session Storage
-	persistSignInState(syncSessionStorage, state);
+	persistSignInState(state);
 }
 
 // Save local state into Session Storage
-const persistSignInState = (
-	storage = syncSessionStorage,
-	{
-		challengeName = '' as ChallengeName,
-		signInSession = '',
-		username = '',
-	}: SignInState,
-) => {
-	storage.setItem(signInStateKeys.username, username);
-	storage.setItem(signInStateKeys.challengeName, challengeName);
-	storage.setItem(signInStateKeys.signInSession, signInSession);
-	storage.setItem(signInStateKeys.expiry, String(Date.now() + MS_TO_EXPIRY));
+const persistSignInState = ({
+	challengeName = '' as ChallengeName,
+	signInSession = '',
+	username = '',
+}: SignInState) => {
+	syncSessionStorage.setItem(signInStateKeys.username, username);
+	syncSessionStorage.setItem(signInStateKeys.challengeName, challengeName);
+	syncSessionStorage.setItem(signInStateKeys.signInSession, signInSession);
+	syncSessionStorage.setItem(
+		signInStateKeys.expiry,
+		String(Date.now() + MS_TO_EXPIRY),
+	);
 };
diff --git a/packages/core/__tests__/storage/SyncSessionStorage.test.ts b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
index 23605e29b44..31d4e0e22af 100644
--- a/packages/core/__tests__/storage/SyncSessionStorage.test.ts
+++ b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { SyncSessionStorage } from '../../src/storage/SyncSessionStorage';
-import { syncSessionStorage } from '../../src';
 
 jest.mock('@aws-amplify/core/internals/utils', () => ({
 	...jest.requireActual('@aws-amplify/core/internals/utils'),
@@ -17,7 +16,7 @@ describe('SyncSessionStorage', () => {
 		expiry: 'CognitoSignInState.expiry',
 	};
 
-	const user1: Record<string, string> = {
+	const user1 = {
 		username: 'joonchoi',
 		challengeName: 'CUSTOM_CHALLENGE',
 		signInSession: '888577-ltfgo-42d8-891d-666l858766g7',
@@ -32,7 +31,7 @@ describe('SyncSessionStorage', () => {
 		sessionStorage.clear();
 	});
 
-	test('should accept a value and retrieve the same value without any issue', () => {
+	it('can set and retrieve item by key', () => {
 		sessionStorage.setItem(signInStateKeys.username, user1.username);
 		sessionStorage.setItem(signInStateKeys.challengeName, user1.challengeName);
 		sessionStorage.setItem(signInStateKeys.signInSession, user1.signInSession);
@@ -52,7 +51,7 @@ describe('SyncSessionStorage', () => {
 		);
 	});
 
-	test('will update key if setItem on the same key is called again', () => {
+	it('can override item by setting with the same key', () => {
 		const newUserName = 'joonchoi+test';
 		sessionStorage.setItem(signInStateKeys.username, user1.username);
 		sessionStorage.setItem(signInStateKeys.username, newUserName);
@@ -62,7 +61,7 @@ describe('SyncSessionStorage', () => {
 		);
 	});
 
-	test('should set a value and retrieve it with the same key', () => {
+	it('can remove item by key', () => {
 		const newUserName = 'joonchoi+tobedeleted';
 		sessionStorage.setItem(signInStateKeys.username, newUserName);
 		expect(sessionStorage.getItem(signInStateKeys.username)).toEqual(
@@ -72,7 +71,7 @@ describe('SyncSessionStorage', () => {
 		expect(sessionStorage.getItem(signInStateKeys.username)).toBeNull();
 	});
 
-	test('should clear out storage', () => {
+	it('clears all items', () => {
 		sessionStorage.clear();
 		expect(sessionStorage.getItem(signInStateKeys.username)).toBeNull();
 		expect(sessionStorage.getItem(signInStateKeys.challengeName)).toBeNull();
@@ -80,44 +79,11 @@ describe('SyncSessionStorage', () => {
 		expect(sessionStorage.getItem(signInStateKeys.expiry)).toBeNull();
 	});
 
-	test('should not throw if trying to delete a non existing key', () => {
+	it('will throw if trying to delete a non existing key', () => {
 		const badKey = 'nonExistingKey';
 
 		expect(() => {
 			sessionStorage.removeItem(badKey);
 		}).not.toThrow();
 	});
-
-	test('syncSessionStorage instance should show the same behavior', () => {
-		sessionStorage.clear();
-		syncSessionStorage.clear();
-		sessionStorage.setItem(signInStateKeys.username, user1.username);
-		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
-		sessionStorage.setItem(signInStateKeys.challengeName, user1.challengeName);
-		syncSessionStorage.setItem(
-			signInStateKeys.challengeName,
-			user1.challengeName,
-		);
-		sessionStorage.setItem(signInStateKeys.signInSession, user1.signInSession);
-		syncSessionStorage.setItem(
-			signInStateKeys.signInSession,
-			user1.signInSession,
-		);
-
-		sessionStorage.setItem(signInStateKeys.expiry, user1.expiry);
-		syncSessionStorage.setItem(signInStateKeys.expiry, user1.expiry);
-
-		expect(syncSessionStorage.getItem(signInStateKeys.username)).toEqual(
-			sessionStorage.getItem(signInStateKeys.username),
-		);
-		expect(syncSessionStorage.getItem(signInStateKeys.challengeName)).toEqual(
-			sessionStorage.getItem(signInStateKeys.challengeName),
-		);
-		expect(syncSessionStorage.getItem(signInStateKeys.signInSession)).toEqual(
-			sessionStorage.getItem(signInStateKeys.signInSession),
-		);
-		expect(syncSessionStorage.getItem(signInStateKeys.expiry)).toEqual(
-			sessionStorage.getItem(signInStateKeys.expiry),
-		);
-	});
 });
diff --git a/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts b/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
index 3436275c9f8..93568c833f3 100644
--- a/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
+++ b/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
@@ -2,7 +2,11 @@
  * @jest-environment node
  */
 
-import { AmplifyError, AmplifyErrorCode } from '../../src/libraryUtils';
+import {
+	AmplifyError,
+	AmplifyErrorCode,
+	PlatformNotSupportedError,
+} from '../../src/libraryUtils';
 import {
 	defaultStorage,
 	sessionStorage,
@@ -32,11 +36,8 @@ describe('test mechanisms', () => {
 	});
 
 	test('test syncSessionStorage operations in node environment', () => {
-		try {
+		expect(() => {
 			syncSessionStorage.setItem(key, value);
-		} catch (error: any) {
-			expect(error).toBeInstanceOf(AmplifyError);
-			expect(error.name).toBe(AmplifyErrorCode.PlatformNotSupported);
-		}
+		}).not.toThrow(PlatformNotSupportedError);
 	});
 });
diff --git a/packages/core/src/storage/SyncKeyValueStorage.ts b/packages/core/src/storage/SyncKeyValueStorage.ts
index 11f992f495e..148fcef4451 100644
--- a/packages/core/src/storage/SyncKeyValueStorage.ts
+++ b/packages/core/src/storage/SyncKeyValueStorage.ts
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '../errors';
-import { SyncSessionStorageInterface } from '../types';
+import { SyncStorage } from '../types';
 
 /**
  * @internal
  */
-export class SyncKeyValueStorage implements SyncSessionStorageInterface {
+export class SyncKeyValueStorage implements SyncStorage {
 	storage?: Storage;
 
 	constructor(storage?: Storage) {
diff --git a/packages/core/src/storage/utils.ts b/packages/core/src/storage/utils.ts
index ce862c3d12c..527d91d7f4e 100644
--- a/packages/core/src/storage/utils.ts
+++ b/packages/core/src/storage/utils.ts
@@ -3,14 +3,6 @@
 
 import { InMemoryStorage } from './InMemoryStorage';
 
-const cachedMemoryStorageInstances: Record<
-	'local' | 'session',
-	InMemoryStorage
-> = {
-	local: new InMemoryStorage(),
-	session: new InMemoryStorage(),
-};
-
 /**
  * @internal
  * @returns Either a reference to window.localStorage or an in-memory storage as fallback
@@ -18,7 +10,7 @@ const cachedMemoryStorageInstances: Record<
 export const getLocalStorageWithFallback = (): Storage =>
 	typeof window !== 'undefined' && window.localStorage
 		? window.localStorage
-		: getSessionMemoryStorage('local');
+		: new InMemoryStorage();
 
 /**
  * @internal
@@ -27,12 +19,4 @@ export const getLocalStorageWithFallback = (): Storage =>
 export const getSessionStorageWithFallback = (): Storage =>
 	typeof window !== 'undefined' && window.sessionStorage
 		? window.sessionStorage
-		: getSessionMemoryStorage('session');
-
-const getSessionMemoryStorage = (key: 'local' | 'session') => {
-	if (!cachedMemoryStorageInstances[key]) {
-		cachedMemoryStorageInstances[key] = new InMemoryStorage();
-	}
-
-	return cachedMemoryStorageInstances[key];
-};
+		: new InMemoryStorage();
diff --git a/packages/core/src/types/storage.ts b/packages/core/src/types/storage.ts
index 2d6dc6deeda..79a0c63e74b 100644
--- a/packages/core/src/types/storage.ts
+++ b/packages/core/src/types/storage.ts
@@ -22,7 +22,7 @@ export interface CookieStorageData {
 	sameSite?: SameSite;
 }
 
-export interface SyncSessionStorageInterface {
+export interface SyncStorage {
 	setItem(key: string, value: string): void;
 	getItem(key: string): string | null;
 	removeItem(key: string): void;

From b91fec62394990ffa068ded41aefd4d87ed92834 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Tue, 2 Jul 2024 12:53:25 -0700
Subject: [PATCH 16/40] Complemented additional behaviors to address potential
 discrepancy during confirmSignIn

---
 .../providers/cognito/utils/signInStore.ts    | 10 +++--
 .../storage-mechanisms-node-runtime.test.ts   | 43 -------------------
 2 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index e1da7dfcbec..988f496d005 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -49,16 +49,23 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 				...state,
 				signInSession: action.value,
 			};
+
 		case 'SET_SIGN_IN_STATE':
+			persistSignInState(state);
+
 			return {
 				...action.value,
 			};
 		case 'SET_CHALLENGE_NAME':
+			persistSignInState(state);
+
 			return {
 				...state,
 				challengeName: action.value,
 			};
 		case 'SET_USERNAME':
+			persistSignInState(state);
+
 			return {
 				...state,
 				username: action.value,
@@ -150,9 +157,6 @@ export function setActiveSignInState(state: SignInState): void {
 		type: 'SET_SIGN_IN_STATE',
 		value: state,
 	});
-
-	// Save the local state into Synced Session Storage
-	persistSignInState(state);
 }
 
 // Save local state into Session Storage
diff --git a/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts b/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
deleted file mode 100644
index 93568c833f3..00000000000
--- a/packages/core/__tests__/storage/storage-mechanisms-node-runtime.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @jest-environment node
- */
-
-import {
-	AmplifyError,
-	AmplifyErrorCode,
-	PlatformNotSupportedError,
-} from '../../src/libraryUtils';
-import {
-	defaultStorage,
-	sessionStorage,
-	syncSessionStorage,
-} from '../../src/storage';
-
-const key = 'k';
-const value = 'value';
-
-describe('test mechanisms', () => {
-	test('test defaultStorage operations in node environment', async () => {
-		try {
-			await defaultStorage.setItem(key, value);
-		} catch (error: any) {
-			expect(error).toBeInstanceOf(AmplifyError);
-			expect(error.name).toBe(AmplifyErrorCode.PlatformNotSupported);
-		}
-	});
-
-	test('test sessionStorage operations in node environment', async () => {
-		try {
-			await sessionStorage.setItem(key, value);
-		} catch (error: any) {
-			expect(error).toBeInstanceOf(AmplifyError);
-			expect(error.name).toBe(AmplifyErrorCode.PlatformNotSupported);
-		}
-	});
-
-	test('test syncSessionStorage operations in node environment', () => {
-		expect(() => {
-			syncSessionStorage.setItem(key, value);
-		}).not.toThrow(PlatformNotSupportedError);
-	});
-});

From 9f6c9337ba7622053cb5b2d75ed62f6e0bfcc436 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 10 Jul 2024 10:56:37 -0700
Subject: [PATCH 17/40] Modified State persistence behavior

---
 .../providers/cognito/utils/signInStore.ts    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 988f496d005..dde679a5a61 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -51,7 +51,7 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 			};
 
 		case 'SET_SIGN_IN_STATE':
-			persistSignInState(state);
+			persistSignInState(action.value);
 
 			return {
 				...action.value,
@@ -161,13 +161,19 @@ export function setActiveSignInState(state: SignInState): void {
 
 // Save local state into Session Storage
 const persistSignInState = ({
-	challengeName = '' as ChallengeName,
-	signInSession = '',
-	username = '',
+	challengeName,
+	signInSession,
+	username,
 }: SignInState) => {
-	syncSessionStorage.setItem(signInStateKeys.username, username);
-	syncSessionStorage.setItem(signInStateKeys.challengeName, challengeName);
-	syncSessionStorage.setItem(signInStateKeys.signInSession, signInSession);
+	if (username) {
+		syncSessionStorage.setItem(signInStateKeys.username, username);
+	}
+	if (signInSession) {
+		syncSessionStorage.setItem(signInStateKeys.signInSession, signInSession);
+	}
+	if (challengeName) {
+		syncSessionStorage.setItem(signInStateKeys.challengeName, challengeName);
+	}
 	syncSessionStorage.setItem(
 		signInStateKeys.expiry,
 		String(Date.now() + MS_TO_EXPIRY),

From 82316a563dd4d4e0e8c9a289db5cecb6a4a7fcda Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 10 Jul 2024 12:38:46 -0700
Subject: [PATCH 18/40] Update params

---
 packages/auth/src/providers/cognito/utils/signInStore.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index dde679a5a61..c51369051a8 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -57,14 +57,14 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 				...action.value,
 			};
 		case 'SET_CHALLENGE_NAME':
-			persistSignInState(state);
+			persistSignInState({ challengeName: action.value });
 
 			return {
 				...state,
 				challengeName: action.value,
 			};
 		case 'SET_USERNAME':
-			persistSignInState(state);
+			persistSignInState({ username: action.value });
 
 			return {
 				...state,

From 2c7600af9099dfa7ad0f365a9ad87580512c2f79 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 10 Jul 2024 14:08:03 -0700
Subject: [PATCH 19/40] Add mock implementation to resolve test issue

---
 .../providers/cognito/signInWithRedirect.test.ts  | 15 ++++++++++++++-
 .../src/providers/cognito/utils/signInStore.ts    |  4 ----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/auth/__tests__/providers/cognito/signInWithRedirect.test.ts b/packages/auth/__tests__/providers/cognito/signInWithRedirect.test.ts
index 8f91323319f..486d4fd9a81 100644
--- a/packages/auth/__tests__/providers/cognito/signInWithRedirect.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInWithRedirect.test.ts
@@ -42,7 +42,20 @@ jest.mock('@aws-amplify/core', () => {
 			getConfig: jest.fn(() => mockAuthConfigWithOAuth),
 			[ACTUAL_ADD_OAUTH_LISTENER]: jest.fn(),
 		},
-		ConsoleLogger: jest.fn(),
+		ConsoleLogger: jest.fn().mockImplementation(() => {
+			return { warn: jest.fn() };
+		}),
+		syncSessionStorage: {
+			setItem: jest.fn((key, value) => {
+				window.sessionStorage.setItem(key, value);
+			}),
+			getItem: jest.fn((key: string) => {
+				return window.sessionStorage.getItem(key);
+			}),
+			removeItem: jest.fn((key: string) => {
+				window.sessionStorage.removeItem(key);
+			}),
+		},
 	};
 });
 
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index c51369051a8..ef466c27bbb 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -111,10 +111,6 @@ const getDefaultState = (): SignInState => ({
 
 // Hydrate signInStore from Synced Session Storage
 const initializeState = (): SignInState => {
-	if (!syncSessionStorage) {
-		return getDefaultState();
-	}
-
 	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry);
 	if (isExpired(expiry)) {
 		logger.warn('Sign-in session expired');

From 08419ba9ded6ff70d3f0c055c04740ae397fae51 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 10 Jul 2024 16:33:13 -0700
Subject: [PATCH 20/40] Changed expiration check logic

---
 .../providers/cognito/utils/signInStore.ts    | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index ef466c27bbb..d045aa27c3f 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -82,9 +82,6 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 };
 
 const isExpired = (expiryDate: string | null): boolean => {
-	if (!expiryDate) {
-		return true;
-	}
 	const expiryTimestamp = Number(expiryDate);
 	const currentTimestamp = Date.now();
 
@@ -92,8 +89,8 @@ const isExpired = (expiryDate: string | null): boolean => {
 };
 
 const clearPersistedSignInState = () => {
-	for (const key in signInStateKeys) {
-		syncSessionStorage.removeItem(key);
+	for (const storedKey of Object.values(signInStateKeys)) {
+		syncSessionStorage.removeItem(storedKey);
 	}
 };
 
@@ -112,27 +109,31 @@ const getDefaultState = (): SignInState => ({
 // Hydrate signInStore from Synced Session Storage
 const initializeState = (): SignInState => {
 	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry);
-	if (isExpired(expiry)) {
-		logger.warn('Sign-in session expired');
-		clearPersistedSignInState();
+	if (expiry) {
+		if (isExpired(expiry)) {
+			logger.warn('Sign-in session expired');
+			clearPersistedSignInState();
 
+			return getDefaultState();
+		}
+
+		const username =
+			syncSessionStorage.getItem(signInStateKeys.username) ?? undefined;
+
+		const challengeName = (syncSessionStorage.getItem(
+			signInStateKeys.challengeName,
+		) ?? undefined) as ChallengeName;
+		const signInSession =
+			syncSessionStorage.getItem(signInStateKeys.signInSession) ?? undefined;
+
+		return {
+			username,
+			challengeName,
+			signInSession,
+		};
+	} else {
 		return getDefaultState();
 	}
-
-	const username =
-		syncSessionStorage.getItem(signInStateKeys.username) ?? undefined;
-
-	const challengeName = (syncSessionStorage.getItem(
-		signInStateKeys.challengeName,
-	) ?? undefined) as ChallengeName;
-	const signInSession =
-		syncSessionStorage.getItem(signInStateKeys.signInSession) ?? undefined;
-
-	return {
-		username,
-		challengeName,
-		signInSession,
-	};
 };
 
 const createStore: Store<SignInState, SignInAction> = reducer => {

From 7e91d0f85f234bda4b8007c3d9daa46f3574e080 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Thu, 11 Jul 2024 11:21:36 -0700
Subject: [PATCH 21/40] Polish persistSignInState()

---
 .../providers/cognito/utils/signInStore.ts    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index d045aa27c3f..21516331ded 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -162,17 +162,17 @@ const persistSignInState = ({
 	signInSession,
 	username,
 }: SignInState) => {
-	if (username) {
-		syncSessionStorage.setItem(signInStateKeys.username, username);
-	}
+	username && syncSessionStorage.setItem(signInStateKeys.username, username);
+	challengeName &&
+		syncSessionStorage.setItem(signInStateKeys.challengeName, challengeName);
+
 	if (signInSession) {
 		syncSessionStorage.setItem(signInStateKeys.signInSession, signInSession);
+
+		// Updates expiry when session is passed
+		syncSessionStorage.setItem(
+			signInStateKeys.expiry,
+			String(Date.now() + MS_TO_EXPIRY),
+		);
 	}
-	if (challengeName) {
-		syncSessionStorage.setItem(signInStateKeys.challengeName, challengeName);
-	}
-	syncSessionStorage.setItem(
-		signInStateKeys.expiry,
-		String(Date.now() + MS_TO_EXPIRY),
-	);
 };

From 9a0d6d1623420aa3e807893e09ab7fcbcbbf44e5 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Thu, 15 Aug 2024 13:16:59 -0700
Subject: [PATCH 22/40] Adjust bundle size

---
 .../providers/cognito/signInResumable.test.ts      |  5 -----
 .../cognito/signInStateManagement.test.ts          |  6 +++++-
 .../src/providers/cognito/utils/signInStore.ts     | 14 ++++++--------
 packages/aws-amplify/package.json                  |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
index e549e39a6f0..3c370341aaf 100644
--- a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
@@ -87,11 +87,6 @@ describe('signInStore', () => {
 	});
 
 	test('LocalSignInState is empty after initialization', async () => {
-		syncSessionStorage.setItem(signInStateKeys.username, 'pikapi');
-		syncSessionStorage.setItem(
-			signInStateKeys.expiry,
-			(new Date().getTime() + 9999999).toString(),
-		);
 		const localSignInState = signInStore.getState();
 
 		expect(localSignInState).toEqual({
diff --git a/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts b/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts
index dcefb80a121..380817cbd37 100644
--- a/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts
@@ -5,7 +5,10 @@ import { Amplify } from '@aws-amplify/core';
 
 import { getCurrentUser, signIn } from '../../../src/providers/cognito';
 import * as signInHelpers from '../../../src/providers/cognito/utils/signInHelpers';
-import { signInStore } from '../../../src/providers/cognito/utils/signInStore';
+import {
+	cleanActiveSignInState,
+	signInStore,
+} from '../../../src/providers/cognito/utils/signInStore';
 import { RespondToAuthChallengeCommandOutput } from '../../../src/providers/cognito/utils/clients/CognitoIdentityProvider/types';
 import { cognitoUserPoolsTokenProvider } from '../../../src/providers/cognito/tokenProvider';
 
@@ -30,6 +33,7 @@ describe('local sign-in state management tests', () => {
 
 	beforeEach(() => {
 		cognitoUserPoolsTokenProvider.setAuthConfig(authConfig);
+		cleanActiveSignInState();
 	});
 
 	test('local state management should return state after signIn returns a ChallengeName', async () => {
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 21516331ded..cffc4315747 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -109,14 +109,14 @@ const getDefaultState = (): SignInState => ({
 // Hydrate signInStore from Synced Session Storage
 const initializeState = (): SignInState => {
 	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry);
-	if (expiry) {
-		if (isExpired(expiry)) {
-			logger.warn('Sign-in session expired');
-			clearPersistedSignInState();
 
-			return getDefaultState();
-		}
+	if (!expiry || (expiry && isExpired(expiry))) {
+		logger.warn('Session Expired');
+
+		clearPersistedSignInState();
 
+		return getDefaultState();
+	} else {
 		const username =
 			syncSessionStorage.getItem(signInStateKeys.username) ?? undefined;
 
@@ -131,8 +131,6 @@ const initializeState = (): SignInState => {
 			challengeName,
 			signInSession,
 		};
-	} else {
-		return getDefaultState();
 	}
 };
 
diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
index dac855e485b..c1b44d9aeca 100644
--- a/packages/aws-amplify/package.json
+++ b/packages/aws-amplify/package.json
@@ -497,7 +497,7 @@
 			"name": "[Storage] uploadData (S3)",
 			"path": "./dist/esm/storage/index.mjs",
 			"import": "{ uploadData }",
-			"limit": "19.90 kB"
+			"limit": "19.95 kB"
 		}
 	]
 }

From 247ccc9cf0dbdb7c3bac155a369b611c5b0a5aad Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 21 Aug 2024 15:36:18 -0700
Subject: [PATCH 23/40] Add persisting action for session

---
 packages/auth/src/providers/cognito/utils/signInStore.ts   | 6 ++++++
 packages/core/__tests__/storage/SyncSessionStorage.test.ts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index cffc4315747..ad117a788d2 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -45,6 +45,8 @@ const signInStateKeys = {
 const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 	switch (action.type) {
 		case 'SET_SIGN_IN_SESSION':
+			persistSignInState({ signInSession: action.value });
+
 			return {
 				...state,
 				signInSession: action.value,
@@ -56,6 +58,7 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 			return {
 				...action.value,
 			};
+
 		case 'SET_CHALLENGE_NAME':
 			persistSignInState({ challengeName: action.value });
 
@@ -63,6 +66,7 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 				...state,
 				challengeName: action.value,
 			};
+
 		case 'SET_USERNAME':
 			persistSignInState({ username: action.value });
 
@@ -70,8 +74,10 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 				...state,
 				username: action.value,
 			};
+
 		case 'SET_INITIAL_STATE':
 			return initializeState();
+
 		case 'RESET_STATE':
 			return getDefaultState();
 
diff --git a/packages/core/__tests__/storage/SyncSessionStorage.test.ts b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
index 31d4e0e22af..982988f6c22 100644
--- a/packages/core/__tests__/storage/SyncSessionStorage.test.ts
+++ b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
@@ -79,7 +79,7 @@ describe('SyncSessionStorage', () => {
 		expect(sessionStorage.getItem(signInStateKeys.expiry)).toBeNull();
 	});
 
-	it('will throw if trying to delete a non existing key', () => {
+	it('will not throw if trying to delete a non existing key', () => {
 		const badKey = 'nonExistingKey';
 
 		expect(() => {

From dea838ec879003c665ae798286782436b537d8fc Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Thu, 22 Aug 2024 15:48:11 -0700
Subject: [PATCH 24/40] Add spyOn checkpoints

---
 .../providers/cognito/signInResumable.test.ts | 129 +++++++++---------
 .../providers/cognito/utils/signInStore.ts    |   2 +-
 2 files changed, 63 insertions(+), 68 deletions(-)

diff --git a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
index 3c370341aaf..1900319b81d 100644
--- a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
@@ -18,6 +18,8 @@ import { signIn } from '../../../src/providers/cognito';
 import { setUpGetConfig } from './testUtils/setUpGetConfig';
 import { authAPITestParams } from './testUtils/authApiTestParams';
 
+const signInStoreImplementation = require('../../../src/providers/cognito/utils/signInStore');
+
 jest.mock('@aws-amplify/core/internals/utils');
 jest.mock('../../../src/providers/cognito/apis/getCurrentUser');
 jest.mock('@aws-amplify/core', () => ({
@@ -57,6 +59,46 @@ const user1: Record<string, string> = {
 	expiry: '1234567',
 };
 
+const populateValidTestSyncStorage = () => {
+	syncSessionStorage.setItem(signInStateKeys.username, user1.username);
+	syncSessionStorage.setItem(
+		signInStateKeys.signInSession,
+		user1.signInSession,
+	);
+	syncSessionStorage.setItem(
+		signInStateKeys.challengeName,
+		user1.challengeName,
+	);
+	syncSessionStorage.setItem(
+		signInStateKeys.expiry,
+		(new Date().getTime() + 9999999).toString(),
+	);
+
+	signInStore.dispatch({
+		type: 'SET_INITIAL_STATE',
+	});
+};
+
+const populateInvalidTestSyncStorage = () => {
+	syncSessionStorage.setItem(signInStateKeys.username, user1.username);
+	syncSessionStorage.setItem(
+		signInStateKeys.signInSession,
+		user1.signInSession,
+	);
+	syncSessionStorage.setItem(
+		signInStateKeys.challengeName,
+		user1.challengeName,
+	);
+	syncSessionStorage.setItem(
+		signInStateKeys.expiry,
+		(new Date().getTime() - 99999).toString(),
+	);
+
+	signInStore.dispatch({
+		type: 'SET_INITIAL_STATE',
+	});
+};
+
 describe('signInStore', () => {
 	const authConfig = {
 		Cognito: {
@@ -98,10 +140,16 @@ describe('signInStore', () => {
 	});
 
 	test('State is set after calling setActiveSignInState', async () => {
+		const persistSignInStateSpy = jest.spyOn(
+			signInStoreImplementation,
+			'persistSignInState',
+		);
 		setActiveSignInState(user1);
 		const localSignInState = signInStore.getState();
 
 		expect(localSignInState).toEqual(user1);
+		expect(persistSignInStateSpy).toHaveBeenCalledTimes(1);
+		expect(persistSignInStateSpy).toHaveBeenCalledWith(user1);
 		cleanActiveSignInState();
 	});
 
@@ -139,24 +187,8 @@ describe('signInStore', () => {
 		handleUserSRPAuthflowSpy.mockClear();
 	});
 
-	test('Stored session is not expired thus State should be rehydrated', () => {
-		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
-		syncSessionStorage.setItem(
-			signInStateKeys.signInSession,
-			user1.signInSession,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.challengeName,
-			user1.challengeName,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.expiry,
-			(new Date().getTime() + 9999999).toString(),
-		);
-
-		signInStore.dispatch({
-			type: 'SET_INITIAL_STATE',
-		});
+	test('The stored sign-in state should be rehydrated if the sign-in session is still valid.', () => {
+		populateValidTestSyncStorage();
 
 		const localSignInState = signInStore.getState();
 
@@ -168,23 +200,8 @@ describe('signInStore', () => {
 		cleanActiveSignInState();
 	});
 
-	test('Stored session is expired thus State should default to undefined', async () => {
-		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
-		syncSessionStorage.setItem(
-			signInStateKeys.signInSession,
-			user1.signInSession,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.challengeName,
-			user1.challengeName,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.expiry,
-			(new Date().getTime() - 500000).toString(),
-		);
-		signInStore.dispatch({
-			type: 'SET_INITIAL_STATE',
-		});
+	test('sign-in store should return undefined state when the sign-in session is expired', async () => {
+		populateInvalidTestSyncStorage();
 
 		const localSignInState = signInStore.getState();
 
@@ -197,24 +214,13 @@ describe('signInStore', () => {
 	});
 
 	test('State SignInSession is updated after dispatching custom session value', () => {
-		const newSignInSessionID = '135790-dodge-2468-9aaa-kersh23lad00';
-		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
-		syncSessionStorage.setItem(
-			signInStateKeys.signInSession,
-			user1.signInSession,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.challengeName,
-			user1.challengeName,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.expiry,
-			(new Date().getTime() + 5000).toString(),
+		const persistSignInStateSpy = jest.spyOn(
+			signInStoreImplementation,
+			'persistSignInState',
 		);
+		const newSignInSessionID = '135790-dodge-2468-9aaa-kersh23lad00';
 
-		signInStore.dispatch({
-			type: 'SET_INITIAL_STATE',
-		});
+		populateValidTestSyncStorage();
 
 		const localSignInState = signInStore.getState();
 		expect(localSignInState).toEqual({
@@ -228,6 +234,10 @@ describe('signInStore', () => {
 			value: newSignInSessionID,
 		});
 
+		expect(persistSignInStateSpy).toHaveBeenCalledTimes(1);
+		expect(persistSignInStateSpy).toHaveBeenCalledWith({
+			signInSession: newSignInSessionID,
+		});
 		const newLocalSignInState = signInStore.getState();
 		expect(newLocalSignInState).toEqual({
 			username: user1.username,
@@ -238,23 +248,8 @@ describe('signInStore', () => {
 
 	test('State Challenge Name is updated after dispatching custom challenge name', () => {
 		const newChallengeName = 'RANDOM_CHALLENGE' as ChallengeName;
-		syncSessionStorage.setItem(signInStateKeys.username, user1.username);
-		syncSessionStorage.setItem(
-			signInStateKeys.signInSession,
-			user1.signInSession,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.challengeName,
-			user1.challengeName,
-		);
-		syncSessionStorage.setItem(
-			signInStateKeys.expiry,
-			(new Date().getTime() + 5000).toString(),
-		);
 
-		signInStore.dispatch({
-			type: 'SET_INITIAL_STATE',
-		});
+		populateValidTestSyncStorage();
 
 		const localSignInState = signInStore.getState();
 		expect(localSignInState).toEqual({
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index ad117a788d2..6e256dc74f3 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -161,7 +161,7 @@ export function setActiveSignInState(state: SignInState): void {
 }
 
 // Save local state into Session Storage
-const persistSignInState = ({
+export const persistSignInState = ({
 	challengeName,
 	signInSession,
 	username,

From deb0d9da624f28266929eb070b737d40d91fa5b0 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 23 Aug 2024 12:16:59 -0700
Subject: [PATCH 25/40] enable integ

---
 .github/integ-config/integ-all.yml    | 8 ++++++++
 .github/workflows/push-integ-test.yml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
index 8799414102f..c358173cbf3 100644
--- a/.github/integ-config/integ-all.yml
+++ b/.github/integ-config/integ-all.yml
@@ -595,6 +595,14 @@ tests:
     sample_name: [sign-in-with-oauth]
     spec: sign-in-with-oauth
     browser: [chrome]
+  - test_name: integ_next_custom_auth
+    desc: 'Sign-in with Custom Auth flow'
+    framework: next
+    category: auth
+    sample_name: [custom-auth]
+    spec: custom-auth
+    browser: *minimal_browser_list
+    backend: gen2
 
   # DISABLED Angular/Vue tests:
   # TODO: delete tests or add custom ui logic to support them.
diff --git a/.github/workflows/push-integ-test.yml b/.github/workflows/push-integ-test.yml
index 03e43dd2865..293b2a3822f 100644
--- a/.github/workflows/push-integ-test.yml
+++ b/.github/workflows/push-integ-test.yml
@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - replace-with-your-branch
+      - joonwonc/auth-resumable-signin
 
 jobs:
   e2e:

From dbe8d02571ef5c9ee288e25fdd2d0b235d6932e2 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 23 Aug 2024 14:01:00 -0700
Subject: [PATCH 26/40] Revert jest config for aws-amplify package test

---
 packages/aws-amplify/__tests__/exports.test.ts | 1 -
 packages/aws-amplify/jest.config.js            | 2 +-
 packages/aws-amplify/src/utils/index.ts        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/aws-amplify/__tests__/exports.test.ts b/packages/aws-amplify/__tests__/exports.test.ts
index a707b120694..c6425ad7c93 100644
--- a/packages/aws-amplify/__tests__/exports.test.ts
+++ b/packages/aws-amplify/__tests__/exports.test.ts
@@ -41,7 +41,6 @@ describe('aws-amplify Exports', () => {
 					'defaultStorage',
 					'parseAmplifyConfig',
 					'sessionStorage',
-					'syncSessionStorage',
 					'sharedInMemoryStorage',
 				].sort(),
 			);
diff --git a/packages/aws-amplify/jest.config.js b/packages/aws-amplify/jest.config.js
index 9047be1a892..5254f524623 100644
--- a/packages/aws-amplify/jest.config.js
+++ b/packages/aws-amplify/jest.config.js
@@ -3,7 +3,7 @@ module.exports = {
 	coverageThreshold: {
 		global: {
 			branches: 85,
-			functions: 63.3,
+			functions: 65.5,
 			lines: 90,
 			statements: 91,
 		},
diff --git a/packages/aws-amplify/src/utils/index.ts b/packages/aws-amplify/src/utils/index.ts
index 58f896d90a6..35093e8e864 100644
--- a/packages/aws-amplify/src/utils/index.ts
+++ b/packages/aws-amplify/src/utils/index.ts
@@ -14,7 +14,6 @@ export {
 	CookieStorage,
 	defaultStorage,
 	sessionStorage,
-	syncSessionStorage,
 	sharedInMemoryStorage,
 	KeyValueStorageInterface,
 } from '@aws-amplify/core';

From 7d0527ca31ca4e0a5dbcc97ee401dd60f9228224 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 23 Aug 2024 14:02:25 -0700
Subject: [PATCH 27/40] revert workflow

---
 .github/workflows/push-integ-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-integ-test.yml b/.github/workflows/push-integ-test.yml
index 293b2a3822f..03e43dd2865 100644
--- a/.github/workflows/push-integ-test.yml
+++ b/.github/workflows/push-integ-test.yml
@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - joonwonc/auth-resumable-signin
+      - replace-with-your-branch
 
 jobs:
   e2e:

From efb233195c2d1ba71f9ebab8aaac7a18d7705376 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Mon, 26 Aug 2024 18:08:28 -0700
Subject: [PATCH 28/40] Remove redundant features, improve efficiency

---
 .github/integ-config/integ-all.yml            |  1 -
 .../providers/cognito/utils/signInStore.ts    | 20 +++++------
 .../storage/SyncSessionStorage.test.ts        | 33 +++++++------------
 .../core/src/storage/SyncKeyValueStorage.ts   | 23 ++++++-------
 4 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
index 6b0bee3fcc5..dd5de1ad3bc 100644
--- a/.github/integ-config/integ-all.yml
+++ b/.github/integ-config/integ-all.yml
@@ -609,7 +609,6 @@ tests:
     sample_name: [custom-auth]
     spec: custom-auth
     browser: *minimal_browser_list
-    backend: gen2
 
   # DISABLED Angular/Vue tests:
   # TODO: delete tests or add custom ui logic to support them.
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 6e256dc74f3..fcfc0c59609 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ConsoleLogger, syncSessionStorage } from '@aws-amplify/core';
+import { syncSessionStorage } from '@aws-amplify/core';
 
 import { CognitoAuthSignInDetails } from '../types';
 
@@ -30,16 +30,14 @@ type Store<State, Action> = (reducer: Reducer<State, Action>) => {
 
 type Reducer<State, Action> = (state: State, action: Action) => State;
 
-const logger = new ConsoleLogger('Auth signInStore');
-
 // Minutes until stored session invalidates
-const EXPIRATION_MINUTES = 3;
-const MS_TO_EXPIRY = 1000 * 60 * EXPIRATION_MINUTES;
+const MS_TO_EXPIRY = 3 * 60 * 1000; // 3 mins
+const tgtState = 'CognitoSignInState';
 const signInStateKeys = {
-	username: 'CognitoSignInState.username',
-	challengeName: 'CognitoSignInState.challengeName',
-	signInSession: 'CognitoSignInState.signInSession',
-	expiry: 'CognitoSignInState.expiry',
+	username: `${tgtState}.username`,
+	challengeName: `${tgtState}.challengeName`,
+	signInSession: `${tgtState}.signInSession`,
+	expiry: `${tgtState}.expiry`,
 };
 
 const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
@@ -79,6 +77,8 @@ const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 			return initializeState();
 
 		case 'RESET_STATE':
+			clearPersistedSignInState();
+
 			return getDefaultState();
 
 		// this state is never reachable
@@ -117,8 +117,6 @@ const initializeState = (): SignInState => {
 	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry);
 
 	if (!expiry || (expiry && isExpired(expiry))) {
-		logger.warn('Session Expired');
-
 		clearPersistedSignInState();
 
 		return getDefaultState();
diff --git a/packages/core/__tests__/storage/SyncSessionStorage.test.ts b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
index 982988f6c22..5b27081891b 100644
--- a/packages/core/__tests__/storage/SyncSessionStorage.test.ts
+++ b/packages/core/__tests__/storage/SyncSessionStorage.test.ts
@@ -2,11 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 import { SyncSessionStorage } from '../../src/storage/SyncSessionStorage';
 
-jest.mock('@aws-amplify/core/internals/utils', () => ({
-	...jest.requireActual('@aws-amplify/core/internals/utils'),
-	isBrowser: jest.fn(() => false),
-}));
-
 describe('SyncSessionStorage', () => {
 	let sessionStorage: SyncSessionStorage;
 	const signInStateKeys: Record<string, string> = {
@@ -27,28 +22,22 @@ describe('SyncSessionStorage', () => {
 		sessionStorage = new SyncSessionStorage();
 	});
 
-	afterEach(() => {
-		sessionStorage.clear();
-	});
-
 	it('can set and retrieve item by key', () => {
 		sessionStorage.setItem(signInStateKeys.username, user1.username);
 		sessionStorage.setItem(signInStateKeys.challengeName, user1.challengeName);
 		sessionStorage.setItem(signInStateKeys.signInSession, user1.signInSession);
 		sessionStorage.setItem(signInStateKeys.expiry, user1.expiry);
 
-		expect(sessionStorage.getItem(signInStateKeys.username)).toEqual(
+		expect(sessionStorage.getItem(signInStateKeys.username)).toBe(
 			user1.username,
 		);
-		expect(sessionStorage.getItem(signInStateKeys.challengeName)).toEqual(
+		expect(sessionStorage.getItem(signInStateKeys.challengeName)).toBe(
 			user1.challengeName,
 		);
-		expect(sessionStorage.getItem(signInStateKeys.signInSession)).toEqual(
+		expect(sessionStorage.getItem(signInStateKeys.signInSession)).toBe(
 			user1.signInSession,
 		);
-		expect(sessionStorage.getItem(signInStateKeys.expiry)).toEqual(
-			user1.expiry,
-		);
+		expect(sessionStorage.getItem(signInStateKeys.expiry)).toBe(user1.expiry);
 	});
 
 	it('can override item by setting with the same key', () => {
@@ -56,23 +45,25 @@ describe('SyncSessionStorage', () => {
 		sessionStorage.setItem(signInStateKeys.username, user1.username);
 		sessionStorage.setItem(signInStateKeys.username, newUserName);
 
-		expect(sessionStorage.getItem(signInStateKeys.username)).toEqual(
-			newUserName,
-		);
+		expect(sessionStorage.getItem(signInStateKeys.username)).toBe(newUserName);
 	});
 
 	it('can remove item by key', () => {
 		const newUserName = 'joonchoi+tobedeleted';
 		sessionStorage.setItem(signInStateKeys.username, newUserName);
-		expect(sessionStorage.getItem(signInStateKeys.username)).toEqual(
-			newUserName,
-		);
+		expect(sessionStorage.getItem(signInStateKeys.username)).toBe(newUserName);
 		sessionStorage.removeItem(signInStateKeys.username);
 		expect(sessionStorage.getItem(signInStateKeys.username)).toBeNull();
 	});
 
 	it('clears all items', () => {
+		sessionStorage.setItem(signInStateKeys.username, user1.username);
+		sessionStorage.setItem(signInStateKeys.challengeName, user1.challengeName);
+		sessionStorage.setItem(signInStateKeys.signInSession, user1.signInSession);
+		sessionStorage.setItem(signInStateKeys.expiry, user1.expiry);
+
 		sessionStorage.clear();
+
 		expect(sessionStorage.getItem(signInStateKeys.username)).toBeNull();
 		expect(sessionStorage.getItem(signInStateKeys.challengeName)).toBeNull();
 		expect(sessionStorage.getItem(signInStateKeys.signInSession)).toBeNull();
diff --git a/packages/core/src/storage/SyncKeyValueStorage.ts b/packages/core/src/storage/SyncKeyValueStorage.ts
index 148fcef4451..3153e132f13 100644
--- a/packages/core/src/storage/SyncKeyValueStorage.ts
+++ b/packages/core/src/storage/SyncKeyValueStorage.ts
@@ -8,10 +8,16 @@ import { SyncStorage } from '../types';
  * @internal
  */
 export class SyncKeyValueStorage implements SyncStorage {
-	storage?: Storage;
+	_storage?: Storage;
 
 	constructor(storage?: Storage) {
-		this.storage = storage;
+		this._storage = storage;
+	}
+
+	get storage() {
+		if (!this._storage) throw new PlatformNotSupportedError();
+
+		return this._storage;
 	}
 
 	/**
@@ -21,8 +27,7 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} value that was set
 	 */
 	setItem(key: string, value: string) {
-		if (!this.storage) throw new PlatformNotSupportedError();
-		this.storage.setItem(key, value);
+		this._storage!.setItem(key, value);
 	}
 
 	/**
@@ -32,9 +37,7 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} the data item
 	 */
 	getItem(key: string) {
-		if (!this.storage) throw new PlatformNotSupportedError();
-
-		return this.storage.getItem(key);
+		return this._storage!.getItem(key);
 	}
 
 	/**
@@ -43,8 +46,7 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} value - value that was deleted
 	 */
 	removeItem(key: string) {
-		if (!this.storage) throw new PlatformNotSupportedError();
-		this.storage.removeItem(key);
+		this._storage!.removeItem(key);
 	}
 
 	/**
@@ -52,7 +54,6 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} nothing
 	 */
 	clear() {
-		if (!this.storage) throw new PlatformNotSupportedError();
-		this.storage.clear();
+		this._storage!.clear();
 	}
 }

From c4b043a1e477b26c6bc2e5c29820dd0c5522bd13 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 28 Aug 2024 10:15:46 -0700
Subject: [PATCH 29/40] Adjust bundle size limit

---
 packages/aws-amplify/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
index 414bf2adf0b..9c1f6f186b9 100644
--- a/packages/aws-amplify/package.json
+++ b/packages/aws-amplify/package.json
@@ -497,7 +497,7 @@
 			"name": "[Storage] uploadData (S3)",
 			"path": "./dist/esm/storage/index.mjs",
 			"import": "{ uploadData }",
-			"limit": "19.95 kB"
+			"limit": "19.99 kB"
 		}
 	]
 }

From 3e54290af96a640a9182bd080fd7238f536a09df Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 28 Aug 2024 12:09:47 -0700
Subject: [PATCH 30/40] Remove redundancy, fix annotation

---
 packages/auth/src/providers/cognito/utils/signInStore.ts | 1 -
 packages/core/src/storage/SyncKeyValueStorage.ts         | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index fcfc0c59609..2d44a1755b8 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -103,7 +103,6 @@ const clearPersistedSignInState = () => {
 // Clear saved sign in states from both memory and Synced Session Storage
 export function cleanActiveSignInState(): void {
 	signInStore.dispatch({ type: 'RESET_STATE' });
-	clearPersistedSignInState();
 }
 
 const getDefaultState = (): SignInState => ({
diff --git a/packages/core/src/storage/SyncKeyValueStorage.ts b/packages/core/src/storage/SyncKeyValueStorage.ts
index 3153e132f13..33885f2af31 100644
--- a/packages/core/src/storage/SyncKeyValueStorage.ts
+++ b/packages/core/src/storage/SyncKeyValueStorage.ts
@@ -27,7 +27,7 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} value that was set
 	 */
 	setItem(key: string, value: string) {
-		this._storage!.setItem(key, value);
+		this.storage.setItem(key, value);
 	}
 
 	/**
@@ -37,7 +37,7 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} the data item
 	 */
 	getItem(key: string) {
-		return this._storage!.getItem(key);
+		return this.storage.getItem(key);
 	}
 
 	/**
@@ -46,7 +46,7 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} value - value that was deleted
 	 */
 	removeItem(key: string) {
-		this._storage!.removeItem(key);
+		this.storage.removeItem(key);
 	}
 
 	/**
@@ -54,6 +54,6 @@ export class SyncKeyValueStorage implements SyncStorage {
 	 * @returns {string} nothing
 	 */
 	clear() {
-		this._storage!.clear();
+		this.storage.clear();
 	}
 }

From 9f488c5edc8362981e10e91234027892f0112508 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Wed, 28 Aug 2024 15:57:19 -0700
Subject: [PATCH 31/40] Replace cleanActiveSignInState()

---
 .../providers/cognito/signInResumable.test.ts |  9 +++--
 .../cognito/signInStateManagement.test.ts     |  7 ++--
 .../providers/cognito/apis/confirmSignIn.ts   |  9 ++---
 .../cognito/apis/signInWithCustomAuth.ts      |  9 ++---
 .../cognito/apis/signInWithCustomSRPAuth.ts   |  9 ++---
 .../providers/cognito/apis/signInWithSRP.ts   |  9 ++---
 .../cognito/apis/signInWithUserPassword.ts    |  9 ++---
 .../providers/cognito/utils/signInStore.ts    | 35 ++++++++-----------
 8 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
index 1900319b81d..8198046a5e8 100644
--- a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
@@ -3,7 +3,6 @@
 import { Amplify, syncSessionStorage } from '@aws-amplify/core';
 
 import {
-	cleanActiveSignInState,
 	setActiveSignInState,
 	signInStore,
 } from '../../../src/providers/cognito/utils/signInStore';
@@ -136,7 +135,7 @@ describe('signInStore', () => {
 			signInSession: undefined,
 			username: undefined,
 		});
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 	});
 
 	test('State is set after calling setActiveSignInState', async () => {
@@ -150,7 +149,7 @@ describe('signInStore', () => {
 		expect(localSignInState).toEqual(user1);
 		expect(persistSignInStateSpy).toHaveBeenCalledTimes(1);
 		expect(persistSignInStateSpy).toHaveBeenCalledWith(user1);
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 	});
 
 	test('State is updated after calling SignIn', async () => {
@@ -197,7 +196,7 @@ describe('signInStore', () => {
 			challengeName: user1.challengeName,
 			signInSession: user1.signInSession,
 		});
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 	});
 
 	test('sign-in store should return undefined state when the sign-in session is expired', async () => {
@@ -210,7 +209,7 @@ describe('signInStore', () => {
 			challengeName: undefined,
 			signInSession: undefined,
 		});
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 	});
 
 	test('State SignInSession is updated after dispatching custom session value', () => {
diff --git a/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts b/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts
index 380817cbd37..3eb89a3b71c 100644
--- a/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInStateManagement.test.ts
@@ -5,10 +5,7 @@ import { Amplify } from '@aws-amplify/core';
 
 import { getCurrentUser, signIn } from '../../../src/providers/cognito';
 import * as signInHelpers from '../../../src/providers/cognito/utils/signInHelpers';
-import {
-	cleanActiveSignInState,
-	signInStore,
-} from '../../../src/providers/cognito/utils/signInStore';
+import { signInStore } from '../../../src/providers/cognito/utils/signInStore';
 import { RespondToAuthChallengeCommandOutput } from '../../../src/providers/cognito/utils/clients/CognitoIdentityProvider/types';
 import { cognitoUserPoolsTokenProvider } from '../../../src/providers/cognito/tokenProvider';
 
@@ -33,7 +30,7 @@ describe('local sign-in state management tests', () => {
 
 	beforeEach(() => {
 		cognitoUserPoolsTokenProvider.setAuthConfig(authConfig);
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 	});
 
 	test('local state management should return state after signIn returns a ChallengeName', async () => {
diff --git a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
index 6aad224af30..d494478b246 100644
--- a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
+++ b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
@@ -10,11 +10,7 @@ import {
 	VerifySoftwareTokenException,
 } from '../types/errors';
 import { ConfirmSignInInput, ConfirmSignInOutput } from '../types';
-import {
-	cleanActiveSignInState,
-	setActiveSignInState,
-	signInStore,
-} from '../utils/signInStore';
+import { setActiveSignInState, signInStore } from '../utils/signInStore';
 import { AuthError } from '../../../errors/AuthError';
 import {
 	getNewDeviceMetatada,
@@ -109,7 +105,8 @@ export async function confirmSignIn(
 		});
 
 		if (AuthenticationResult) {
-			cleanActiveSignInState();
+			signInStore.dispatch({ type: 'RESET_STATE' });
+
 			await cacheCognitoTokens({
 				username,
 				...AuthenticationResult,
diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
index e55e3f0a50d..15aa4e2e22e 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
@@ -21,10 +21,7 @@ import {
 	SignInWithCustomAuthInput,
 	SignInWithCustomAuthOutput,
 } from '../types';
-import {
-	cleanActiveSignInState,
-	setActiveSignInState,
-} from '../utils/signInStore';
+import { setActiveSignInState, signInStore } from '../utils/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import {
 	ChallengeName,
@@ -84,7 +81,7 @@ export async function signInWithCustomAuth(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
-			cleanActiveSignInState();
+			signInStore.dispatch({ type: 'RESET_STATE' });
 
 			await cacheCognitoTokens({
 				username: activeUsername,
@@ -110,7 +107,7 @@ export async function signInWithCustomAuth(
 			challengeParameters: retiredChallengeParameters as ChallengeParameters,
 		});
 	} catch (error) {
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 		assertServiceError(error);
 		const result = getSignInResultFromError(error.name);
 		if (result) return result;
diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
index a67fa9f861c..a51a25db51e 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
@@ -23,10 +23,7 @@ import {
 	SignInWithCustomSRPAuthInput,
 	SignInWithCustomSRPAuthOutput,
 } from '../types';
-import {
-	cleanActiveSignInState,
-	setActiveSignInState,
-} from '../utils/signInStore';
+import { setActiveSignInState, signInStore } from '../utils/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import {
 	ChallengeName,
@@ -89,6 +86,7 @@ export async function signInWithCustomSRPAuth(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
+			signInStore.dispatch({ type: 'RESET_STATE' });
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...AuthenticationResult,
@@ -99,7 +97,6 @@ export async function signInWithCustomSRPAuth(
 				),
 				signInDetails,
 			});
-			cleanActiveSignInState();
 
 			await dispatchSignedInHubEvent();
 
@@ -114,7 +111,7 @@ export async function signInWithCustomSRPAuth(
 			challengeParameters: handledChallengeParameters as ChallengeParameters,
 		});
 	} catch (error) {
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 		assertServiceError(error);
 		const result = getSignInResultFromError(error.name);
 		if (result) return result;
diff --git a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
index 32f0ca11b99..c1683eb6371 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
@@ -27,10 +27,7 @@ import {
 	SignInWithSRPInput,
 	SignInWithSRPOutput,
 } from '../types';
-import {
-	cleanActiveSignInState,
-	setActiveSignInState,
-} from '../utils/signInStore';
+import { setActiveSignInState, signInStore } from '../utils/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import { tokenOrchestrator } from '../tokenProvider';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
@@ -89,7 +86,7 @@ export async function signInWithSRP(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
-			cleanActiveSignInState();
+			signInStore.dispatch({ type: 'RESET_STATE' });
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...AuthenticationResult,
@@ -114,7 +111,7 @@ export async function signInWithSRP(
 			challengeParameters: handledChallengeParameters as ChallengeParameters,
 		});
 	} catch (error) {
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 		assertServiceError(error);
 		const result = getSignInResultFromError(error.name);
 		if (result) return result;
diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
index e1de730cb1c..45e95060bd0 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
@@ -25,10 +25,7 @@ import {
 	SignInWithUserPasswordInput,
 	SignInWithUserPasswordOutput,
 } from '../types';
-import {
-	cleanActiveSignInState,
-	setActiveSignInState,
-} from '../utils/signInStore';
+import { setActiveSignInState, signInStore } from '../utils/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import { tokenOrchestrator } from '../tokenProvider';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
@@ -84,6 +81,7 @@ export async function signInWithUserPassword(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
+			signInStore.dispatch({ type: 'RESET_STATE' });
 			await cacheCognitoTokens({
 				...AuthenticationResult,
 				username: activeUsername,
@@ -94,7 +92,6 @@ export async function signInWithUserPassword(
 				),
 				signInDetails,
 			});
-			cleanActiveSignInState();
 
 			await dispatchSignedInHubEvent();
 
@@ -109,7 +106,7 @@ export async function signInWithUserPassword(
 			challengeParameters: retriedChallengeParameters as ChallengeParameters,
 		});
 	} catch (error) {
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 		assertServiceError(error);
 		const result = getSignInResultFromError(error.name);
 		if (result) return result;
diff --git a/packages/auth/src/providers/cognito/utils/signInStore.ts b/packages/auth/src/providers/cognito/utils/signInStore.ts
index 2d44a1755b8..fb0d1d97114 100644
--- a/packages/auth/src/providers/cognito/utils/signInStore.ts
+++ b/packages/auth/src/providers/cognito/utils/signInStore.ts
@@ -32,12 +32,12 @@ type Reducer<State, Action> = (state: State, action: Action) => State;
 
 // Minutes until stored session invalidates
 const MS_TO_EXPIRY = 3 * 60 * 1000; // 3 mins
-const tgtState = 'CognitoSignInState';
-const signInStateKeys = {
-	username: `${tgtState}.username`,
-	challengeName: `${tgtState}.challengeName`,
-	signInSession: `${tgtState}.signInSession`,
-	expiry: `${tgtState}.expiry`,
+const TGT_STATE = 'CognitoSignInState';
+const SIGN_IN_STATE_KEYS = {
+	username: `${TGT_STATE}.username`,
+	challengeName: `${TGT_STATE}.challengeName`,
+	signInSession: `${TGT_STATE}.signInSession`,
+	expiry: `${TGT_STATE}.expiry`,
 };
 
 const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
@@ -95,16 +95,11 @@ const isExpired = (expiryDate: string | null): boolean => {
 };
 
 const clearPersistedSignInState = () => {
-	for (const storedKey of Object.values(signInStateKeys)) {
+	for (const storedKey of Object.values(SIGN_IN_STATE_KEYS)) {
 		syncSessionStorage.removeItem(storedKey);
 	}
 };
 
-// Clear saved sign in states from both memory and Synced Session Storage
-export function cleanActiveSignInState(): void {
-	signInStore.dispatch({ type: 'RESET_STATE' });
-}
-
 const getDefaultState = (): SignInState => ({
 	username: undefined,
 	challengeName: undefined,
@@ -113,7 +108,7 @@ const getDefaultState = (): SignInState => ({
 
 // Hydrate signInStore from Synced Session Storage
 const initializeState = (): SignInState => {
-	const expiry = syncSessionStorage.getItem(signInStateKeys.expiry);
+	const expiry = syncSessionStorage.getItem(SIGN_IN_STATE_KEYS.expiry);
 
 	if (!expiry || (expiry && isExpired(expiry))) {
 		clearPersistedSignInState();
@@ -121,13 +116,13 @@ const initializeState = (): SignInState => {
 		return getDefaultState();
 	} else {
 		const username =
-			syncSessionStorage.getItem(signInStateKeys.username) ?? undefined;
+			syncSessionStorage.getItem(SIGN_IN_STATE_KEYS.username) ?? undefined;
 
 		const challengeName = (syncSessionStorage.getItem(
-			signInStateKeys.challengeName,
+			SIGN_IN_STATE_KEYS.challengeName,
 		) ?? undefined) as ChallengeName;
 		const signInSession =
-			syncSessionStorage.getItem(signInStateKeys.signInSession) ?? undefined;
+			syncSessionStorage.getItem(SIGN_IN_STATE_KEYS.signInSession) ?? undefined;
 
 		return {
 			username,
@@ -163,16 +158,16 @@ export const persistSignInState = ({
 	signInSession,
 	username,
 }: SignInState) => {
-	username && syncSessionStorage.setItem(signInStateKeys.username, username);
+	username && syncSessionStorage.setItem(SIGN_IN_STATE_KEYS.username, username);
 	challengeName &&
-		syncSessionStorage.setItem(signInStateKeys.challengeName, challengeName);
+		syncSessionStorage.setItem(SIGN_IN_STATE_KEYS.challengeName, challengeName);
 
 	if (signInSession) {
-		syncSessionStorage.setItem(signInStateKeys.signInSession, signInSession);
+		syncSessionStorage.setItem(SIGN_IN_STATE_KEYS.signInSession, signInSession);
 
 		// Updates expiry when session is passed
 		syncSessionStorage.setItem(
-			signInStateKeys.expiry,
+			SIGN_IN_STATE_KEYS.expiry,
 			String(Date.now() + MS_TO_EXPIRY),
 		);
 	}

From 6168bcbd5d6ea8cf38c47e97cb7c790a1f40b147 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Thu, 29 Aug 2024 02:00:02 -0700
Subject: [PATCH 32/40] Enable CI for Resumable SMS MFA

---
 .github/integ-config/integ-all.yml    | 8 ++++++++
 .github/workflows/push-integ-test.yml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
index 00c0f3bf598..fc1511da9be 100644
--- a/.github/integ-config/integ-all.yml
+++ b/.github/integ-config/integ-all.yml
@@ -602,6 +602,14 @@ tests:
     sample_name: [subdomains]
     spec: subdomains
     browser: [chrome]
+  - test_name: integ_next_auth_sign_in_with_sms_mfa
+    desc: 'Resumable sign in with SMS MFA flow'
+    framework: next
+    category: auth
+    sample_name: [auth-mfa]
+    spec: auth-mfa
+    browser: *minimal_browser_list
+
 
   # DISABLED Angular/Vue tests:
   # TODO: delete tests or add custom ui logic to support them.
diff --git a/.github/workflows/push-integ-test.yml b/.github/workflows/push-integ-test.yml
index 03e43dd2865..32e2ccca176 100644
--- a/.github/workflows/push-integ-test.yml
+++ b/.github/workflows/push-integ-test.yml
@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - replace-with-your-branch
+      - joonwonc/auth-resumable-smsmfa
 
 jobs:
   e2e:

From 92ce212e804103e528255c2bfae05f4a66e18343 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Thu, 12 Sep 2024 01:15:28 -0700
Subject: [PATCH 33/40] Modify dependency to foundations

---
 .../__tests__/providers/cognito/signInResumable.test.ts     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
index 8198046a5e8..92f2170a9c6 100644
--- a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
@@ -10,7 +10,7 @@ import { cognitoUserPoolsTokenProvider } from '../../../src/providers/cognito/to
 import {
 	ChallengeName,
 	RespondToAuthChallengeCommandOutput,
-} from '../../../src/providers/cognito/utils/clients/CognitoIdentityProvider/types';
+} from '../../../src/foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import * as signInHelpers from '../../../src/providers/cognito/utils/signInHelpers';
 import { signIn } from '../../../src/providers/cognito';
 
@@ -40,10 +40,6 @@ jest.mock('@aws-amplify/core', () => ({
 	},
 }));
 
-jest.mock(
-	'../../../src/providers/cognito/utils/clients/CognitoIdentityProvider',
-);
-
 const signInStateKeys: Record<string, string> = {
 	username: 'CognitoSignInState.username',
 	challengeName: 'CognitoSignInState.challengeName',

From 224f1480a18ce8f49fde8cf19835ace7fbc7befe Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 13 Sep 2024 10:12:20 -0700
Subject: [PATCH 34/40] Update Integ

---
 .github/integ-config/integ-all.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
index e4a4578171d..1be0da3faa0 100644
--- a/.github/integ-config/integ-all.yml
+++ b/.github/integ-config/integ-all.yml
@@ -620,9 +620,9 @@ tests:
     desc: 'Resumable sign in with SMS MFA flow'
     framework: next
     category: auth
-    sample_name: [auth-mfa]
-    spec: auth-mfa
-    browser: *minimal_browser_list
+    sample_name: [mfa]
+    spec: sign-in-resumable-mfa
+    browser: [chrome]
 
   # DISABLED Angular/Vue tests:
   # TODO: delete tests or add custom ui logic to support them.

From 0b0c5189a5b8593c28d6abc1d157822232b89b87 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <joonwonc@amazon.com>
Date: Fri, 13 Sep 2024 10:25:25 -0700
Subject: [PATCH 35/40] Revert

---
 .github/workflows/push-integ-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-integ-test.yml b/.github/workflows/push-integ-test.yml
index 32e2ccca176..03e43dd2865 100644
--- a/.github/workflows/push-integ-test.yml
+++ b/.github/workflows/push-integ-test.yml
@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - joonwonc/auth-resumable-smsmfa
+      - replace-with-your-branch
 
 jobs:
   e2e:

From fb7652521a5e8c9b125dbbce7cf991e745aad7e0 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <13882232+joon-won@users.noreply.github.com>
Date: Thu, 5 Dec 2024 16:54:08 -0800
Subject: [PATCH 36/40] Rebase and add utility for ResumableSignIn

---
 package.json                                    |  1 +
 .../cognito/confirmSignInErrorCases.test.ts     |  2 +-
 .../providers/cognito/signInResumable.test.ts   |  4 ++--
 .../cognito/signInWithUserAuth.test.ts          |  1 -
 .../userAuth/handleWebAuthnSignInResult.ts      |  8 ++------
 .../auth/src/client/utils/store/signInStore.ts  | 14 +++-----------
 .../src/providers/cognito/apis/confirmSignIn.ts | 11 ++++-------
 .../cognito/apis/signInWithCustomAuth.ts        |  8 ++------
 .../cognito/apis/signInWithCustomSRPAuth.ts     |  8 ++------
 .../src/providers/cognito/apis/signInWithSRP.ts | 13 ++-----------
 .../cognito/apis/signInWithUserAuth.ts          |  6 +++---
 .../cognito/apis/signInWithUserPassword.ts      | 17 ++---------------
 packages/aws-amplify/package.json               | 16 ++--------------
 13 files changed, 26 insertions(+), 83 deletions(-)

diff --git a/package.json b/package.json
index dadc2b31ccf..36c32b68dd5 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
 		"bootstrap": "lerna bootstrap",
 		"test": "yarn test:no-datastore && yarn test:datastore && yarn test:license && yarn test:github-actions && yarn test:tsc-compliance",
 		"test:no-datastore": "lerna run test --stream --ignore @aws-amplify/datastore",
+		"test:auth": "lerna run test --stream --scope @aws-amplify/auth",
 		"test:datastore": "lerna run test --stream --scope @aws-amplify/datastore",
 		"test:size": "lerna run test:size --no-bail",
 		"test:duplicates": "./scripts/duplicates-yarn.sh",
diff --git a/packages/auth/__tests__/providers/cognito/confirmSignInErrorCases.test.ts b/packages/auth/__tests__/providers/cognito/confirmSignInErrorCases.test.ts
index ce786ece3cb..44fdf58436f 100644
--- a/packages/auth/__tests__/providers/cognito/confirmSignInErrorCases.test.ts
+++ b/packages/auth/__tests__/providers/cognito/confirmSignInErrorCases.test.ts
@@ -16,7 +16,7 @@ jest.mock('@aws-amplify/core', () => ({
 	...(jest.createMockFromModule('@aws-amplify/core') as object),
 	Amplify: { getConfig: jest.fn(() => ({})) },
 }));
-jest.mock('../../../src/client/utils/store');
+jest.mock('../../../src/client/utils/store/signInStore');
 jest.mock(
 	'../../../src/foundation/factories/serviceClients/cognitoIdentityProvider',
 );
diff --git a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
index 92f2170a9c6..65478192b58 100644
--- a/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInResumable.test.ts
@@ -5,7 +5,7 @@ import { Amplify, syncSessionStorage } from '@aws-amplify/core';
 import {
 	setActiveSignInState,
 	signInStore,
-} from '../../../src/providers/cognito/utils/signInStore';
+} from '../../../src/client/utils/store/signInStore';
 import { cognitoUserPoolsTokenProvider } from '../../../src/providers/cognito/tokenProvider';
 import {
 	ChallengeName,
@@ -17,7 +17,7 @@ import { signIn } from '../../../src/providers/cognito';
 import { setUpGetConfig } from './testUtils/setUpGetConfig';
 import { authAPITestParams } from './testUtils/authApiTestParams';
 
-const signInStoreImplementation = require('../../../src/providers/cognito/utils/signInStore');
+const signInStoreImplementation = require('../../../src/client/utils/store/signInStore');
 
 jest.mock('@aws-amplify/core/internals/utils');
 jest.mock('../../../src/providers/cognito/apis/getCurrentUser');
diff --git a/packages/auth/__tests__/providers/cognito/signInWithUserAuth.test.ts b/packages/auth/__tests__/providers/cognito/signInWithUserAuth.test.ts
index 66a080ecebd..380d6f1ef76 100644
--- a/packages/auth/__tests__/providers/cognito/signInWithUserAuth.test.ts
+++ b/packages/auth/__tests__/providers/cognito/signInWithUserAuth.test.ts
@@ -9,7 +9,6 @@ import { InitiateAuthCommandOutput } from '../../../src/foundation/factories/ser
 
 jest.mock('../../../src/providers/cognito/utils/signInHelpers', () => ({
 	...jest.requireActual('../../../src/providers/cognito/utils/signInHelpers'),
-	cleanActiveSignInState: jest.fn(),
 	setActiveSignInState: jest.fn(),
 	getNewDeviceMetadata: jest.fn(),
 	getActiveSignInUsername: jest.fn(username => username),
diff --git a/packages/auth/src/client/flows/userAuth/handleWebAuthnSignInResult.ts b/packages/auth/src/client/flows/userAuth/handleWebAuthnSignInResult.ts
index 2e67a52a5ab..ee3bc6e6b6c 100644
--- a/packages/auth/src/client/flows/userAuth/handleWebAuthnSignInResult.ts
+++ b/packages/auth/src/client/flows/userAuth/handleWebAuthnSignInResult.ts
@@ -21,11 +21,7 @@ import {
 	getNewDeviceMetadata,
 	getSignInResult,
 } from '../../../providers/cognito/utils/signInHelpers';
-import {
-	cleanActiveSignInState,
-	setActiveSignInState,
-	signInStore,
-} from '../../../client/utils/store';
+import { setActiveSignInState, signInStore } from '../../../client/utils/store';
 import { AuthSignInOutput } from '../../../types';
 import { getAuthUserAgentValue } from '../../../utils';
 import { getPasskey } from '../../utils/passkey';
@@ -106,7 +102,7 @@ export async function handleWebAuthnSignInResult(
 			}),
 			signInDetails,
 		});
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 		await dispatchSignedInHubEvent();
 
 		return {
diff --git a/packages/auth/src/client/utils/store/signInStore.ts b/packages/auth/src/client/utils/store/signInStore.ts
index c5f9129041c..5680274c5a1 100644
--- a/packages/auth/src/client/utils/store/signInStore.ts
+++ b/packages/auth/src/client/utils/store/signInStore.ts
@@ -1,7 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { CognitoAuthSignInDetails } from '../../../providers/cognito/types';
+
 import { syncSessionStorage } from '@aws-amplify/core';
+
+import { CognitoAuthSignInDetails } from '../../../providers/cognito/types';
 import { ChallengeName } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 
 import { Reducer, Store } from './types';
@@ -22,15 +24,6 @@ type SignInAction =
 	| { type: 'SET_SIGN_IN_SESSION'; value?: string }
 	| { type: 'RESET_STATE' };
 
-<<<<<<< HEAD:packages/auth/src/client/utils/store/signInStore.ts
-=======
-type Store<State, Action> = (reducer: Reducer<State, Action>) => {
-	getState(): ReturnType<Reducer<State, Action>>;
-	dispatch(action: Action): void;
-};
-
-type Reducer<State, Action> = (state: State, action: Action) => State;
-
 // Minutes until stored session invalidates
 const MS_TO_EXPIRY = 3 * 60 * 1000; // 3 mins
 const TGT_STATE = 'CognitoSignInState';
@@ -41,7 +34,6 @@ const SIGN_IN_STATE_KEYS = {
 	expiry: `${TGT_STATE}.expiry`,
 };
 
->>>>>>> joonwonc/auth-resumable-signin:packages/auth/src/providers/cognito/utils/signInStore.ts
 const signInReducer: Reducer<SignInState, SignInAction> = (state, action) => {
 	switch (action.type) {
 		case 'SET_SIGN_IN_SESSION':
diff --git a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
index 9216400a736..4916f8895d6 100644
--- a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
+++ b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
@@ -10,15 +10,10 @@ import {
 	VerifySoftwareTokenException,
 } from '../types/errors';
 import { ConfirmSignInInput, ConfirmSignInOutput } from '../types';
-<<<<<<< HEAD
 import {
-	cleanActiveSignInState,
 	setActiveSignInState,
 	signInStore,
-} from '../../../client/utils/store';
-=======
-import { setActiveSignInState, signInStore } from '../utils/signInStore';
->>>>>>> joonwonc/auth-resumable-signin
+} from '../../../client/utils/store/signInStore';
 import { AuthError } from '../../../errors/AuthError';
 import {
 	getNewDeviceMetadata,
@@ -70,7 +65,8 @@ export async function confirmSignIn(
 		AuthValidationErrorCode.EmptyChallengeResponse,
 	);
 
-	if (!username || !challengeName || !signInSession)
+	if (!username || !challengeName || !signInSession) {
+		console.warn(username, challengeName, signInSession);
 		// TODO: remove this error message for production apps
 		throw new AuthError({
 			name: AuthErrorCodes.SignInException,
@@ -86,6 +82,7 @@ export async function confirmSignIn(
 				'Make sure a successful call to signIn is made before calling confirmSignIn' +
 				'and that the page is not refreshed until the sign in process is done.',
 		});
+	}
 
 	try {
 		const {
diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
index b96408aee44..9973998146f 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
@@ -21,14 +21,10 @@ import {
 	SignInWithCustomAuthInput,
 	SignInWithCustomAuthOutput,
 } from '../types';
-<<<<<<< HEAD
 import {
-	cleanActiveSignInState,
 	setActiveSignInState,
-} from '../../../client/utils/store';
-=======
-import { setActiveSignInState, signInStore } from '../utils/signInStore';
->>>>>>> joonwonc/auth-resumable-signin
+	signInStore,
+} from '../../../client/utils/store/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import {
 	ChallengeName,
diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
index b538090b5cb..1d8657e54b5 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
@@ -23,14 +23,10 @@ import {
 	SignInWithCustomSRPAuthInput,
 	SignInWithCustomSRPAuthOutput,
 } from '../types';
-<<<<<<< HEAD
 import {
-	cleanActiveSignInState,
 	setActiveSignInState,
-} from '../../../client/utils/store';
-=======
-import { setActiveSignInState, signInStore } from '../utils/signInStore';
->>>>>>> joonwonc/auth-resumable-signin
+	signInStore,
+} from '../../../client/utils/store/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import {
 	ChallengeName,
diff --git a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
index e4c2ac614a0..f73eeac3e48 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
@@ -27,14 +27,10 @@ import {
 	SignInWithSRPInput,
 	SignInWithSRPOutput,
 } from '../types';
-<<<<<<< HEAD
 import {
-	cleanActiveSignInState,
 	setActiveSignInState,
-} from '../../../client/utils/store';
-=======
-import { setActiveSignInState, signInStore } from '../utils/signInStore';
->>>>>>> joonwonc/auth-resumable-signin
+	signInStore,
+} from '../../../client/utils/store/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import { tokenOrchestrator } from '../tokenProvider';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
@@ -123,12 +119,7 @@ export async function signInWithSRP(
 			challengeParameters: handledChallengeParameters as ChallengeParameters,
 		});
 	} catch (error) {
-<<<<<<< HEAD
-		cleanActiveSignInState();
-		resetAutoSignIn();
-=======
 		signInStore.dispatch({ type: 'RESET_STATE' });
->>>>>>> joonwonc/auth-resumable-signin
 		assertServiceError(error);
 		const result = getSignInResultFromError(error.name);
 		if (result) return result;
diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts
index 9ac1223a105..f4a9acf4e92 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts
@@ -28,8 +28,8 @@ import {
 } from '../types';
 import {
 	autoSignInStore,
-	cleanActiveSignInState,
 	setActiveSignInState,
+	signInStore,
 } from '../../../client/utils/store';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
@@ -100,7 +100,7 @@ export async function signInWithUserAuth(
 		});
 
 		if (response.AuthenticationResult) {
-			cleanActiveSignInState();
+			signInStore.dispatch({ type: 'RESET_STATE' });
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...response.AuthenticationResult,
@@ -131,7 +131,7 @@ export async function signInWithUserAuth(
 					: undefined,
 		});
 	} catch (error) {
-		cleanActiveSignInState();
+		signInStore.dispatch({ type: 'RESET_STATE' });
 		resetAutoSignIn();
 		assertServiceError(error);
 		const result = getSignInResultFromError(error.name);
diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
index 87a9ba29f50..6f2fe3332d0 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
@@ -25,14 +25,10 @@ import {
 	SignInWithUserPasswordInput,
 	SignInWithUserPasswordOutput,
 } from '../types';
-<<<<<<< HEAD
 import {
-	cleanActiveSignInState,
 	setActiveSignInState,
-} from '../../../client/utils/store';
-=======
-import { setActiveSignInState, signInStore } from '../utils/signInStore';
->>>>>>> joonwonc/auth-resumable-signin
+	signInStore,
+} from '../../../client/utils/store/signInStore';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import { tokenOrchestrator } from '../tokenProvider';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
@@ -90,11 +86,7 @@ export async function signInWithUserPassword(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
-<<<<<<< HEAD
-			cleanActiveSignInState();
-=======
 			signInStore.dispatch({ type: 'RESET_STATE' });
->>>>>>> joonwonc/auth-resumable-signin
 			await cacheCognitoTokens({
 				...AuthenticationResult,
 				username: activeUsername,
@@ -122,12 +114,7 @@ export async function signInWithUserPassword(
 			challengeParameters: retriedChallengeParameters as ChallengeParameters,
 		});
 	} catch (error) {
-<<<<<<< HEAD
-		cleanActiveSignInState();
-		resetAutoSignIn();
-=======
 		signInStore.dispatch({ type: 'RESET_STATE' });
->>>>>>> joonwonc/auth-resumable-signin
 		assertServiceError(error);
 		const result = getSignInResultFromError(error.name);
 		if (result) return result;
diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
index 6b47ede04fa..d00bf8e2379 100644
--- a/packages/aws-amplify/package.json
+++ b/packages/aws-amplify/package.json
@@ -383,11 +383,7 @@
 			"name": "[Auth] confirmSignIn (Cognito)",
 			"path": "./dist/esm/auth/index.mjs",
 			"import": "{ confirmSignIn }",
-<<<<<<< HEAD
-			"limit": "28.46 kB"
-=======
 			"limit": "28.60 kB"
->>>>>>> joonwonc/auth-resumable-signin
 		},
 		{
 			"name": "[Auth] updateMFAPreference (Cognito)",
@@ -453,11 +449,7 @@
 			"name": "[Auth] Basic Auth Flow (Cognito)",
 			"path": "./dist/esm/auth/index.mjs",
 			"import": "{ signIn, signOut, fetchAuthSession, confirmSignIn }",
-<<<<<<< HEAD
-			"limit": "30.56 kB"
-=======
-			"limit": "30.45 kB"
->>>>>>> joonwonc/auth-resumable-signin
+			"limit": "30.87 kB"
 		},
 		{
 			"name": "[Auth] OAuth Auth Flow (Cognito)",
@@ -523,11 +515,7 @@
 			"name": "[Storage] uploadData (S3)",
 			"path": "./dist/esm/storage/index.mjs",
 			"import": "{ uploadData }",
-<<<<<<< HEAD
-			"limit": "22.81 kB"
-=======
-			"limit": "19.99 kB"
->>>>>>> joonwonc/auth-resumable-signin
+			"limit": "22.84 kB"
 		}
 	]
 }

From 1aa12e2f81b2cc870a84e050f97d746ac0be83b1 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <13882232+joon-won@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:15:06 -0800
Subject: [PATCH 37/40] Update resumablesignin integ test

---
 .github/integ-config/integ-all.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
index 503c1692ebf..fb1467bcb6f 100644
--- a/.github/integ-config/integ-all.yml
+++ b/.github/integ-config/integ-all.yml
@@ -622,7 +622,9 @@ tests:
     category: auth
     sample_name: [mfa]
     spec: sign-in-resumable-mfa
-    browser: [chrome]
+    browser: *minimal_browser_list
+    env:
+      NEXT_PUBLIC_BACKEND_CONFIG: resum-signin
 
   # DISABLED Angular/Vue tests:
   # TODO: delete tests or add custom ui logic to support them.

From d7a05a3d573d46499d756f79394231c476d30a9b Mon Sep 17 00:00:00 2001
From: JoonWon Choi <13882232+joon-won@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:33:38 -0800
Subject: [PATCH 38/40] Move cleansigninstate after async

---
 packages/auth/src/providers/cognito/apis/confirmSignIn.ts     | 4 ++--
 .../auth/src/providers/cognito/apis/signInWithCustomAuth.ts   | 4 ++--
 packages/auth/src/providers/cognito/apis/signInWithSRP.ts     | 3 ++-
 .../auth/src/providers/cognito/apis/signInWithUserAuth.ts     | 4 +++-
 .../auth/src/providers/cognito/apis/signInWithUserPassword.ts | 3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
index 4916f8895d6..49d49737a71 100644
--- a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
+++ b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
@@ -110,8 +110,6 @@ export async function confirmSignIn(
 		});
 
 		if (AuthenticationResult) {
-			signInStore.dispatch({ type: 'RESET_STATE' });
-
 			await cacheCognitoTokens({
 				username,
 				...AuthenticationResult,
@@ -124,6 +122,8 @@ export async function confirmSignIn(
 				signInDetails,
 			});
 
+			signInStore.dispatch({ type: 'RESET_STATE' });
+
 			await dispatchSignedInHubEvent();
 
 			return {
diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
index 9973998146f..f941a38b6ea 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
@@ -84,8 +84,6 @@ export async function signInWithCustomAuth(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
-			signInStore.dispatch({ type: 'RESET_STATE' });
-
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...AuthenticationResult,
@@ -98,6 +96,8 @@ export async function signInWithCustomAuth(
 				signInDetails,
 			});
 
+			signInStore.dispatch({ type: 'RESET_STATE' });
+
 			await dispatchSignedInHubEvent();
 
 			return {
diff --git a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
index f73eeac3e48..965d5e7b5d3 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
@@ -91,7 +91,6 @@ export async function signInWithSRP(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
-			signInStore.dispatch({ type: 'RESET_STATE' });
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...AuthenticationResult,
@@ -104,6 +103,8 @@ export async function signInWithSRP(
 				signInDetails,
 			});
 
+			signInStore.dispatch({ type: 'RESET_STATE' });
+
 			await dispatchSignedInHubEvent();
 
 			resetAutoSignIn();
diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts
index f4a9acf4e92..b2deced0aa1 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithUserAuth.ts
@@ -100,7 +100,6 @@ export async function signInWithUserAuth(
 		});
 
 		if (response.AuthenticationResult) {
-			signInStore.dispatch({ type: 'RESET_STATE' });
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...response.AuthenticationResult,
@@ -112,6 +111,9 @@ export async function signInWithUserAuth(
 				}),
 				signInDetails,
 			});
+
+			signInStore.dispatch({ type: 'RESET_STATE' });
+
 			await dispatchSignedInHubEvent();
 
 			resetAutoSignIn();
diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
index 6f2fe3332d0..2c099fdaba3 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
@@ -86,7 +86,6 @@ export async function signInWithUserPassword(
 			signInDetails,
 		});
 		if (AuthenticationResult) {
-			signInStore.dispatch({ type: 'RESET_STATE' });
 			await cacheCognitoTokens({
 				...AuthenticationResult,
 				username: activeUsername,
@@ -99,6 +98,8 @@ export async function signInWithUserPassword(
 				signInDetails,
 			});
 
+			signInStore.dispatch({ type: 'RESET_STATE' });
+
 			await dispatchSignedInHubEvent();
 
 			resetAutoSignIn();

From c677dc59dfe4551b29211df61b0ac4046dba58c0 Mon Sep 17 00:00:00 2001
From: JoonWon Choi <13882232+joon-won@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:46:18 -0800
Subject: [PATCH 39/40] Remove cleansigninstate

---
 packages/auth/src/providers/cognito/apis/confirmSignIn.ts      | 1 -
 .../auth/src/providers/cognito/apis/signInWithCustomAuth.ts    | 1 -
 packages/auth/src/providers/cognito/apis/signInWithSRP.ts      | 3 +--
 .../auth/src/providers/cognito/apis/signInWithUserPassword.ts  | 3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
index fe8849f116f..49d49737a71 100644
--- a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
+++ b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
@@ -121,7 +121,6 @@ export async function confirmSignIn(
 				}),
 				signInDetails,
 			});
-			cleanActiveSignInState();
 
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
index 39f508fa04b..f941a38b6ea 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
@@ -95,7 +95,6 @@ export async function signInWithCustomAuth(
 				}),
 				signInDetails,
 			});
-			cleanActiveSignInState();
 
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
diff --git a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
index 6d4ee187d30..23e601c54fb 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
@@ -102,8 +102,7 @@ export async function signInWithSRP(
 				}),
 				signInDetails,
 			});
-			cleanActiveSignInState();
-
+			
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
 			await dispatchSignedInHubEvent();
diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
index 197f4a1cd2f..6815f409ea9 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
@@ -97,8 +97,7 @@ export async function signInWithUserPassword(
 				}),
 				signInDetails,
 			});
-			cleanActiveSignInState();
-
+			
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
 			await dispatchSignedInHubEvent();

From d4c45b9862e07d282356379c76a1aa24f902c8ea Mon Sep 17 00:00:00 2001
From: JoonWon Choi <13882232+joon-won@users.noreply.github.com>
Date: Wed, 11 Dec 2024 14:04:47 -0800
Subject: [PATCH 40/40] Fix lint issue

---
 packages/auth/src/providers/cognito/apis/confirmSignIn.ts        | 1 -
 packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts | 1 -
 packages/auth/src/providers/cognito/apis/signInWithSRP.ts        | 1 -
 .../auth/src/providers/cognito/apis/signInWithUserPassword.ts    | 1 -
 4 files changed, 4 deletions(-)

diff --git a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
index 49d49737a71..3db00e2dfee 100644
--- a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
+++ b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
@@ -121,7 +121,6 @@ export async function confirmSignIn(
 				}),
 				signInDetails,
 			});
-
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
 			await dispatchSignedInHubEvent();
diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
index f941a38b6ea..aeac80eaa25 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
@@ -95,7 +95,6 @@ export async function signInWithCustomAuth(
 				}),
 				signInDetails,
 			});
-
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
 			await dispatchSignedInHubEvent();
diff --git a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
index 23e601c54fb..8290c1403cd 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
@@ -102,7 +102,6 @@ export async function signInWithSRP(
 				}),
 				signInDetails,
 			});
-			
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
 			await dispatchSignedInHubEvent();
diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
index 6815f409ea9..3889c74be5c 100644
--- a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
+++ b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
@@ -97,7 +97,6 @@ export async function signInWithUserPassword(
 				}),
 				signInDetails,
 			});
-			
 			signInStore.dispatch({ type: 'RESET_STATE' });
 
 			await dispatchSignedInHubEvent();