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

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createListDevicesClient.ts

@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ListDevicesCommandInput,
+	ListDevicesCommandOutput,
+	ServiceClientFactoryInput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createListDevicesClient = (config: ServiceClientFactoryInput) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<ListDevicesCommandInput>('ListDevices'),
+		createUserPoolDeserializer<ListDevicesCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createResendConfirmationCodeClient.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ResendConfirmationCodeCommandInput,
+	ResendConfirmationCodeCommandOutput,
+	ServiceClientFactoryInput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createResendConfirmationCodeClient = (
+	config: ServiceClientFactoryInput,
+) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<ResendConfirmationCodeCommandInput>(
+			'ResendConfirmationCode',
+		),
+		createUserPoolDeserializer<ResendConfirmationCodeCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createRespondToAuthChallengeClient.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	RespondToAuthChallengeCommandInput,
+	RespondToAuthChallengeCommandOutput,
+	ServiceClientFactoryInput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createRespondToAuthChallengeClient = (
+	config: ServiceClientFactoryInput,
+) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<RespondToAuthChallengeCommandInput>(
+			'RespondToAuthChallenge',
+		),
+		createUserPoolDeserializer<RespondToAuthChallengeCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createRevokeTokenClient.ts

@@ -0,0 +1,29 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { ServiceClientFactoryInput } from './types';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+interface RevokeTokenInput {
+	Token: string;
+	ClientId: string;
+}
+
+type RevokeTokenOutput = Record<string, unknown>;
+
+export const createRevokeTokenClient = (config: ServiceClientFactoryInput) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<RevokeTokenInput>('RevokeToken'),
+		createUserPoolDeserializer<RevokeTokenOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createSetUserMFAPreferenceClient.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ServiceClientFactoryInput,
+	SetUserMFAPreferenceCommandInput,
+	SetUserMFAPreferenceCommandOutput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createSetUserMFAPreferenceClient = (
+	config: ServiceClientFactoryInput,
+) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<SetUserMFAPreferenceCommandInput>(
+			'SetUserMFAPreference',
+		),
+		createUserPoolDeserializer<SetUserMFAPreferenceCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createSignUpClient.ts

@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ServiceClientFactoryInput,
+	SignUpCommandInput,
+	SignUpCommandOutput,
+} from './types';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+
+export const createSignUpClient = (config: ServiceClientFactoryInput) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<SignUpCommandInput>('SignUp'),
+		createUserPoolDeserializer<SignUpCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createUpdateDeviceStatusClient.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ServiceClientFactoryInput,
+	UpdateDeviceStatusCommandInput,
+	UpdateDeviceStatusCommandOutput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createUpdateDeviceStatusClient = (
+	config: ServiceClientFactoryInput,
+) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<UpdateDeviceStatusCommandInput>(
+			'UpdateDeviceStatus',
+		),
+		createUserPoolDeserializer<UpdateDeviceStatusCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createUpdateUserAttributesClient.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ServiceClientFactoryInput,
+	UpdateUserAttributesCommandInput,
+	UpdateUserAttributesCommandOutput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createUpdateUserAttributesClient = (
+	config: ServiceClientFactoryInput,
+) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<UpdateUserAttributesCommandInput>(
+			'UpdateUserAttributes',
+		),
+		createUserPoolDeserializer<UpdateUserAttributesCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createVerifySoftwareTokenClient.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ServiceClientFactoryInput,
+	VerifySoftwareTokenCommandInput,
+	VerifySoftwareTokenCommandOutput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createVerifySoftwareTokenClient = (
+	config: ServiceClientFactoryInput,
+) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<VerifySoftwareTokenCommandInput>(
+			'VerifySoftwareToken',
+		),
+		createUserPoolDeserializer<VerifySoftwareTokenCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/createVerifyUserAttributeClient.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
+import {
+	ServiceClientFactoryInput,
+	VerifyUserAttributeCommandInput,
+	VerifyUserAttributeCommandOutput,
+} from './types';
+import { cognitoUserPoolTransferHandler } from './shared/handler';
+import {
+	createUserPoolDeserializer,
+	createUserPoolSerializer,
+} from './shared/serde';
+import { DEFAULT_SERVICE_CLIENT_API_CONFIG } from './constants';
+
+export const createVerifyUserAttributeClient = (
+	config: ServiceClientFactoryInput,
+) =>
+	composeServiceApi(
+		cognitoUserPoolTransferHandler,
+		createUserPoolSerializer<VerifyUserAttributeCommandInput>(
+			'VerifyUserAttribute',
+		),
+		createUserPoolDeserializer<VerifyUserAttributeCommandOutput>(),
+		{
+			...DEFAULT_SERVICE_CLIENT_API_CONFIG,
+			...config,
+		},
+	);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/index.ts

