@aws-amplify/core 5.5.3-graphql-api-functional-options.2 → 5.5.3-unstable.ec57e85.2

package/lib/clients/middleware/signing/signer/signatureV4/types/signer.d.ts

@@ -4,6 +4,15 @@ export interface SignRequestOptions {
     signingDate?: Date;
     signingRegion: string;
     signingService: string;
+    /**
+     * Whether to uri encode the path as part of canonical uri. It's used for S3 only where the pathname
+     * is already uri encoded, and the signing process is not expected to uri encode it again.
+     *
+     * @default true
+     *
+     * @see https://github.com/aws/aws-sdk-js-v3/blob/9ba012dfa3a3429aa2db0f90b3b0b3a7a31f9bc3/packages/signature-v4/src/SignatureV4.ts#L76-L83
+     */
+    uriEscapePath?: boolean;
 }
 export interface PresignUrlOptions extends SignRequestOptions {
     expiration?: number;
@@ -15,6 +24,6 @@ export interface FormattedDates {
     longDate: string;
     shortDate: string;
 }
-export interface SigningValues extends Credentials, FormattedDates, Pick<SignRequestOptions, 'signingRegion' | 'signingService'> {
+export interface SigningValues extends Credentials, FormattedDates, Pick<SignRequestOptions, 'signingRegion' | 'signingService' | 'uriEscapePath'> {
     credentialScope: string;
 }

package/lib/clients/middleware/signing/signer/signatureV4/utils/getCanonicalRequest.d.ts

@@ -3,6 +3,8 @@ import { HttpRequest } from '../../../../../types';
  * Returns a canonical request.
  *
  * @param request `HttpRequest` from which to create the canonical request from.
+ * @param uriEscapePath Whether to uri encode the path as part of canonical uri. It's used for S3 only where the
+ *   pathname is already uri encoded, and the signing process is not expected to uri encode it again. Defaults to true.
  * @returns String created by by concatenating the following strings, separated by newline characters:
  * - HTTPMethod
  * - CanonicalUri
@@ -13,4 +15,4 @@ import { HttpRequest } from '../../../../../types';
  *
  * @internal
  */
-export declare const getCanonicalRequest: ({ body, headers, method, url, }: HttpRequest) => string;
+export declare const getCanonicalRequest: ({ body, headers, method, url }: HttpRequest, uriEscapePath?: boolean) => string;

package/lib/clients/middleware/signing/signer/signatureV4/utils/getCanonicalRequest.js

@@ -12,6 +12,8 @@ var getSignedHeaders_1 = require("./getSignedHeaders");
  * Returns a canonical request.
  *
  * @param request `HttpRequest` from which to create the canonical request from.
+ * @param uriEscapePath Whether to uri encode the path as part of canonical uri. It's used for S3 only where the
+ *   pathname is already uri encoded, and the signing process is not expected to uri encode it again. Defaults to true.
  * @returns String created by by concatenating the following strings, separated by newline characters:
  * - HTTPMethod
  * - CanonicalUri
@@ -22,11 +24,12 @@ var getSignedHeaders_1 = require("./getSignedHeaders");
  *
  * @internal
  */
-var getCanonicalRequest = function (_a) {
+var getCanonicalRequest = function (_a, uriEscapePath) {
     var body = _a.body, headers = _a.headers, method = _a.method, url = _a.url;
+    if (uriEscapePath === void 0) { uriEscapePath = true; }
     return [
         method,
-        (0, getCanonicalUri_1.getCanonicalUri)(url.pathname),
+        (0, getCanonicalUri_1.getCanonicalUri)(url.pathname, uriEscapePath),
         (0, getCanonicalQueryString_1.getCanonicalQueryString)(url.searchParams),
         (0, getCanonicalHeaders_1.getCanonicalHeaders)(headers),
         (0, getSignedHeaders_1.getSignedHeaders)(headers),

package/lib/clients/middleware/signing/signer/signatureV4/utils/getCanonicalUri.d.ts

@@ -2,9 +2,11 @@
  * Returns a canonical uri.
  *
  * @param pathname `pathname` from request url.
+ * @param uriEscapePath Whether to uri encode the path as part of canonical uri. It's used for S3 only where the
+ *   pathname is already uri encoded, and the signing process is not expected to uri encode it again. Defaults to true.
  * @returns URI-encoded version of the absolute path component URL (everything between the host and the question mark
  * character (?) that starts the query string parameters). If the absolute path is empty, a forward slash character (/).
  *
  * @internal
  */
-export declare const getCanonicalUri: (pathname: string) => string;
+export declare const getCanonicalUri: (pathname: string, uriEscapePath?: boolean) => string;

package/lib/clients/middleware/signing/signer/signatureV4/utils/getCanonicalUri.js

@@ -7,12 +7,19 @@ exports.getCanonicalUri = void 0;
  * Returns a canonical uri.
  *
  * @param pathname `pathname` from request url.
+ * @param uriEscapePath Whether to uri encode the path as part of canonical uri. It's used for S3 only where the
+ *   pathname is already uri encoded, and the signing process is not expected to uri encode it again. Defaults to true.
  * @returns URI-encoded version of the absolute path component URL (everything between the host and the question mark
  * character (?) that starts the query string parameters). If the absolute path is empty, a forward slash character (/).
  *
  * @internal
  */
-var getCanonicalUri = function (pathname) {
-    return pathname ? encodeURIComponent(pathname).replace(/%2F/g, '/') : '/';
+var getCanonicalUri = function (pathname, uriEscapePath) {
+    if (uriEscapePath === void 0) { uriEscapePath = true; }
+    return pathname
+        ? uriEscapePath
+            ? encodeURIComponent(pathname).replace(/%2F/g, '/')
+            : pathname
+        : '/';
 };
 exports.getCanonicalUri = getCanonicalUri;

package/lib/clients/middleware/signing/signer/signatureV4/utils/getSignature.d.ts

@@ -10,4 +10,4 @@ import { SigningValues } from '../types/signer';
  *
  * @internal
  */
-export declare const getSignature: (request: HttpRequest, { credentialScope, longDate, secretAccessKey, shortDate, signingRegion, signingService, }: SigningValues) => string;
+export declare const getSignature: (request: HttpRequest, { credentialScope, longDate, secretAccessKey, shortDate, signingRegion, signingService, uriEscapePath, }: SigningValues) => string;

package/lib/clients/middleware/signing/signer/signatureV4/utils/getSignature.js

@@ -18,9 +18,9 @@ var getStringToSign_1 = require("./getStringToSign");
  * @internal
  */
 var getSignature = function (request, _a) {
-    var credentialScope = _a.credentialScope, longDate = _a.longDate, secretAccessKey = _a.secretAccessKey, shortDate = _a.shortDate, signingRegion = _a.signingRegion, signingService = _a.signingService;
+    var credentialScope = _a.credentialScope, longDate = _a.longDate, secretAccessKey = _a.secretAccessKey, shortDate = _a.shortDate, signingRegion = _a.signingRegion, signingService = _a.signingService, uriEscapePath = _a.uriEscapePath;
     // step 1: create a canonical request
-    var canonicalRequest = (0, getCanonicalRequest_1.getCanonicalRequest)(request);
+    var canonicalRequest = (0, getCanonicalRequest_1.getCanonicalRequest)(request, uriEscapePath);
     // step 2: create a hash of the canonical request
     var hashedRequest = (0, dataHashHelpers_1.getHashedDataAsHex)(null, canonicalRequest);
     // step 3: create a string to sign

package/lib/clients/middleware/signing/signer/signatureV4/utils/getSigningValues.d.ts

@@ -8,4 +8,4 @@ import { SigningValues } from '../types/signer';
  *
  * @internal
  */
-export declare const getSigningValues: ({ credentials, signingDate, signingRegion, signingService, }: SignRequestOptions) => SigningValues;
+export declare const getSigningValues: ({ credentials, signingDate, signingRegion, signingService, uriEscapePath, }: SignRequestOptions) => SigningValues;

package/lib/clients/middleware/signing/signer/signatureV4/utils/getSigningValues.js

@@ -14,11 +14,11 @@ var getFormattedDates_1 = require("./getFormattedDates");
  * @internal
  */
 var getSigningValues = function (_a) {
-    var credentials = _a.credentials, _b = _a.signingDate, signingDate = _b === void 0 ? new Date() : _b, signingRegion = _a.signingRegion, signingService = _a.signingService;
+    var credentials = _a.credentials, _b = _a.signingDate, signingDate = _b === void 0 ? new Date() : _b, signingRegion = _a.signingRegion, signingService = _a.signingService, _c = _a.uriEscapePath, uriEscapePath = _c === void 0 ? true : _c;
     // get properties from credentials
     var accessKeyId = credentials.accessKeyId, secretAccessKey = credentials.secretAccessKey, sessionToken = credentials.sessionToken;
     // get formatted dates for signing
-    var _c = (0, getFormattedDates_1.getFormattedDates)(signingDate), longDate = _c.longDate, shortDate = _c.shortDate;
+    var _d = (0, getFormattedDates_1.getFormattedDates)(signingDate), longDate = _d.longDate, shortDate = _d.shortDate;
     // copy header and set signing properties
     var credentialScope = (0, getCredentialScope_1.getCredentialScope)(shortDate, signingRegion, signingService);
     return {
@@ -30,6 +30,7 @@ var getSigningValues = function (_a) {
         shortDate: shortDate,
         signingRegion: signingRegion,
         signingService: signingService,
+        uriEscapePath: uriEscapePath,
     };
 };
 exports.getSigningValues = getSigningValues;

package/lib/clients/serde/responseInfo.js

@@ -14,10 +14,12 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMetadata = void 0;
-var middleware_1 = require("../middleware/retry/middleware");
 var parseMetadata = function (response) {
     var _a, _b;
     var headers = response.headers, statusCode = response.statusCode;
-    return __assign(__assign({}, ((0, middleware_1.isMetadataBearer)(response) ? response.$metadata : {})), { httpStatusCode: statusCode, requestId: (_b = (_a = headers['x-amzn-requestid']) !== null && _a !== void 0 ? _a : headers['x-amzn-request-id']) !== null && _b !== void 0 ? _b : headers['x-amz-request-id'], extendedRequestId: headers['x-amz-id-2'], cfId: headers['x-amz-cf-id'] });
+    return __assign(__assign({}, (isMetadataBearer(response) ? response.$metadata : {})), { httpStatusCode: statusCode, requestId: (_b = (_a = headers['x-amzn-requestid']) !== null && _a !== void 0 ? _a : headers['x-amzn-request-id']) !== null && _b !== void 0 ? _b : headers['x-amz-request-id'], extendedRequestId: headers['x-amz-id-2'], cfId: headers['x-amz-cf-id'] });
 };
 exports.parseMetadata = parseMetadata;
+var isMetadataBearer = function (response) {
+    return typeof (response === null || response === void 0 ? void 0 : response['$metadata']) === 'object';
+};

package/lib/clients/types/aws.d.ts

@@ -1,6 +1,7 @@
+import { MetadataBearer } from '@aws-sdk/types';
 import { Endpoint } from './core';
 import { HttpResponse } from './http';
-export type { Credentials } from '@aws-sdk/types';
+export type { Credentials, MetadataBearer } from '@aws-sdk/types';
 export type SourceData = string | ArrayBuffer | ArrayBufferView;
 /**
  * Basic option type for endpoint resolvers. It contains region only.
@@ -10,10 +11,10 @@ export type EndpointResolverOptions = {
 };
 export interface ServiceClientOptions {
     region: string;
-    endpointResolver: (options: EndpointResolverOptions) => Endpoint;
+    endpointResolver: (options: EndpointResolverOptions, input?: any) => Endpoint;
 }
 /**
  * parse errors from given response. If no error code is found, return undefined.
  * This function is protocol-specific (e.g. JSON, XML, etc.)
  */
-export type ErrorParser = (response?: HttpResponse) => Promise<Error | undefined>;
+export type ErrorParser = (response?: HttpResponse) => Promise<(Error & MetadataBearer) | undefined>;

package/lib/clients/utils/memoization.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Cache the payload of a response body. It allows multiple calls to the body,
+ * for example, when reading the body in both retry decider and error deserializer.
+ * Caching body is allowed here because we call the body accessor(blob(), json(),
+ * etc.) when body is small or streaming implementation is not available(RN).
+ *
+ * @internal
+ */
+export declare const withMemoization: <T>(payloadAccessor: () => Promise<T>) => () => Promise<T>;

package/lib/clients/utils/memoization.js

@@ -0,0 +1,26 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withMemoization = void 0;
+/**
+ * Cache the payload of a response body. It allows multiple calls to the body,
+ * for example, when reading the body in both retry decider and error deserializer.
+ * Caching body is allowed here because we call the body accessor(blob(), json(),
+ * etc.) when body is small or streaming implementation is not available(RN).
+ *
+ * @internal
+ */
+var withMemoization = function (payloadAccessor) {
+    var cached;
+    return function () {
+        if (!cached) {
+            // Explicitly not awaiting. Intermediate await would add overhead and
+            // introduce a possible race in the event that this wrapper is called
+            // again before the first `payloadAccessor` call resolves.
+            cached = payloadAccessor();
+        }
+        return cached;
+    };
+};
+exports.withMemoization = withMemoization;