@aws-amplify/auth 6.4.1-unstable.925d248.0 → 6.4.1

package/src/providers/cognito/apis/signOut.ts

@@ -20,11 +20,7 @@ import {
 import { getAuthUserAgentValue } from '../../../utils';
 import { SignOutInput } from '../types';
 import { tokenOrchestrator } from '../tokenProvider';
-import {
-	globalSignOut as globalSignOutClient,
-	revokeToken,
-} from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import {
 	assertAuthTokens,
 	assertAuthTokensWithRefreshToken,
@@ -33,6 +29,11 @@ import { handleOAuthSignOut } from '../utils/oauth';
 import { DefaultOAuthStore } from '../utils/signInWithRedirectStore';
 import { AuthError } from '../../../errors/AuthError';
 import { OAUTH_SIGNOUT_EXCEPTION } from '../../../errors/constants';
+import {
+	createGlobalSignOutClient,
+	createRevokeTokenClient,
+} from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 const logger = new ConsoleLogger('Auth');
 
@@ -86,16 +87,23 @@ export async function signOut(input?: SignOutInput): Promise<void> {
 
 async function clientSignOut(cognitoConfig: CognitoUserPoolConfig) {
 	try {
+		const { userPoolEndpoint, userPoolId, userPoolClientId } = cognitoConfig;
 		const authTokens = await tokenOrchestrator.getTokenStore().loadTokens();
 		assertAuthTokensWithRefreshToken(authTokens);
 		if (isSessionRevocable(authTokens.accessToken)) {
+			const revokeToken = createRevokeTokenClient({
+				endpointResolver: createCognitoUserPoolEndpointResolver({
+					endpointOverride: userPoolEndpoint,
+				}),
+			});
+
 			await revokeToken(
 				{
-					region: getRegion(cognitoConfig.userPoolId),
+					region: getRegionFromUserPoolId(userPoolId),
 					userAgentValue: getAuthUserAgentValue(AuthAction.SignOut),
 				},
 				{
-					ClientId: cognitoConfig.userPoolClientId,
+					ClientId: userPoolClientId,
 					Token: authTokens.refreshToken,
 				},
 			);
@@ -110,11 +118,17 @@ async function clientSignOut(cognitoConfig: CognitoUserPoolConfig) {
 
 async function globalSignOut(cognitoConfig: CognitoUserPoolConfig) {
 	try {
+		const { userPoolEndpoint, userPoolId } = cognitoConfig;
 		const authTokens = await tokenOrchestrator.getTokenStore().loadTokens();
 		assertAuthTokens(authTokens);
+		const globalSignOutClient = createGlobalSignOutClient({
+			endpointResolver: createCognitoUserPoolEndpointResolver({
+				endpointOverride: userPoolEndpoint,
+			}),
+		});
 		await globalSignOutClient(
 			{
-				region: getRegion(cognitoConfig.userPoolId),
+				region: getRegionFromUserPoolId(userPoolId),
 				userAgentValue: getAuthUserAgentValue(AuthAction.SignOut),
 			},
 			{

package/src/providers/cognito/apis/signUp.ts

@@ -10,11 +10,10 @@ import {
 
 import { AuthDeliveryMedium } from '../../../types';
 import { SignInInput, SignUpInput, SignUpOutput } from '../types';
-import { signUp as signUpClient } from '../utils/clients/CognitoIdentityProvider';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { SignUpException } from '../types/errors';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { toAttributeType } from '../utils/apiHelpers';
 import {
 	autoSignInUserConfirmed,
@@ -27,6 +26,8 @@ import {
 } from '../utils/signUpHelpers';
 import { getUserContextData } from '../utils/userContextData';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createSignUpClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 import { setAutoSignIn } from './autoSignIn';
 
@@ -72,11 +73,15 @@ export async function signUp(input: SignUpInput): Promise<SignUpOutput> {
 		setAutoSignInStarted(true);
 	}
 
-	const { userPoolId, userPoolClientId } = authConfig;
-
+	const { userPoolId, userPoolClientId, userPoolEndpoint } = authConfig;
+	const signUpClient = createSignUpClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const clientOutput = await signUpClient(
 		{
-			region: getRegion(userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.SignUp),
 		},
 		{

package/src/providers/cognito/apis/updateMFAPreference.ts

@@ -10,11 +10,12 @@ import {
 import { UpdateMFAPreferenceInput } from '../types';
 import { SetUserMFAPreferenceException } from '../types/errors';
 import { MFAPreference } from '../types/models';
-import { setUserMFAPreference } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
-import { CognitoMFASettings } from '../utils/clients/CognitoIdentityProvider/types';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
+import { CognitoMFASettings } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import { assertAuthTokens } from '../utils/types';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createSetUserMFAPreferenceClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Updates the MFA preference of the user.
@@ -29,11 +30,17 @@ export async function updateMFAPreference(
 	const { sms, totp } = input;
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
+	const setUserMFAPreference = createSetUserMFAPreferenceClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await setUserMFAPreference(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.UpdateMFAPreference),
 		},
 		{

package/src/providers/cognito/apis/updatePassword.ts

@@ -10,11 +10,12 @@ import {
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { UpdatePasswordInput } from '../types';
-import { changePassword } from '../utils/clients/CognitoIdentityProvider';
 import { ChangePasswordException } from '../../cognito/types/errors';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokens } from '../utils/types';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createChangePasswordClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Updates user's password while authenticated.
@@ -29,6 +30,7 @@ export async function updatePassword(
 ): Promise<void> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { oldPassword, newPassword } = input;
 	assertValidationError(
 		!!oldPassword,
@@ -41,9 +43,14 @@ export async function updatePassword(
 	);
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
+	const changePassword = createChangePasswordClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await changePassword(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.UpdatePassword),
 		},
 		{

package/src/providers/cognito/apis/updateUserAttributes.ts

@@ -16,13 +16,14 @@ import {
 	UpdateUserAttributesInput,
 	UpdateUserAttributesOutput,
 } from '../types';
-import { updateUserAttributes as updateUserAttributesClient } from '../utils/clients/CognitoIdentityProvider';
 import { assertAuthTokens } from '../utils/types';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { toAttributeType } from '../utils/apiHelpers';
-import { CodeDeliveryDetailsType } from '../utils/clients/CognitoIdentityProvider/types';
+import { CodeDeliveryDetailsType } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import { UpdateUserAttributesException } from '../types/errors';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createUpdateUserAttributesClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Updates user's attributes while authenticated.
@@ -39,11 +40,17 @@ export const updateUserAttributes = async (
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	const clientMetadata = options?.clientMetadata;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
+	const updateUserAttributesClient = createUpdateUserAttributesClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const { CodeDeliveryDetailsList } = await updateUserAttributesClient(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.UpdateUserAttributes),
 		},
 		{

package/src/providers/cognito/apis/verifyTOTPSetup.ts

@@ -10,11 +10,12 @@ import {
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { VerifyTOTPSetupInput } from '../types';
-import { verifySoftwareToken } from '../utils/clients/CognitoIdentityProvider';
 import { VerifySoftwareTokenException } from '../types/errors';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokens } from '../utils/types';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createVerifySoftwareTokenClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Verifies an OTP code retrieved from an associated authentication app.
@@ -31,6 +32,7 @@ export async function verifyTOTPSetup(
 ): Promise<void> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { code, options } = input;
 	assertValidationError(
 		!!code,
@@ -38,9 +40,14 @@ export async function verifyTOTPSetup(
 	);
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
+	const verifySoftwareToken = createVerifySoftwareTokenClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await verifySoftwareToken(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.VerifyTOTPSetup),
 		},
 		{

package/src/providers/cognito/credentialsProvider/IdentityIdProvider.ts

@@ -5,7 +5,7 @@ import { AuthTokens, ConsoleLogger, Identity, getId } from '@aws-amplify/core';
 import { CognitoIdentityPoolConfig } from '@aws-amplify/core/internals/utils';
 
 import { AuthError } from '../../../errors/AuthError';
-import { getRegionFromIdentityPoolId } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromIdentityPoolId } from '../../../foundation/parsers';
 import { GetIdException } from '../types/errors';
 
 import { IdentityIdStore } from './types';

package/src/providers/cognito/credentialsProvider/credentialsProvider.ts

@@ -15,7 +15,7 @@ import {
 } from '@aws-amplify/core/internals/utils';
 
 import { AuthError } from '../../../errors/AuthError';
-import { getRegionFromIdentityPoolId } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromIdentityPoolId } from '../../../foundation/parsers';
 import { assertIdTokenInAuthTokens } from '../utils/types';
 
 import { IdentityIdStore } from './types';

package/src/providers/cognito/factories/createCognitoUserPoolEndpointResolver.ts

@@ -0,0 +1,16 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { EndpointResolverOptions } from '@aws-amplify/core/internals/aws-client-utils';
+import { AmplifyUrl } from '@aws-amplify/core/internals/utils';
+
+import { cognitoUserPoolEndpointResolver } from '../../../foundation/cognitoUserPoolEndpointResolver';
+
+export const createCognitoUserPoolEndpointResolver =
+	({ endpointOverride }: { endpointOverride: string | undefined }) =>
+	(input: EndpointResolverOptions): { url: URL } => {
+		if (endpointOverride) {
+			return { url: new AmplifyUrl(endpointOverride) };
+		}
+
+		return cognitoUserPoolEndpointResolver(input);
+	};

package/src/providers/cognito/factories/index.ts

@@ -0,0 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export { createCognitoUserPoolEndpointResolver } from './createCognitoUserPoolEndpointResolver';

package/src/providers/cognito/tokenProvider/cacheTokens.ts

@@ -3,7 +3,7 @@
 import { AmplifyError, decodeJWT } from '@aws-amplify/core/internals/utils';
 
 import { CognitoAuthSignInDetails } from '../types';
-import { AuthenticationResultType } from '../utils/clients/CognitoIdentityProvider/types';
+import { AuthenticationResultType } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 
 import { tokenOrchestrator } from './tokenProvider';
 import { CognitoAuthTokens, DeviceMetadata } from './types';

package/src/providers/cognito/utils/apiHelpers.ts

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AuthUserAttributes } from '../../../types';
-
-import { AttributeType } from './clients/CognitoIdentityProvider/types';
+import { AttributeType } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 
 /**
  * Transforms a user attributes object into an array of AttributeType objects.

package/src/providers/cognito/utils/refreshAuthTokens.ts

@@ -9,10 +9,11 @@ import {
 } from '@aws-amplify/core/internals/utils';
 
 import { CognitoAuthTokens, TokenRefresher } from '../tokenProvider/types';
-import { initiateAuth } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokensWithRefreshToken } from '../utils/types';
 import { AuthError } from '../../../errors/AuthError';
+import { createInitiateAuthClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 import { getUserContextData } from './userContextData';
 
@@ -26,7 +27,8 @@ const refreshAuthTokensFunction: TokenRefresher = async ({
 	username: string;
 }): Promise<CognitoAuthTokens> => {
 	assertTokenProviderConfig(authConfig?.Cognito);
-	const region = getRegion(authConfig.Cognito.userPoolId);
+	const { userPoolId, userPoolClientId, userPoolEndpoint } = authConfig.Cognito;
+	const region = getRegionFromUserPoolId(userPoolId);
 	assertAuthTokensWithRefreshToken(tokens);
 	const refreshTokenString = tokens.refreshToken;
 
@@ -39,14 +41,20 @@ const refreshAuthTokensFunction: TokenRefresher = async ({
 
 	const UserContextData = getUserContextData({
 		username,
-		userPoolId: authConfig.Cognito.userPoolId,
-		userPoolClientId: authConfig.Cognito.userPoolClientId,
+		userPoolId,
+		userPoolClientId,
+	});
+
+	const initiateAuth = createInitiateAuthClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
 	});
 
 	const { AuthenticationResult } = await initiateAuth(
 		{ region },
 		{
-			ClientId: authConfig?.Cognito?.userPoolClientId,
+			ClientId: userPoolClientId,
 			AuthFlow: 'REFRESH_TOKEN_AUTH',
 			AuthParameters,
 			UserContextData,