fix(ssr-adapter): refreshToken may return the same tokens across requ…

…ests (#13387) fix(auth): deduped refreshToken utility causes using same accessToken on the server side
aws-amplify · May 15, 2024 · 2e5e2f1 · 2e5e2f1
1 parent a538798
commit 2e5e2f1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/packages/auth/src/providers/cognito/index.ts b/packages/auth/src/providers/cognito/index.ts
@@ -80,4 +80,5 @@ export {
 	TokenOrchestrator,
 	DefaultTokenStore,
 	refreshAuthTokens,
+	refreshAuthTokensWithoutDedupe,
 } from './tokenProvider';
diff --git a/packages/auth/src/providers/cognito/tokenProvider/index.ts b/packages/auth/src/providers/cognito/tokenProvider/index.ts
@@ -1,7 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export { refreshAuthTokens } from '../utils/refreshAuthTokens';
+export {
+	refreshAuthTokens,
+	refreshAuthTokensWithoutDedupe,
+} from '../utils/refreshAuthTokens';
 export { DefaultTokenStore } from './TokenStore';
 export { TokenOrchestrator } from './TokenOrchestrator';
 export { CognitoUserPoolTokenProviderType } from './types';

diff --git a/packages/auth/src/providers/cognito/utils/refreshAuthTokens.ts b/packages/auth/src/providers/cognito/utils/refreshAuthTokens.ts
@@ -77,3 +77,4 @@ const refreshAuthTokensFunction: TokenRefresher = async ({
 };
 
 export const refreshAuthTokens = deDupeAsyncFunction(refreshAuthTokensFunction);
+export const refreshAuthTokensWithoutDedupe = refreshAuthTokensFunction;
diff --git a/...__tests__/adapterCore/authProvidersFactories/cognito/createUserPoolsTokenProvider.test.ts b/...__tests__/adapterCore/authProvidersFactories/cognito/createUserPoolsTokenProvider.test.ts
@@ -4,7 +4,7 @@
 import {
 	DefaultTokenStore,
 	TokenOrchestrator,
-	refreshAuthTokens,
+	refreshAuthTokensWithoutDedupe,
 } from '@aws-amplify/auth/cognito';
 import { AuthConfig, KeyValueStorageInterface } from '@aws-amplify/core';
 
@@ -27,7 +27,7 @@ const mockAuthConfig: AuthConfig = {
 };
 const MockDefaultTokenStore = DefaultTokenStore as jest.Mock;
 const MockTokenOrchestrator = TokenOrchestrator as jest.Mock;
-const mockRefreshAuthTokens = refreshAuthTokens as jest.Mock;
+const mockRefreshAuthTokens = refreshAuthTokensWithoutDedupe as jest.Mock;
 
 describe('createUserPoolsTokenProvider', () => {
 	beforeEach(() => {

diff --git a/packages/aws-amplify/__tests__/exports.test.ts b/packages/aws-amplify/__tests__/exports.test.ts
@@ -219,6 +219,7 @@ describe('aws-amplify Exports', () => {
 					'TokenOrchestrator',
 					'DefaultTokenStore',
 					'refreshAuthTokens',
+					'refreshAuthTokensWithoutDedupe',
 				].sort(),
 			);
 		});

diff --git a/...s-amplify/src/adapter-core/authProvidersFactories/cognito/createUserPoolsTokenProvider.ts b/...s-amplify/src/adapter-core/authProvidersFactories/cognito/createUserPoolsTokenProvider.ts
@@ -4,7 +4,7 @@
 import {
 	DefaultTokenStore,
 	TokenOrchestrator,
-	refreshAuthTokens,
+	refreshAuthTokensWithoutDedupe,
 } from '@aws-amplify/auth/cognito';
 import {
 	AuthConfig,
@@ -28,7 +28,7 @@ export const createUserPoolsTokenProvider = (
 	const tokenOrchestrator = new TokenOrchestrator();
 	tokenOrchestrator.setAuthConfig(authConfig);
 	tokenOrchestrator.setAuthTokenStore(authTokenStore);
-	tokenOrchestrator.setTokenRefresher(refreshAuthTokens);
+	tokenOrchestrator.setTokenRefresher(refreshAuthTokensWithoutDedupe);
 
 	return {
 		getTokens: ({ forceRefresh } = { forceRefresh: false }) =>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,3 +77,4 @@ const refreshAuthTokensFunction: TokenRefresher = async ({
		};

		export const refreshAuthTokens = deDupeAsyncFunction(refreshAuthTokensFunction);
		export const refreshAuthTokensWithoutDedupe = refreshAuthTokensFunction;