fix(aws-amplify): scope PR to Cognito setAuthConfig on reconfigure only

Remove libraryOptions merge from initSingleton; that belongs in #14815.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ShrutiPundir17

.changeset/fix-init-singleton-auth-reconfigure.md

@@ -2,4 +2,4 @@
 'aws-amplify': patch
 ---
 
-fix(aws-amplify): merge libraryOptions when Auth is overridden and refresh default Cognito auth config on reconfigure.
+fix(aws-amplify): refresh default Cognito auth config on DefaultAmplify reconfigure.

packages/aws-amplify/__tests__/initSingleton.integration.test.ts

@@ -28,18 +28,8 @@ const poolBConfig: ResourcesConfig = {
 	},
 };
 
-const storageLibraryOptions = {
-	Storage: {
-		S3: {
-			defaultAccessLevel: 'private' as const,
-			isObjectLockEnabled: true,
-		},
-	},
-};
-
 describe('DefaultAmplify.configure integration', () => {
 	let setAuthConfigSpy: jest.SpyInstance;
-	let setKeyValueStorageSpy: jest.SpyInstance;
 
 	beforeEach(() => {
 		CoreAmplify.libraryOptions = {};
@@ -48,45 +38,31 @@ describe('DefaultAmplify.configure integration', () => {
 			cognitoUserPoolsTokenProvider,
 			'setAuthConfig',
 		);
-		setKeyValueStorageSpy = jest.spyOn(
-			cognitoUserPoolsTokenProvider,
-			'setKeyValueStorage',
-		);
 	});
 
 	afterEach(() => {
 		setAuthConfigSpy.mockRestore();
-		setKeyValueStorageSpy.mockRestore();
 		CoreAmplify.libraryOptions = {};
 		CoreAmplify.resourcesConfig = {};
 	});
 
-	it('keeps Storage and refreshes Cognito auth config on partial reconfigure', () => {
-		DefaultAmplify.configure(poolAConfig, storageLibraryOptions);
+	it('syncs Cognito auth config when reconfiguring with partial libraryOptions', () => {
+		DefaultAmplify.configure(poolAConfig);
 
-		expect(CoreAmplify.libraryOptions.Storage).toEqual(
-			storageLibraryOptions.Storage,
-		);
-		expect(CoreAmplify.libraryOptions.Auth?.tokenProvider).toBe(
-			cognitoUserPoolsTokenProvider,
-		);
 		expect(setAuthConfigSpy).toHaveBeenCalledWith(poolAConfig.Auth);
 
 		setAuthConfigSpy.mockClear();
 
 		DefaultAmplify.configure(poolBConfig, { ssr: false });
 
-		expect(CoreAmplify.libraryOptions.Storage).toEqual(
-			storageLibraryOptions.Storage,
-		);
+		expect(setAuthConfigSpy).toHaveBeenCalledWith(poolBConfig.Auth);
 		expect(CoreAmplify.getConfig().Auth?.Cognito?.userPoolClientId).toBe(
 			'client-b',
 		);
-		expect(setAuthConfigSpy).toHaveBeenCalledWith(poolBConfig.Auth);
 	});
 
-	it('merges prior libraryOptions when libraryOptions.Auth overrides default provider', () => {
-		DefaultAmplify.configure(poolAConfig, storageLibraryOptions);
+	it('syncs default Cognito auth config when libraryOptions.Auth uses default provider', () => {
+		DefaultAmplify.configure(poolAConfig);
 
 		setAuthConfigSpy.mockClear();
 
@@ -98,25 +74,19 @@ describe('DefaultAmplify.configure integration', () => {
 			},
 		});
 
-		expect(CoreAmplify.libraryOptions.Storage).toEqual(
-			storageLibraryOptions.Storage,
-		);
 		expect(setAuthConfigSpy).toHaveBeenCalledWith(poolBConfig.Auth);
 		expect(CoreAmplify.getConfig().Auth?.Cognito?.userPoolClientId).toBe(
 			'client-b',
 		);
 	});
 
 	it('syncs default Cognito auth config when only resource config is passed', () => {
-		DefaultAmplify.configure(poolAConfig, storageLibraryOptions);
+		DefaultAmplify.configure(poolAConfig);
 
 		setAuthConfigSpy.mockClear();
 
 		DefaultAmplify.configure(poolBConfig);
 
-		expect(CoreAmplify.libraryOptions.Storage).toEqual(
-			storageLibraryOptions.Storage,
-		);
 		expect(setAuthConfigSpy).toHaveBeenCalledWith(poolBConfig.Auth);
 		expect(CoreAmplify.getConfig().Auth?.Cognito?.userPoolId).toBe('pool-b');
 	});

packages/aws-amplify/__tests__/initSingleton.test.ts

@@ -246,29 +246,40 @@ describe('initSingleton (DefaultAmplify)', () => {
 		});
 
 		describe('when ResourcesConfig.Auth is defined', () => {
-			it('should merge with existing libraryOptions when libraryOptions.Auth is defined', () => {
-				const customTokenProvider = { getTokens: jest.fn() };
-				const storageLibraryOptions = {
-					S3: { defaultAccessLevel: 'private' as const },
-				};
-				AmplifySingleton.libraryOptions = {
-					Storage: storageLibraryOptions,
-				};
+			it('should sync default Cognito auth config when libraryOptions.Auth uses default provider', () => {
 				const libraryOptions = {
-					Auth: { tokenProvider: customTokenProvider },
+					Auth: {
+						tokenProvider: cognitoUserPoolsTokenProvider,
+						credentialsProvider: cognitoCredentialsProvider,
+					},
 				};
+
 				Amplify.configure(mockResourceConfig, libraryOptions);
 
+				expect(
+					mockCognitoUserPoolsTokenProviderSetAuthConfig,
+				).toHaveBeenCalledWith(mockResourceConfig.Auth);
 				expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith(
 					mockResourceConfig,
-					{
-						Storage: storageLibraryOptions,
-						Auth: libraryOptions.Auth,
-					},
+					libraryOptions,
 				);
+			});
+
+			it('should not sync Cognito auth config when libraryOptions.Auth uses a custom token provider', () => {
+				const customTokenProvider = { getTokens: jest.fn() };
+				const libraryOptions = {
+					Auth: { tokenProvider: customTokenProvider },
+				};
+
+				Amplify.configure(mockResourceConfig, libraryOptions);
+
 				expect(
 					mockCognitoUserPoolsTokenProviderSetAuthConfig,
 				).not.toHaveBeenCalled();
+				expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith(
+					mockResourceConfig,
+					libraryOptions,
+				);
 			});
 
 			describe('when the singleton libraryOptions have not yet been configured with Auth', () => {
@@ -398,34 +409,6 @@ describe('initSingleton (DefaultAmplify)', () => {
 					);
 				});
 
-				it('should preserve non-Auth library options when reconfiguring with partial libraryOptions', () => {
-					const storageLibraryOptions = {
-						S3: { defaultAccessLevel: 'private' as const },
-					};
-					AmplifySingleton.libraryOptions = {
-						Auth: {
-							tokenProvider: cognitoUserPoolsTokenProvider,
-							credentialsProvider: cognitoCredentialsProvider,
-						},
-						Storage: storageLibraryOptions,
-					};
-					const authLibraryOptions = AmplifySingleton.libraryOptions.Auth;
-
-					Amplify.configure(mockResourceConfig, { ssr: true });
-
-					expect(
-						mockCognitoUserPoolsTokenProviderSetAuthConfig,
-					).toHaveBeenCalledWith(mockResourceConfig.Auth);
-					expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith(
-						mockResourceConfig,
-						{
-							Auth: authLibraryOptions,
-							Storage: storageLibraryOptions,
-							ssr: true,
-						},
-					);
-				});
-
 				it('should sync default Cognito auth config when reconfiguring with resource config only', () => {
 					Amplify.configure(mockResourceConfig);
 
@@ -437,33 +420,6 @@ describe('initSingleton (DefaultAmplify)', () => {
 					);
 				});
 
-				it('should sync default Cognito auth config when libraryOptions.Auth overrides with default provider', () => {
-					const updatedResourceConfig: ResourcesConfig = {
-						Auth: {
-							Cognito: {
-								userPoolClientId: 'newClientId',
-								userPoolId: 'newPoolId',
-							},
-						},
-					};
-					AmplifySingleton.libraryOptions = {
-						Auth: {
-							tokenProvider: cognitoUserPoolsTokenProvider,
-							credentialsProvider: cognitoCredentialsProvider,
-						},
-					};
-
-					Amplify.configure(updatedResourceConfig, {
-						Auth: {
-							tokenProvider: cognitoUserPoolsTokenProvider,
-							credentialsProvider: cognitoCredentialsProvider,
-						},
-					});
-
-					expect(
-						mockCognitoUserPoolsTokenProviderSetAuthConfig,
-					).toHaveBeenCalledWith(updatedResourceConfig.Auth);
-				});
 			});
 
 			it('should invoke AmplifySingleton.configure with other provided library options', () => {

packages/aws-amplify/src/initSingleton.ts

@@ -66,25 +66,14 @@ export const DefaultAmplify = {
 			return;
 		}
 
-		// If Auth options are provided, merge with existing libraryOptions so other categories are preserved.
+		// If Auth options are provided, always just configure as is.
+		// Otherwise, we can assume no Auth libraryOptions were provided from here on.
 		if (libraryOptions?.Auth) {
-			const mergedLibraryOptions: LibraryOptions = {
-				...Amplify.libraryOptions,
-				...libraryOptions,
-			};
-
-			if (usesDefaultCognitoTokenProvider(mergedLibraryOptions.Auth)) {
+			if (usesDefaultCognitoTokenProvider(libraryOptions.Auth)) {
 				syncDefaultCognitoAuthConfig(resolvedResourceConfig.Auth);
-
-				if (libraryOptions.ssr !== undefined) {
-					cognitoUserPoolsTokenProvider.setKeyValueStorage(
-						// TODO: allow configure with a public interface
-						resolvedKeyValueStorage,
-					);
-				}
 			}
 
-			Amplify.configure(resolvedResourceConfig, mergedLibraryOptions);
+			Amplify.configure(resolvedResourceConfig, libraryOptions);
 
 			return;
 		}
@@ -127,9 +116,8 @@ export const DefaultAmplify = {
 			}
 
 			Amplify.configure(resolvedResourceConfig, {
-				...Amplify.libraryOptions,
-				...libraryOptions,
 				Auth: authLibraryOptions,
+				...libraryOptions,
 			});
 
 			return;