fix(clients): address feedbacks

Author: AllanZhengYP

packages/api/package.json

@@ -66,7 +66,7 @@
 			"name": "API (top-level class)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Amplify, API }",
-			"limit": "87.4 kB"
+			"limit": "87.5 kB"
 		}
 	],
 	"jest": {

packages/core/__tests__/Credentials-test.ts

@@ -4,8 +4,10 @@ import {
 	getCredentialsForIdentity,
 	getId,
 } from '../src/AwsClients/CognitoIdentity';
-jest.mock('../src/AwsClients/CognitoIdentity');
 import { Hub } from '../src/Hub';
+
+jest.mock('../src/AwsClients/CognitoIdentity');
+
 const session = {};
 
 const user = {

packages/core/package.json

@@ -116,7 +116,7 @@
 		},
 		{
 			"name": "Custom clients (unauthenticated handler)",
-			"path": "./lib-esm/clients/handlers/unauth.js",
+			"path": "./lib-esm/clients/handlers/unauthenticated.js",
 			"import": "{ unauthenticatedHandler }",
 			"limit": "2.75 kB"
 		}

packages/core/src/AwsClients/CognitoIdentity/base.ts

@@ -6,7 +6,7 @@ import type {
 	Middleware,
 } from '../../clients/types';
 import { composeTransferHandler } from '../../clients/internal/composeTransferHandler';
-import { unauthenticatedHandler } from '../../clients/handlers/unauth';
+import { unauthenticatedHandler } from '../../clients/handlers/unauthenticated';
 import {
 	jitteredBackoff,
 	getRetryDecider,

packages/core/src/AwsClients/CognitoIdentity/getCredentialsForIdentity.ts

@@ -1,6 +1,7 @@
 import type {
 	GetCredentialsForIdentityCommandInput,
 	GetCredentialsForIdentityCommandOutput,
+	Credentials,
 } from '@aws-sdk/client-cognito-identity';
 import {
 	buildHttpRpcRequest,
@@ -10,7 +11,11 @@ import {
 } from './base';
 import { composeServiceApi } from '../../clients/internal/composeApiHandler';
 import { Endpoint, HttpRequest, HttpResponse } from '../../clients/types';
-import { parseJsonBody, parseJsonError } from '../../clients/serde';
+import {
+	parseJsonBody,
+	parseJsonError,
+	parseMetadata,
+} from '../../clients/serde';
 
 export type {
 	GetCredentialsForIdentityCommandInput,
@@ -35,15 +40,20 @@ const getCredentialsForIdentityDeserializer = async (
 	} else {
 		const body = await parseJsonBody(response);
 		return {
-			...body,
-			Credentials: {
-				...body.Credentials,
-				Expiration: new Date(body.Credentials.Expiration * 1000),
-			},
-		} as GetCredentialsForIdentityCommandOutput;
+			IdentityId: body.IdentityId,
+			Credentials: de_Credentials(body.Credentials),
+			$metadata: parseMetadata(response),
+		};
 	}
 };
 
+const de_Credentials = (output: unknown = {}): Credentials => ({
+	AccessKeyId: output['AccessKeyId'] as string,
+	SecretKey: output['SecretKey'] as string,
+	SessionToken: output['SessionToken'] as string,
+	Expiration: new Date((output['Expiration'] as number) * 1000),
+});
+
 export const getCredentialsForIdentity = composeServiceApi(
 	cognitoIdentityTransferHandler,
 	getCredentialsForIdentitySerializer,

packages/core/src/AwsClients/CognitoIdentity/getId.ts

@@ -10,7 +10,11 @@ import {
 } from './base';
 import { composeServiceApi } from '../../clients/internal/composeApiHandler';
 import { Endpoint, HttpRequest, HttpResponse } from '../../clients/types';
-import { parseJsonBody, parseJsonError } from '../../clients/serde';
+import {
+	parseJsonBody,
+	parseJsonError,
+	parseMetadata,
+} from '../../clients/serde';
 
 export type {
 	GetIdCommandInput,
@@ -34,7 +38,10 @@ const getIdDeserializer = async (
 		throw error;
 	} else {
 		const body = await parseJsonBody(response);
-		return body as GetIdCommandOutput;
+		return {
+			IdentityId: body.IdentityId,
+			$metadata: parseMetadata(response),
+		};
 	}
 };
 

packages/core/src/clients/handlers/fetch.ts

@@ -26,13 +26,13 @@ export const fetchTransferHandler: TransferHandler<
 		throw e;
 	}
 
-	const headersBag = {};
+	const headers = {};
 	resp.headers?.forEach((value, key) => {
-		headersBag[key.toLowerCase()] = value;
+		headers[key.toLowerCase()] = value;
 	});
 	const httpResponse = {
 		statusCode: resp.status,
-		headers: headersBag,
+		headers,
 		body: null,
 	};
 

packages/core/src/clients/handlers/unauth.ts packages/core/src/clients/handlers/unauthenticated.ts

@@ -7,13 +7,13 @@ import { HttpResponse, ErrorParser } from '../../types';
 export const getRetryDecider =
 	(errorParser: ErrorParser) =>
 	async (response?: HttpResponse, error?: Error): Promise<boolean> => {
-		const errorFromResponse = error ?? (await errorParser(response));
+		const { name: errorCode } = error ?? (await errorParser(response)) ?? {};
 		const statusCode = response?.statusCode;
 		return (
 			isConnectionError(error) ||
-			isThrottlingError(statusCode, errorFromResponse.name) ||
-			isClockSkewError(errorFromResponse.name) ||
-			isServerSideError(statusCode, errorFromResponse.name)
+			isThrottlingError(statusCode, errorCode) ||
+			isClockSkewError(errorCode) ||
+			isServerSideError(statusCode, errorCode)
 		);
 	};
 

packages/core/src/clients/middleware/retry/defaultRetryDecider.ts

@@ -11,15 +11,15 @@ const DEFAULT_RETRY_ATTEMPTS = 3;
 /**
  * Configuration of the retry middleware
  */
-export interface RetryOptions<ResponseType = Response> {
+export interface RetryOptions<TResponse = Response> {
 	/**
 	 * Function to decide if the request should be retried.
 	 *
 	 * @param response Optional response of the request.
 	 * @param error Optional error thrown from previous attempts.
 	 * @returns True if the request should be retried.
 	 */
-	retryDecider: (response?: ResponseType, error?: unknown) => Promise<boolean>;
+	retryDecider: (response?: TResponse, error?: unknown) => Promise<boolean>;
 	/**
 	 * Function to compute the delay in milliseconds before the next retry based
 	 * on the number of attempts.
@@ -40,14 +40,17 @@ export interface RetryOptions<ResponseType = Response> {
 /**
  * Retry middleware
  */
-export const retryMiddleware = <Input = Request, Output = Response>(
-	options: RetryOptions<Output>
+export const retryMiddleware = <TInput = Request, TOutput = Response>(
+	options: RetryOptions<TOutput>
 ) => {
 	if (options.maxAttempts < 1) {
 		throw new Error('maxAttempts must be greater than 0');
 	}
-	return (next: MiddlewareHandler<Input, Output>, context: MiddlewareContext) =>
-		async function retryMiddleware(request: Input) {
+	return (
+		next: MiddlewareHandler<TInput, TOutput>,
+		context: MiddlewareContext
+	) =>
+		async function retryMiddleware(request: TInput) {
 			const {
 				maxAttempts = DEFAULT_RETRY_ATTEMPTS,
 				retryDecider,
@@ -56,7 +59,7 @@ export const retryMiddleware = <Input = Request, Output = Response>(
 			} = options;
 			let error: Error;
 			let attemptsCount = context.attemptsCount ?? 0;
-			let response: Output;
+			let response: TOutput;
 			while (!abortSignal?.aborted && attemptsCount < maxAttempts) {
 				error = undefined;
 				response = undefined;

packages/core/src/clients/middleware/retry/middleware.ts

@@ -19,7 +19,8 @@ export const userAgentMiddleware: Middleware<
 	next => {
 		return async function userAgentMiddleware(request) {
 			if (userAgentValue.trim().length === 0) {
-				return await next(request);
+				const result = await next(request);
+				return result;
 			} else {
 				const headerName = userAgentHeader.toLowerCase();
 				request.headers[headerName] = request.headers[headerName]

packages/core/src/clients/middleware/userAgent/middleware.ts

@@ -16,15 +16,9 @@ export const parseJsonError: ErrorParser = async (response?: HttpResponse) => {
 	}
 	const body = await parseJsonBody(response);
 	const sanitizeErrorCode = (rawValue: string | number): string => {
-		let cleanValue = rawValue.toString();
-		if (cleanValue.includes(',')) {
-			[cleanValue] = cleanValue.split(',');
-		}
-		if (cleanValue.includes(':')) {
-			[cleanValue] = cleanValue.split(':');
-		}
+		const [cleanValue] = rawValue.toString().split(/[\,\:]+/);
 		if (cleanValue.includes('#')) {
-			[cleanValue] = cleanValue.split('#');
+			return cleanValue.split('#')[1];
 		}
 		return cleanValue;
 	};
@@ -42,6 +36,9 @@ export const parseJsonError: ErrorParser = async (response?: HttpResponse) => {
 	});
 };
 
+/**
+ * Parse JSON response body to JavaScript object.
+ */
 export const parseJsonBody = async (response: HttpResponse): Promise<any> => {
 	if (!response.body) {
 		throw new Error('Missing response payload');