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

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

@@ -9,12 +9,13 @@ import {
 
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
-import { verifyUserAttribute } from '../utils/clients/CognitoIdentityProvider';
 import { VerifyUserAttributeException } from '../types/errors';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokens } from '../utils/types';
 import { ConfirmUserAttributeInput } from '../types';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createVerifyUserAttributeClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Confirms a user attribute with the confirmation code.
@@ -30,6 +31,7 @@ export async function confirmUserAttribute(
 ): Promise<void> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { confirmationCode, userAttributeKey } = input;
 	assertValidationError(
 		!!confirmationCode,
@@ -37,9 +39,14 @@ export async function confirmUserAttribute(
 	);
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
+	const verifyUserAttribute = createVerifyUserAttributeClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await verifyUserAttribute(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.ConfirmUserAttribute),
 		},
 		{

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

@@ -7,12 +7,13 @@ import {
 	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
 
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokens } from '../utils/types';
-import { deleteUser as serviceDeleteUser } from '../utils/clients/CognitoIdentityProvider';
 import { DeleteUserException } from '../types/errors';
 import { tokenOrchestrator } from '../tokenProvider';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createDeleteUserClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 import { signOut } from './signOut';
 
@@ -25,13 +26,17 @@ import { signOut } from './signOut';
 export async function deleteUser(): Promise<void> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession();
 	assertAuthTokens(tokens);
-
+	const serviceDeleteUser = createDeleteUserClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await serviceDeleteUser(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.DeleteUser),
 		},
 		{

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

@@ -7,12 +7,13 @@ import {
 	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
 
-import { deleteUserAttributes as deleteUserAttributesClient } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokens } from '../utils/types';
 import { DeleteUserAttributesInput } from '../types';
 import { DeleteUserAttributesException } from '../types/errors';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createDeleteUserAttributesClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Deletes user attributes.
@@ -27,11 +28,17 @@ export async function deleteUserAttributes(
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
 	const { userAttributeKeys } = input;
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
+	const deleteUserAttributesClient = createDeleteUserAttributesClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await deleteUserAttributesClient(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.DeleteUserAttributes),
 		},
 		{

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

@@ -8,12 +8,13 @@ import {
 } from '@aws-amplify/core/internals/utils';
 
 import { FetchDevicesOutput } from '../types';
-import { listDevices } from '../utils/clients/CognitoIdentityProvider';
-import { DeviceType } from '../utils/clients/CognitoIdentityProvider/types';
+import { DeviceType } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import { assertAuthTokens } from '../utils/types';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { rememberDevice } from '..';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createListDevicesClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 // Cognito Documentation for max device
 // https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_ListDevices.html#API_ListDevices_RequestSyntax
@@ -30,13 +31,17 @@ const MAX_DEVICES = 60;
 export async function fetchDevices(): Promise<FetchDevicesOutput> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession();
 	assertAuthTokens(tokens);
-
+	const listDevices = createListDevicesClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const response = await listDevices(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.FetchDevices),
 		},
 		{

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

@@ -10,10 +10,11 @@ import {
 import { FetchMFAPreferenceOutput } from '../types';
 import { getMFAType, getMFATypes } from '../utils/signInHelpers';
 import { GetUserException } from '../types/errors';
-import { getUser } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokens } from '../utils/types';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createGetUserClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Fetches the preferred MFA setting and enabled MFA settings for the user.
@@ -26,11 +27,17 @@ import { getAuthUserAgentValue } from '../../../utils';
 export async function fetchMFAPreference(): Promise<FetchMFAPreferenceOutput> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
+	const getUser = createGetUserClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const { PreferredMfaSetting, UserMFASettingList } = await getUser(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.FetchMFAPreference),
 		},
 		{

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

@@ -7,13 +7,14 @@ import {
 	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
 
-import { forgetDevice as serviceForgetDevice } from '../utils/clients/CognitoIdentityProvider';
 import { assertAuthTokens, assertDeviceMetadata } from '../utils/types';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { tokenOrchestrator } from '../tokenProvider';
 import { ForgetDeviceInput } from '../types';
 import { ForgetDeviceException } from '../../cognito/types/errors';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createForgetDeviceClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Forget a remembered device while authenticated.
@@ -27,17 +28,21 @@ export async function forgetDevice(input?: ForgetDeviceInput): Promise<void> {
 	const { device: { id: externalDeviceKey } = { id: undefined } } = input ?? {};
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession();
 	assertAuthTokens(tokens);
 
 	const deviceMetadata = await tokenOrchestrator.getDeviceMetadata();
 	const currentDeviceKey = deviceMetadata?.deviceKey;
 	if (!externalDeviceKey) assertDeviceMetadata(deviceMetadata);
-
+	const serviceForgetDevice = createForgetDeviceClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await serviceForgetDevice(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.ForgetDevice),
 		},
 		{

package/src/providers/cognito/apis/internal/fetchUserAttributes.ts

@@ -8,26 +8,32 @@ import {
 	fetchAuthSession,
 } from '@aws-amplify/core/internals/utils';
 
-import { getUser } from '../../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../../foundation/parsers';
 import { assertAuthTokens } from '../../utils/types';
 import { FetchUserAttributesOutput } from '../../types';
 import { toAuthUserAttribute } from '../../utils/apiHelpers';
 import { getAuthUserAgentValue } from '../../../../utils';
+import { createGetUserClient } from '../../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../../factories';
 
 export const fetchUserAttributes = async (
 	amplify: AmplifyClassV6,
 ): Promise<FetchUserAttributesOutput> => {
 	const authConfig = amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession(amplify, {
 		forceRefresh: false,
 	});
 	assertAuthTokens(tokens);
-
+	const getUser = createGetUserClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const { UserAttributes } = await getUser(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.FetchUserAttributes),
 		},
 		{

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

@@ -7,12 +7,13 @@ import {
 	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
 
-import { updateDeviceStatus } from '../utils/clients/CognitoIdentityProvider';
 import { assertAuthTokens, assertDeviceMetadata } from '../utils/types';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { tokenOrchestrator } from '../tokenProvider';
 import { UpdateDeviceStatusException } from '../../cognito/types/errors';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createUpdateDeviceStatusClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Marks device as remembered while authenticated.
@@ -24,16 +25,20 @@ import { getAuthUserAgentValue } from '../../../utils';
 export async function rememberDevice(): Promise<void> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession();
 	assertAuthTokens(tokens);
 
 	const deviceMetadata = await tokenOrchestrator?.getDeviceMetadata();
 	assertDeviceMetadata(deviceMetadata);
-
+	const updateDeviceStatus = createUpdateDeviceStatusClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	await updateDeviceStatus(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.RememberDevice),
 		},
 		{

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

@@ -12,11 +12,12 @@ import { AuthDeliveryMedium } from '../../../types';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { ResendSignUpCodeInput, ResendSignUpCodeOutput } from '../types';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
-import { resendConfirmationCode } from '../utils/clients/CognitoIdentityProvider';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { getAuthUserAgentValue } from '../../../utils';
 import { getUserContextData } from '../utils/userContextData';
 import { ResendConfirmationException } from '../types/errors';
+import { createResendConfirmationCodeClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Resend the confirmation code while signing up
@@ -37,7 +38,7 @@ export async function resendSignUpCode(
 	);
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-	const { userPoolClientId, userPoolId } = authConfig;
+	const { userPoolClientId, userPoolId, userPoolEndpoint } = authConfig;
 	const clientMetadata = input.options?.clientMetadata;
 
 	const UserContextData = getUserContextData({
@@ -45,10 +46,14 @@ export async function resendSignUpCode(
 		userPoolId,
 		userPoolClientId,
 	});
-
+	const resendConfirmationCode = createResendConfirmationCodeClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const { CodeDeliveryDetails } = await resendConfirmationCode(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(authConfig.userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.ResendSignUpCode),
 		},
 		{

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

@@ -12,11 +12,12 @@ import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { AuthDeliveryMedium } from '../../../types';
 import { ResetPasswordInput, ResetPasswordOutput } from '../types';
-import { forgotPassword } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { ForgotPasswordException } from '../../cognito/types/errors';
 import { getAuthUserAgentValue } from '../../../utils';
 import { getUserContextData } from '../utils/userContextData';
+import { createForgotPasswordClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Resets a user's password.
@@ -39,7 +40,7 @@ export async function resetPassword(
 	);
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
-	const { userPoolClientId, userPoolId } = authConfig;
+	const { userPoolClientId, userPoolId, userPoolEndpoint } = authConfig;
 	const clientMetadata = input.options?.clientMetadata;
 
 	const UserContextData = getUserContextData({
@@ -48,15 +49,20 @@ export async function resetPassword(
 		userPoolClientId,
 	});
 
+	const forgotPassword = createForgotPasswordClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const res = await forgotPassword(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.ResetPassword),
 		},
 		{
 			Username: username,
 			ClientMetadata: clientMetadata,
-			ClientId: authConfig.userPoolClientId,
+			ClientId: userPoolClientId,
 			UserContextData,
 		},
 	);

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

@@ -13,11 +13,12 @@ import {
 	SendUserAttributeVerificationCodeInput,
 	SendUserAttributeVerificationCodeOutput,
 } from '../types';
-import { getUserAttributeVerificationCode } from '../utils/clients/CognitoIdentityProvider';
 import { assertAuthTokens } from '../utils/types';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { GetUserAttributeVerificationException } from '../types/errors';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createGetUserAttributeVerificationCodeClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Resends user's confirmation code when updating attributes while authenticated.
@@ -34,11 +35,18 @@ export const sendUserAttributeVerificationCode = 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 getUserAttributeVerificationCode =
+		createGetUserAttributeVerificationCodeClient({
+			endpointResolver: createCognitoUserPoolEndpointResolver({
+				endpointOverride: userPoolEndpoint,
+			}),
+		});
 	const { CodeDeliveryDetails } = await getUserAttributeVerificationCode(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(
 				AuthAction.SendUserAttributeVerificationCode,
 			),

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

@@ -14,10 +14,11 @@ import {
 } from '../types/errors';
 import { SetUpTOTPOutput } from '../types';
 import { getTOTPSetupDetails } from '../utils/signInHelpers';
-import { associateSoftwareToken } from '../utils/clients/CognitoIdentityProvider';
-import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
+import { getRegionFromUserPoolId } from '../../../foundation/parsers';
 import { assertAuthTokens } from '../utils/types';
 import { getAuthUserAgentValue } from '../../../utils';
+import { createAssociateSoftwareTokenClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';
+import { createCognitoUserPoolEndpointResolver } from '../factories';
 
 /**
  * Sets up TOTP for the user.
@@ -30,12 +31,18 @@ import { getAuthUserAgentValue } from '../../../utils';
 export async function setUpTOTP(): Promise<SetUpTOTPOutput> {
 	const authConfig = Amplify.getConfig().Auth?.Cognito;
 	assertTokenProviderConfig(authConfig);
+	const { userPoolEndpoint, userPoolId } = authConfig;
 	const { tokens } = await fetchAuthSession({ forceRefresh: false });
 	assertAuthTokens(tokens);
 	const username = tokens.idToken?.payload['cognito:username'] ?? '';
+	const associateSoftwareToken = createAssociateSoftwareTokenClient({
+		endpointResolver: createCognitoUserPoolEndpointResolver({
+			endpointOverride: userPoolEndpoint,
+		}),
+	});
 	const { SecretCode } = await associateSoftwareToken(
 		{
-			region: getRegion(authConfig.userPoolId),
+			region: getRegionFromUserPoolId(userPoolId),
 			userAgentValue: getAuthUserAgentValue(AuthAction.SetUpTOTP),
 		},
 		{

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

@@ -9,7 +9,7 @@ import { assertValidationError } from '../../../errors/utils/assertValidationErr
 import { assertServiceError } from '../../../errors/utils/assertServiceError';
 import {
 	getActiveSignInUsername,
-	getNewDeviceMetatada,
+	getNewDeviceMetadata,
 	getSignInResult,
 	getSignInResultFromError,
 	handleCustomAuthFlowWithoutSRP,
@@ -29,7 +29,7 @@ import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import {
 	ChallengeName,
 	ChallengeParameters,
-} from '../utils/clients/CognitoIdentityProvider/types';
+} from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import { tokenOrchestrator } from '../tokenProvider';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
 
@@ -89,11 +89,12 @@ export async function signInWithCustomAuth(
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...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/signInWithCustomSRPAuth.ts

@@ -9,7 +9,7 @@ import { assertValidationError } from '../../../errors/utils/assertValidationErr
 import { assertServiceError } from '../../../errors/utils/assertServiceError';
 import {
 	getActiveSignInUsername,
-	getNewDeviceMetatada,
+	getNewDeviceMetadata,
 	getSignInResult,
 	getSignInResultFromError,
 	handleCustomSRPAuthFlow,
@@ -31,7 +31,7 @@ import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import {
 	ChallengeName,
 	ChallengeParameters,
-} from '../utils/clients/CognitoIdentityProvider/types';
+} from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import { tokenOrchestrator } from '../tokenProvider';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
 
@@ -92,11 +92,12 @@ export async function signInWithCustomSRPAuth(
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...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,
 			});
 			cleanActiveSignInState();

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

@@ -10,14 +10,14 @@ import { assertServiceError } from '../../../errors/utils/assertServiceError';
 import {
 	ChallengeName,
 	ChallengeParameters,
-} from '../utils/clients/CognitoIdentityProvider/types';
+} from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import {
 	InitiateAuthException,
 	RespondToAuthChallengeException,
 } from '../types/errors';
 import {
 	getActiveSignInUsername,
-	getNewDeviceMetatada,
+	getNewDeviceMetadata,
 	getSignInResult,
 	getSignInResultFromError,
 	handleUserSRPAuthFlow,
@@ -93,11 +93,12 @@ export async function signInWithSRP(
 			await cacheCognitoTokens({
 				username: activeUsername,
 				...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/signInWithUserPassword.ts

@@ -10,10 +10,10 @@ import { assertValidationError } from '../../../errors/utils/assertValidationErr
 import {
 	ChallengeName,
 	ChallengeParameters,
-} from '../utils/clients/CognitoIdentityProvider/types';
+} from '../../../foundation/factories/serviceClients/cognitoIdentityProvider/types';
 import {
 	getActiveSignInUsername,
-	getNewDeviceMetatada,
+	getNewDeviceMetadata,
 	getSignInResult,
 	getSignInResultFromError,
 	handleUserPasswordAuthFlow,
@@ -87,11 +87,12 @@ export async function signInWithUserPassword(
 			await cacheCognitoTokens({
 				...AuthenticationResult,
 				username: activeUsername,
-				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,
 			});
 			cleanActiveSignInState();