@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { createInitiateAuthClient } from './createInitiateAuthClient';
+export { createRevokeTokenClient } from './createRevokeTokenClient';
+export { createSignUpClient } from './createSignUpClient';
+export { createConfirmSignUpClient } from './createConfirmSignUpClient';
+export { createForgotPasswordClient } from './createForgotPasswordClient';
+export { createConfirmForgotPasswordClient } from './createConfirmForgotPasswordClient';
+export { createRespondToAuthChallengeClient } from './createRespondToAuthChallengeClient';
+export { createResendConfirmationCodeClient } from './createResendConfirmationCodeClient';
+export { createVerifySoftwareTokenClient } from './createVerifySoftwareTokenClient';
+export { createAssociateSoftwareTokenClient } from './createAssociateSoftwareTokenClient';
+export { createSetUserMFAPreferenceClient } from './createSetUserMFAPreferenceClient';
+export { createGetUserClient } from './createGetUserClient';
+export { createChangePasswordClient } from './createChangePasswordClient';
+export { createConfirmDeviceClient } from './createConfirmDeviceClient';
+export { createForgetDeviceClient } from './createForgetDeviceClient';
+export { createDeleteUserClient } from './createDeleteUserClient';
+export { createGetUserAttributeVerificationCodeClient } from './createGetUserAttributeVerificationCodeClient';
+export { createGlobalSignOutClient } from './createGlobalSignOutClient';
+export { createUpdateUserAttributesClient } from './createUpdateUserAttributesClient';
+export { createVerifyUserAttributeClient } from './createVerifyUserAttributeClient';
+export { createUpdateDeviceStatusClient } from './createUpdateDeviceStatusClient';
+export { createListDevicesClient } from './createListDevicesClient';
+export { createDeleteUserAttributesClient } from './createDeleteUserAttributesClient';

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/shared/handler/cognitoUserPoolTransferHandler.ts

@@ -0,0 +1,37 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { composeTransferHandler } from '@aws-amplify/core/internals/aws-client-utils/composers';
+import {
+	HttpRequest,
+	Middleware,
+	unauthenticatedHandler,
+} from '@aws-amplify/core/internals/aws-client-utils';
+import { HttpResponse } from '@aws-amplify/core/src/clients/types';
+
+/**
+ * A Cognito Identity-specific middleware that disables caching for all requests.
+ */
+const disableCacheMiddlewareFactory: Middleware<
+	HttpRequest,
+	HttpResponse,
+	Record<string, unknown>
+> = () => (next, _) =>
+	async function disableCacheMiddleware(request) {
+		request.headers['cache-control'] = 'no-store';
+
+		return next(request);
+	};
+
+/**
+ * A Cognito Identity-specific transfer handler that does NOT sign requests, and
+ * disables caching.
+ *
+ * @internal
+ */
+export const cognitoUserPoolTransferHandler = composeTransferHandler<
+	[Parameters<typeof disableCacheMiddlewareFactory>[0]],
+	HttpRequest,
+	HttpResponse,
+	typeof unauthenticatedHandler
+>(unauthenticatedHandler, [disableCacheMiddlewareFactory]);

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/shared/handler/index.ts

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

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/shared/serde/createEmptyResponseDeserializer.ts

