fix(auth): replace window history with current browser session's state (

aws-amplify#12781) * chore: replace history with current session's state * chore: update window.history.state * chore: fix unit test
stocaaro · Jan 4, 2024 · 44fdfe8 · 44fdfe8
1 parent 1bcbae4
commit 44fdfe8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/auth/__tests__/providers/cognito/utils/oauth/completeOAuthFlow.test.ts b/packages/auth/__tests__/providers/cognito/utils/oauth/completeOAuthFlow.test.ts
@@ -66,14 +66,15 @@ describe('completeOAuthFlow', () => {
 	let windowSpy = jest.spyOn(window, 'window', 'get');
 	const mockFetch = jest.fn();
 	const mockReplaceState = jest.fn();
-
+  
 	beforeAll(() => {
 		(global as any).fetch = mockFetch;
 		windowSpy.mockImplementation(
 			() =>
 				({
 					history: {
 						replaceState: mockReplaceState,
+						state:'http://localhost:3000/?code=aaaa-111-222&state=aaaaa'
 					},
 				}) as any
 		);
@@ -192,7 +193,7 @@ describe('completeOAuthFlow', () => {
 				ExpiresIn: expectedTokens.expires_in,
 			});
 			expect(mockReplaceState).toHaveBeenCalledWith(
-				{},
+				'http://localhost:3000/?code=aaaa-111-222&state=aaaaa',
 				'',
 				testInput.redirectUri
 			);
@@ -303,7 +304,7 @@ describe('completeOAuthFlow', () => {
 
 			expect(mockHubDispatch).toHaveBeenCalledTimes(2);
 			expect(mockReplaceState).toHaveBeenCalledWith(
-				{},
+				'http://localhost:3000/?code=aaaa-111-222&state=aaaaa',
 				'',
 				testInput.redirectUri
 			);

diff --git a/packages/auth/src/providers/cognito/utils/oauth/completeOAuthFlow.ts b/packages/auth/src/providers/cognito/utils/oauth/completeOAuthFlow.ts
@@ -269,6 +269,6 @@ const getCustomState = (state: string): string => {
 
 const clearHistory = (redirectUri: string) => {
 	if (typeof window !== 'undefined' && typeof window.history !== 'undefined') {
-		window.history.replaceState({}, '', redirectUri);
+		window.history.replaceState(window.history.state, '', redirectUri);
 	}
 };