chore(core): refactor cognito identtiy clients to be factories

aws-amplify · Oct 3, 2024 · 78ee7df · 78ee7df
1 parent 6f394c7
commit 78ee7df
Show file tree

Hide file tree

Showing 22 changed files with 302 additions and 273 deletions.
diff --git a/packages/core/__tests__/awsClients/cognitoIdentity/getCredentialsForIdentity.test.ts b/packages/core/__tests__/awsClients/cognitoIdentity/getCredentialsForIdentity.test.ts
@@ -1,9 +1,10 @@
+import { createGetCredentialsForIdentityClient } from '../../../src';
 import { fetchTransferHandler } from '../../../src/clients/handlers/fetch';
 import {
 	GetCredentialsForIdentityInput,
 	GetCredentialsForIdentityOutput,
-	getCredentialsForIdentity,
-} from '../../../src/awsClients/cognitoIdentity';
+} from '../../../src/foundation/factories/serviceClients/cognitoIdentity/types';
+import { AmplifyUrl } from '../../../src/libraryUtils';
 import {
 	cognitoIdentityHandlerOptions,
 	mockCredentials,
@@ -60,6 +61,14 @@ describe('CognitoIdentity - getCredentialsForIdentity', () => {
 		(fetchTransferHandler as jest.Mock).mockResolvedValue(
 			mockJsonResponse(succeedResponse),
 		);
+		const getCredentialsForIdentity = createGetCredentialsForIdentityClient({
+			endpointResolver: jest.fn(() => ({
+				url: new AmplifyUrl(
+					'https://cognito-identity.us-east-1.amazonaws.com/',
+				),
+			})),
+		});
+
 		const response = await getCredentialsForIdentity(
 			cognitoIdentityHandlerOptions,
 			params,
@@ -91,6 +100,13 @@ describe('CognitoIdentity - getCredentialsForIdentity', () => {
 			mockJsonResponse(failureResponse),
 		);
 		expect.assertions(1);
+		const getCredentialsForIdentity = createGetCredentialsForIdentityClient({
+			endpointResolver: jest.fn(() => ({
+				url: new AmplifyUrl(
+					'https://cognito-identity.us-east-1.amazonaws.com/',
+				),
+			})),
+		});
 		try {
 			await getCredentialsForIdentity(cognitoIdentityHandlerOptions, params);
 			fail('test should fail');

diff --git a/packages/core/__tests__/awsClients/cognitoIdentity/getId.test.ts b/packages/core/__tests__/awsClients/cognitoIdentity/getId.test.ts
@@ -1,9 +1,10 @@
+import { createGetIdClient } from '../../../src';
 import { fetchTransferHandler } from '../../../src/clients/handlers/fetch';
 import {
 	GetIdInput,
 	GetIdOutput,
-	getId,
-} from '../../../src/awsClients/cognitoIdentity';
+} from '../../../src/foundation/factories/serviceClients/cognitoIdentity/types';
+import { AmplifyUrl } from '../../../src/libraryUtils';
 import {
 	cognitoIdentityHandlerOptions,
 	mockIdentityId,
@@ -57,6 +58,13 @@ describe('CognitoIdentity - getId', () => {
 		(fetchTransferHandler as jest.Mock).mockResolvedValue(
 			mockJsonResponse(succeedResponse),
 		);
+		const getId = createGetIdClient({
+			endpointResolver: jest.fn(() => ({
+				url: new AmplifyUrl(
+					'https://cognito-identity.us-east-1.amazonaws.com/',
+				),
+			})),
+		});
 		const response = await getId(cognitoIdentityHandlerOptions, params);
 		expect(response).toEqual(expectedOutput);
 		expect(fetchTransferHandler).toHaveBeenCalledWith(
@@ -85,6 +93,13 @@ describe('CognitoIdentity - getId', () => {
 			mockJsonResponse(failureResponse),
 		);
 		expect.assertions(1);
+		const getId = createGetIdClient({
+			endpointResolver: jest.fn(() => ({
+				url: new AmplifyUrl(
+					'https://cognito-identity.us-east-1.amazonaws.com/',
+				),
+			})),
+		});
 		try {
 			await getId(cognitoIdentityHandlerOptions, params);
 			fail('test should fail');

diff --git a/packages/core/src/awsClients/cognitoIdentity/base.ts b/packages/core/src/awsClients/cognitoIdentity/base.ts
diff --git a/packages/core/src/awsClients/cognitoIdentity/getCredentialsForIdentity.ts b/packages/core/src/awsClients/cognitoIdentity/getCredentialsForIdentity.ts
diff --git a/packages/core/src/awsClients/cognitoIdentity/getId.ts b/packages/core/src/awsClients/cognitoIdentity/getId.ts
diff --git a/packages/core/src/awsClients/cognitoIdentity/index.ts b/packages/core/src/awsClients/cognitoIdentity/index.ts
diff --git a/packages/core/src/foundation/factories/middleware/createDisableCacheMiddleware.ts b/packages/core/src/foundation/factories/middleware/createDisableCacheMiddleware.ts
@@ -0,0 +1,18 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { HttpRequest, HttpResponse, Middleware } from '../../../clients';
+
+/**
+ * A Cognito Identity-specific middleware that disables caching for all requests.
+ */
+export const createDisableCacheMiddleware: Middleware<
+	HttpRequest,
+	HttpResponse,
+	Record<string, unknown>
+> = () => next =>
+	async function disableCacheMiddleware(request) {
+		request.headers['cache-control'] = 'no-store';
+
+		return next(request);
+	};
diff --git a/packages/core/src/foundation/factories/middleware/index.ts b/packages/core/src/foundation/factories/middleware/index.ts
@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { createDisableCacheMiddleware } from './createDisableCacheMiddleware';
diff --git a/...oundation/factories/serviceClients/cognitoIdentity/cognitoIdentityPoolEndpointResolver.ts b/...oundation/factories/serviceClients/cognitoIdentity/cognitoIdentityPoolEndpointResolver.ts
@@ -0,0 +1,15 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { EndpointResolverOptions, getDnsSuffix } from '../../../../clients';
+import { AmplifyUrl } from '../../../../libraryUtils';
+
+import { COGNITO_IDENTITY_SERVICE_NAME } from './constants';
+
+export const cognitoIdentityPoolEndpointResolver = ({
+	region,
+}: EndpointResolverOptions) => ({
+	url: new AmplifyUrl(
+		`https://${COGNITO_IDENTITY_SERVICE_NAME}.${region}.${getDnsSuffix(region)}`,
+	),
+});