@@ -0,0 +1,21 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import {
+	HttpResponse,
+	parseJsonError,
+} from '@aws-amplify/core/internals/aws-client-utils';
+
+import { assertServiceError } from '../../../../../../errors/utils/assertServiceError';
+import { AuthError } from '../../../../../../errors/AuthError';
+
+export const createEmptyResponseDeserializer =
+	<Output>(): ((response: HttpResponse) => Promise<Output | undefined>) =>
+	async (response: HttpResponse): Promise<Output | undefined> => {
+		if (response.statusCode >= 300) {
+			const error = await parseJsonError(response);
+			assertServiceError(error);
+			throw new AuthError({ name: error.name, message: error.message });
+		} else {
+			return undefined;
+		}
+	};

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/shared/serde/createUserPoolDeserializer.ts

@@ -0,0 +1,23 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+	HttpResponse,
+	parseJsonBody,
+	parseJsonError,
+} from '@aws-amplify/core/internals/aws-client-utils';
+
+import { assertServiceError } from '../../../../../../errors/utils/assertServiceError';
+import { AuthError } from '../../../../../../errors/AuthError';
+
+export const createUserPoolDeserializer =
+	<Output>(): ((response: HttpResponse) => Promise<Output>) =>
+	async (response: HttpResponse): Promise<Output> => {
+		if (response.statusCode >= 300) {
+			const error = await parseJsonError(response);
+			assertServiceError(error);
+			throw new AuthError({ name: error.name, message: error.message });
+		}
+
+		return parseJsonBody(response);
+	};

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/shared/serde/createUserPoolSerializer.ts

@@ -0,0 +1,58 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+	Endpoint,
+	Headers,
+	HttpRequest,
+} from '@aws-amplify/core/internals/aws-client-utils';
+
+type ClientOperation =
+	| 'SignUp'
+	| 'ConfirmSignUp'
+	| 'ForgotPassword'
+	| 'ConfirmForgotPassword'
+	| 'InitiateAuth'
+	| 'RespondToAuthChallenge'
+	| 'ResendConfirmationCode'
+	| 'VerifySoftwareToken'
+	| 'AssociateSoftwareToken'
+	| 'SetUserMFAPreference'
+	| 'GetUser'
+	| 'ChangePassword'
+	| 'ConfirmDevice'
+	| 'ForgetDevice'
+	| 'DeleteUser'
+	| 'GetUserAttributeVerificationCode'
+	| 'GlobalSignOut'
+	| 'UpdateUserAttributes'
+	| 'VerifyUserAttribute'
+	| 'DeleteUserAttributes'
+	| 'UpdateDeviceStatus'
+	| 'ListDevices'
+	| 'RevokeToken';
+
+export const createUserPoolSerializer =
+	<Input>(operation: ClientOperation) =>
+	(input: Input, endpoint: Endpoint): HttpRequest => {
+		const headers = getSharedHeaders(operation);
+		const body = JSON.stringify(input);
+
+		return buildHttpRpcRequest(endpoint, headers, body);
+	};
+
+const getSharedHeaders = (operation: string): Headers => ({
+	'content-type': 'application/x-amz-json-1.1',
+	'x-amz-target': `AWSCognitoIdentityProviderService.${operation}`,
+});
+
+const buildHttpRpcRequest = (
+	{ url }: Endpoint,
+	headers: Headers,
+	body: string,
+): HttpRequest => ({
+	headers,
+	url,
+	body,
+	method: 'POST',
+});

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/shared/serde/index.ts

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

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/types/index.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export * from './sdk';
+export * from './serviceClient';

package/src/foundation/factories/serviceClients/cognitoIdentityProvider/types/serviceClient.ts

@@ -0,0 +1,8 @@
+// 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';
+
+export interface ServiceClientFactoryInput {
+	endpointResolver(options: EndpointResolverOptions): { url: URL };
+}

package/src/foundation/parsers/index.ts

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

package/src/{providers/cognito/utils/clients/CognitoIdentityProvider/utils.ts → foundation/parsers/regionParsers.ts}

@@ -1,9 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { AuthError } from '../../errors/AuthError';
 
