@aws-sdk/middleware-signing 3.170.0 → 3.178.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.178.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.177.0...v3.178.0) (2022-09-23)
+
+
+### Features
+
+* **endpoint:** endpoints 2.0 existing package changes ([#3947](https://github.com/aws/aws-sdk-js-v3/issues/3947)) ([df99fc3](https://github.com/aws/aws-sdk-js-v3/commit/df99fc33a43982e1c59000721a535f6fe77a3c23))
+
+
+
+
+
+# [3.171.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.170.0...v3.171.0) (2022-09-14)
+
+**Note:** Version bump only for package @aws-sdk/middleware-signing
+
+
+
+
+
 # [3.170.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.169.0...v3.170.0) (2022-09-13)
 
 **Note:** Version bump only for package @aws-sdk/middleware-signing

package/dist-cjs/configurations.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveSigV4AuthConfig = exports.resolveAwsAuthConfig = void 0;
 const property_provider_1 = require("@aws-sdk/property-provider");
 const signature_v4_1 = require("@aws-sdk/signature-v4");
+const util_middleware_1 = require("@aws-sdk/util-middleware");
 const CREDENTIAL_EXPIRE_WINDOW = 300000;
 const resolveAwsAuthConfig = (input) => {
     const normalizedCreds = input.credentials
@@ -11,10 +12,10 @@ const resolveAwsAuthConfig = (input) => {
     const { signingEscapePath = true, systemClockOffset = input.systemClockOffset || 0, sha256 } = input;
     let signer;
     if (input.signer) {
-        signer = normalizeProvider(input.signer);
+        signer = (0, util_middleware_1.normalizeProvider)(input.signer);
     }
-    else {
-        signer = () => normalizeProvider(input.region)()
+    else if (input.regionInfoProvider) {
+        signer = () => (0, util_middleware_1.normalizeProvider)(input.region)()
             .then(async (region) => [
             (await input.regionInfoProvider(region, {
                 useFipsEndpoint: await input.useFipsEndpoint(),
@@ -34,10 +35,31 @@ const resolveAwsAuthConfig = (input) => {
                 sha256,
                 uriEscapePath: signingEscapePath,
             };
-            const signerConstructor = input.signerConstructor || signature_v4_1.SignatureV4;
-            return new signerConstructor(params);
+            const SignerCtor = input.signerConstructor || signature_v4_1.SignatureV4;
+            return new SignerCtor(params);
         });
     }
+    else {
+        signer = async (authScheme) => {
+            if (!authScheme) {
+                throw new Error("Unexpected empty auth scheme config");
+            }
+            const signingRegion = authScheme.signingScope;
+            const signingService = authScheme.signingName;
+            input.signingRegion = input.signingRegion || signingRegion;
+            input.signingName = input.signingName || signingService || input.serviceId;
+            const params = {
+                ...input,
+                credentials: normalizedCreds,
+                region: input.signingRegion,
+                service: input.signingName,
+                sha256,
+                uriEscapePath: signingEscapePath,
+            };
+            const SignerCtor = input.signerConstructor || signature_v4_1.SignatureV4;
+            return new SignerCtor(params);
+        };
+    }
     return {
         ...input,
         systemClockOffset,
@@ -54,10 +76,10 @@ const resolveSigV4AuthConfig = (input) => {
     const { signingEscapePath = true, systemClockOffset = input.systemClockOffset || 0, sha256 } = input;
     let signer;
     if (input.signer) {
-        signer = normalizeProvider(input.signer);
+        signer = (0, util_middleware_1.normalizeProvider)(input.signer);
     }
     else {
-        signer = normalizeProvider(new signature_v4_1.SignatureV4({
+        signer = (0, util_middleware_1.normalizeProvider)(new signature_v4_1.SignatureV4({
             credentials: normalizedCreds,
             region: input.region,
             service: input.signingName,
@@ -74,17 +96,10 @@ const resolveSigV4AuthConfig = (input) => {
     };
 };
 exports.resolveSigV4AuthConfig = resolveSigV4AuthConfig;
-const normalizeProvider = (input) => {
-    if (typeof input === "object") {
-        const promisified = Promise.resolve(input);
-        return () => promisified;
-    }
-    return input;
-};
 const normalizeCredentialProvider = (credentials) => {
     if (typeof credentials === "function") {
         return (0, property_provider_1.memoize)(credentials, (credentials) => credentials.expiration !== undefined &&
             credentials.expiration.getTime() - Date.now() < CREDENTIAL_EXPIRE_WINDOW, (credentials) => credentials.expiration !== undefined);
     }
-    return normalizeProvider(credentials);
+    return (0, util_middleware_1.normalizeProvider)(credentials);
 };

package/dist-cjs/middleware.js

@@ -5,9 +5,11 @@ const protocol_http_1 = require("@aws-sdk/protocol-http");
 const getSkewCorrectedDate_1 = require("./utils/getSkewCorrectedDate");
 const getUpdatedSystemClockOffset_1 = require("./utils/getUpdatedSystemClockOffset");
 const awsAuthMiddleware = (options) => (next, context) => async function (args) {
+    var _a, _b, _c;
     if (!protocol_http_1.HttpRequest.isInstance(args.request))
         return next(args);
-    const signer = await options.signer();
+    const authScheme = (_c = (_b = (_a = (context.endpointV2)) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.authSchemes) === null || _c === void 0 ? void 0 : _c[0];
+    const signer = await options.signer(authScheme);
     const output = await next({
         ...args,
         request: await signer.sign(args.request, {

package/dist-es/configurations.js

@@ -1,6 +1,7 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { memoize } from "@aws-sdk/property-provider";
 import { SignatureV4 } from "@aws-sdk/signature-v4";
+import { normalizeProvider } from "@aws-sdk/util-middleware";
 var CREDENTIAL_EXPIRE_WINDOW = 300000;
 export var resolveAwsAuthConfig = function (input) {
     var normalizedCreds = input.credentials
@@ -11,7 +12,7 @@ export var resolveAwsAuthConfig = function (input) {
     if (input.signer) {
         signer = normalizeProvider(input.signer);
     }
-    else {
+    else if (input.regionInfoProvider) {
         signer = function () {
             return normalizeProvider(input.region)()
                 .then(function (region) { return __awaiter(void 0, void 0, void 0, function () {
@@ -42,11 +43,28 @@ export var resolveAwsAuthConfig = function (input) {
                 input.signingRegion = input.signingRegion || signingRegion || region;
                 input.signingName = input.signingName || signingService || input.serviceId;
                 var params = __assign(__assign({}, input), { credentials: normalizedCreds, region: input.signingRegion, service: input.signingName, sha256: sha256, uriEscapePath: signingEscapePath });
-                var signerConstructor = input.signerConstructor || SignatureV4;
-                return new signerConstructor(params);
+                var SignerCtor = input.signerConstructor || SignatureV4;
+                return new SignerCtor(params);
             });
         };
     }
+    else {
+        signer = function (authScheme) { return __awaiter(void 0, void 0, void 0, function () {
+            var signingRegion, signingService, params, SignerCtor;
+            return __generator(this, function (_a) {
+                if (!authScheme) {
+                    throw new Error("Unexpected empty auth scheme config");
+                }
+                signingRegion = authScheme.signingScope;
+                signingService = authScheme.signingName;
+                input.signingRegion = input.signingRegion || signingRegion;
+                input.signingName = input.signingName || signingService || input.serviceId;
+                params = __assign(__assign({}, input), { credentials: normalizedCreds, region: input.signingRegion, service: input.signingName, sha256: sha256, uriEscapePath: signingEscapePath });
+                SignerCtor = input.signerConstructor || SignatureV4;
+                return [2, new SignerCtor(params)];
+            });
+        }); };
+    }
     return __assign(__assign({}, input), { systemClockOffset: systemClockOffset, signingEscapePath: signingEscapePath, credentials: normalizedCreds, signer: signer });
 };
 export var resolveSigV4AuthConfig = function (input) {
@@ -69,13 +87,6 @@ export var resolveSigV4AuthConfig = function (input) {
     }
     return __assign(__assign({}, input), { systemClockOffset: systemClockOffset, signingEscapePath: signingEscapePath, credentials: normalizedCreds, signer: signer });
 };
-var normalizeProvider = function (input) {
-    if (typeof input === "object") {
-        var promisified_1 = Promise.resolve(input);
-        return function () { return promisified_1; };
-    }
-    return input;
-};
 var normalizeCredentialProvider = function (credentials) {
     if (typeof credentials === "function") {
         return memoize(credentials, function (credentials) {

package/dist-es/middleware.js

@@ -5,26 +5,28 @@ import { getUpdatedSystemClockOffset } from "./utils/getUpdatedSystemClockOffset
 export var awsAuthMiddleware = function (options) {
     return function (next, context) {
         return function (args) {
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var signer, output, _a, _b, dateHeader;
-                var _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var authScheme, signer, output, _d, _e, dateHeader;
+                var _f;
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             if (!HttpRequest.isInstance(args.request))
                                 return [2, next(args)];
-                            return [4, options.signer()];
+                            authScheme = (_c = (_b = (_a = (context.endpointV2)) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.authSchemes) === null || _c === void 0 ? void 0 : _c[0];
+                            return [4, options.signer(authScheme)];
                         case 1:
-                            signer = _d.sent();
-                            _a = next;
-                            _b = [__assign({}, args)];
-                            _c = {};
+                            signer = _g.sent();
+                            _d = next;
+                            _e = [__assign({}, args)];
+                            _f = {};
                             return [4, signer.sign(args.request, {
                                     signingDate: getSkewCorrectedDate(options.systemClockOffset),
                                     signingRegion: context["signing_region"],
                                     signingService: context["signing_service"],
                                 })];
-                        case 2: return [4, _a.apply(void 0, [__assign.apply(void 0, _b.concat([(_c.request = _d.sent(), _c)]))]).catch(function (error) {
+                        case 2: return [4, _d.apply(void 0, [__assign.apply(void 0, _e.concat([(_f.request = _g.sent(), _f)]))]).catch(function (error) {
                                 var _a;
                                 var serverTime = (_a = error.ServerTime) !== null && _a !== void 0 ? _a : getDateHeader(error.$response);
                                 if (serverTime) {
@@ -33,7 +35,7 @@ export var awsAuthMiddleware = function (options) {
                                 throw error;
                             })];
                         case 3:
-                            output = _d.sent();
+                            output = _g.sent();
                             dateHeader = getDateHeader(output.response);
                             if (dateHeader) {
                                 options.systemClockOffset = getUpdatedSystemClockOffset(dateHeader, options.systemClockOffset);

package/dist-types/configurations.d.ts

@@ -1,5 +1,5 @@
 import { SignatureV4CryptoInit, SignatureV4Init } from "@aws-sdk/signature-v4";
-import { Credentials, HashConstructor, Logger, MemoizedProvider, Provider, RegionInfoProvider, RequestSigner } from "@aws-sdk/types";
+import { AuthScheme, Credentials, HashConstructor, Logger, MemoizedProvider, Provider, RegionInfoProvider, RequestSigner } from "@aws-sdk/types";
 export interface AwsAuthInputConfig {
     /**
      * The credentials used to sign requests.
@@ -8,7 +8,7 @@ export interface AwsAuthInputConfig {
     /**
      * The signer to use when signing requests.
      */
-    signer?: RequestSigner | Provider<RequestSigner>;
+    signer?: RequestSigner | ((authScheme?: AuthScheme) => Promise<RequestSigner>);
     /**
      * Whether to escape request path when signing the request.
      */
@@ -37,7 +37,7 @@ export interface SigV4AuthInputConfig {
     /**
      * The signer to use when signing requests.
      */
-    signer?: RequestSigner | Provider<RequestSigner>;
+    signer?: RequestSigner | ((authScheme?: AuthScheme) => Promise<RequestSigner>);
     /**
      * Whether to escape request path when signing the request.
      */
@@ -50,7 +50,7 @@ export interface SigV4AuthInputConfig {
 interface PreviouslyResolved {
     credentialDefaultProvider: (input: any) => MemoizedProvider<Credentials>;
     region: string | Provider<string>;
-    regionInfoProvider: RegionInfoProvider;
+    regionInfoProvider?: RegionInfoProvider;
     signingName?: string;
     serviceId: string;
     sha256: HashConstructor;
@@ -74,7 +74,7 @@ export interface AwsAuthResolvedConfig {
     /**
      * Resolved value for input config {@link AwsAuthInputConfig.signer}
      */
-    signer: Provider<RequestSigner>;
+    signer: (authScheme?: AuthScheme) => Promise<RequestSigner>;
     /**
      * Resolved value for input config {@link AwsAuthInputConfig.signingEscapePath}
      */

package/dist-types/ts3.4/configurations.d.ts

@@ -1,5 +1,6 @@
 import { SignatureV4CryptoInit, SignatureV4Init } from "@aws-sdk/signature-v4";
 import {
+  AuthScheme,
   Credentials,
   HashConstructor,
   Logger,
@@ -10,32 +11,28 @@ import {
 } from "@aws-sdk/types";
 export interface AwsAuthInputConfig {
   credentials?: Credentials | Provider<Credentials>;
-
-  signer?: RequestSigner | Provider<RequestSigner>;
-
+  signer?:
+    | RequestSigner
+    | ((authScheme?: AuthScheme) => Promise<RequestSigner>);
   signingEscapePath?: boolean;
-
   systemClockOffset?: number;
-
   signingRegion?: string;
-
   signerConstructor?: new (
     options: SignatureV4Init & SignatureV4CryptoInit
   ) => RequestSigner;
 }
 export interface SigV4AuthInputConfig {
   credentials?: Credentials | Provider<Credentials>;
-
-  signer?: RequestSigner | Provider<RequestSigner>;
-
+  signer?:
+    | RequestSigner
+    | ((authScheme?: AuthScheme) => Promise<RequestSigner>);
   signingEscapePath?: boolean;
-
   systemClockOffset?: number;
 }
 interface PreviouslyResolved {
   credentialDefaultProvider: (input: any) => MemoizedProvider<Credentials>;
   region: string | Provider<string>;
-  regionInfoProvider: RegionInfoProvider;
+  regionInfoProvider?: RegionInfoProvider;
   signingName?: string;
   serviceId: string;
   sha256: HashConstructor;
@@ -51,11 +48,8 @@ interface SigV4PreviouslyResolved {
 }
 export interface AwsAuthResolvedConfig {
   credentials: MemoizedProvider<Credentials>;
-
-  signer: Provider<RequestSigner>;
-
+  signer: (authScheme?: AuthScheme) => Promise<RequestSigner>;
   signingEscapePath: boolean;
-
   systemClockOffset: number;
 }
 export interface SigV4AuthResolvedConfig extends AwsAuthResolvedConfig {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-signing",
-  "version": "3.170.0",
+  "version": "3.178.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -9,7 +9,7 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
-    "test": "jest"
+    "test": "jest --passWithNoTests"
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -20,10 +20,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/property-provider": "3.170.0",
-    "@aws-sdk/protocol-http": "3.170.0",
-    "@aws-sdk/signature-v4": "3.170.0",
-    "@aws-sdk/types": "3.170.0",
+    "@aws-sdk/property-provider": "3.178.0",
+    "@aws-sdk/protocol-http": "3.178.0",
+    "@aws-sdk/signature-v4": "3.178.0",
+    "@aws-sdk/types": "3.178.0",
     "tslib": "^2.3.1"
   },
   "engines": {