rename file

aws-amplify · Aug 19, 2024 · 67d0101 · 67d0101
1 parent e4cfb9d
commit 67d0101
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/...__tests__/utils/iamAuthApplicable.test.ts → ...tests__/utils/isIamAuthApplicable.test.ts b/...__tests__/utils/iamAuthApplicable.test.ts → ...tests__/utils/isIamAuthApplicable.test.ts
@@ -6,7 +6,7 @@ import { HttpRequest } from '@aws-amplify/core/internals/aws-client-utils';
 import {
 	isIamAuthApplicableForGraphQL,
 	isIamAuthApplicableForRest,
-} from '../../src/utils/iamAuthApplicable';
+} from '../../src/utils/isIamAuthApplicable';
 
 describe('iamAuthApplicable', () => {
 	const url = new URL('https://url');

diff --git a/packages/api-rest/src/apis/common/handler.ts b/packages/api-rest/src/apis/common/handler.ts
@@ -41,11 +41,11 @@ type HandlerOptions = Omit<HttpRequest, 'body' | 'headers'> & {
 export const transferHandler = async (
 	amplify: AmplifyClassV6,
 	options: HandlerOptions & { abortSignal: AbortSignal },
-	signingServiceInfo?: SigningServiceInfo,
-	iamAuthApplicable?: (
+	iamAuthApplicable: (
 		{ headers }: HttpRequest,
 		signingServiceInfo?: SigningServiceInfo,
 	) => boolean,
+	signingServiceInfo?: SigningServiceInfo,
 ): Promise<RestApiResponse> => {
 	const { url, method, headers, body, withCredentials, abortSignal } = options;
 	const resolvedBody = body
@@ -67,8 +67,7 @@ export const transferHandler = async (
 		abortSignal,
 	};
 
-	const isIamAuthApplicable =
-		iamAuthApplicable && iamAuthApplicable(request, signingServiceInfo);
+	const isIamAuthApplicable = iamAuthApplicable(request, signingServiceInfo);
 
 	let response: RestApiResponse;
 	const credentials = await resolveCredentials(amplify);

diff --git a/packages/api-rest/src/apis/common/internalPost.ts b/packages/api-rest/src/apis/common/internalPost.ts
@@ -6,7 +6,7 @@ import { AmplifyClassV6 } from '@aws-amplify/core';
 import { InternalPostInput, RestApiResponse } from '../../types';
 import { createCancellableOperation } from '../../utils';
 import { CanceledError } from '../../errors';
-import { isIamAuthApplicableForGraphQL } from '../../utils/iamAuthApplicable';
+import { isIamAuthApplicableForGraphQL } from '../../utils/isIamAuthApplicable';
 
 import { transferHandler } from './handler';
 
@@ -67,8 +67,8 @@ export const post = (
 				...options,
 				abortSignal: controller.signal,
 			},
-			options?.signingServiceInfo,
 			isIamAuthApplicableForGraphQL,
+			options?.signingServiceInfo,
 		);
 
 		return response;

diff --git a/packages/api-rest/src/apis/common/publicApis.ts b/packages/api-rest/src/apis/common/publicApis.ts
@@ -25,7 +25,7 @@ import {
 	parseSigningInfo,
 	resolveApiUrl,
 } from '../../utils';
-import { isIamAuthApplicableForRest } from '../../utils/iamAuthApplicable';
+import { isIamAuthApplicableForRest } from '../../utils/isIamAuthApplicable';
 
 import { transferHandler } from './handler';
 
@@ -72,8 +72,8 @@ const publicHandler = (
 				headers,
 				abortSignal,
 			},
-			signingServiceInfo,
 			isIamAuthApplicableForRest,
+			signingServiceInfo,
 		);
 	});
 

diff --git a/...s/api-rest/src/utils/iamAuthApplicable.ts → ...api-rest/src/utils/isIamAuthApplicable.ts b/...s/api-rest/src/utils/iamAuthApplicable.ts → ...api-rest/src/utils/isIamAuthApplicable.ts