-import { AuthError } from '../../../../../errors/AuthError';
-
-export function getRegion(userPoolId?: string): string {
+export function getRegionFromUserPoolId(userPoolId?: string): string {
 	const region = userPoolId?.split('_')[0];
 	if (
 		!userPoolId ||

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

@@ -10,11 +10,12 @@ import {
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { ConfirmResetPasswordInput } from '../types';
-import { confirmForgotPassword } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
 import { ConfirmForgotPasswordException } from '../../cognito/types/errors';
 import { getAuthUserAgentValue } from '../../../utils';
 import { getUserContextData } from '../utils/userContextData';
+import { createConfirmForgotPasswordClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 /**
  * Confirms the new password and verification code to reset the password.
  *
@@ -30,7 +31,7 @@ export async function confirmResetPassword(
 ): Promise<void> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-	const { userPoolClientId, userPoolId } = authConfig;
+	const { userPoolClientId, userPoolId, userPoolEndpoint } = authConfig;
 	const { username, newPassword } = input;
 	assertValidationError(
 		!!username,
@@ -53,10 +54,14 @@ export async function confirmResetPassword(
 		userPoolId,
 		userPoolClientId,
 	});
-
+	const confirmForgotPassword = createConfirmForgotPasswordClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await confirmForgotPassword(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(authConfig.userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.ConfirmResetPassword),
 		},
 		{

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

@@ -17,7 +17,7 @@ import {
 } from '../utils/signInStore';
 import { AuthError } from '../../../errors/AuthError';
 import {
-	getNewDeviceMetatada,
+	getNewDeviceMetadata,
 	getSignInResult,
 	getSignInResultFromError,
 	handleChallengeName,
@@ -27,12 +27,12 @@ import { assertValidationError } from '../../../errors/utils/assertValidationErr
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { AuthErrorCodes } from '../../../common/AuthErrorStrings';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
+import { tokenOrchestrator } from '../tokenProvider';
+import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
 import {
 	ChallengeName,
 	ChallengeParameters,
-} from '../utils/clients/CognitoIdentityProvider/types';
-import { tokenOrchestrator } from '../tokenProvider';
-import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
+} from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 
 /**
  * Continues or completes the sign in process when required by the initial call to `signIn`.
@@ -113,11 +113,12 @@ export async function confirmSignIn(
 			await cacheCognitoTokens({
 				username,
 				...AuthenticationResult,
-				NewDeviceMetadata: await getNewDeviceMetatada(
-					authConfig.userPoolId,
-					AuthenticationResult.NewDeviceMetadata,
-					AuthenticationResult.AccessToken,
-				),
+				NewDeviceMetadata: await getNewDeviceMetadata({
+					userPoolId: authConfig.userPoolId,
+					userPoolEndpoint: authConfig.userPoolEndpoint,
+					newDeviceMetadata: AuthenticationResult.NewDeviceMetadata,
+					accessToken: AuthenticationResult.AccessToken,
+				}),
 				signInDetails,
 			});
 

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

@@ -12,8 +12,7 @@ import { ConfirmSignUpInput, ConfirmSignUpOutput } from '../types';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { ConfirmSignUpException } from '../types/errors';
-import { confirmSignUp as confirmSignUpClient } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { AutoSignInEventData } from '../types/models';
 import {
 	isAutoSignInStarted,
@@ -22,6 +21,8 @@ import {
 } from '../utils/signUpHelpers';
 import { getAuthUserAgentValue } from '../../../utils';
 import { getUserContextData } from '../utils/userContextData';
+import { createConfirmSignUpClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Confirms a new user account.
@@ -41,7 +42,7 @@ export async function confirmSignUp(
 
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-	const { userPoolId, userPoolClientId } = authConfig;
+	const { userPoolId, userPoolClientId, userPoolEndpoint } = authConfig;
 	const clientMetadata = options?.clientMetadata;
 	assertValidationError(
 		!!username,
@@ -58,9 +59,15 @@ export async function confirmSignUp(
 		userPoolClientId,
 	});
 
+	const confirmSignUpClient = createConfirmSignUpClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
+
 	await confirmSignUpClient(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(authConfig.userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.ConfirmSignUp),
 		},
 		{