@aws-sdk/middleware-token 3.256.0 → 3.258.0

package/dist-cjs/getTokenPlugin.js

@@ -4,7 +4,7 @@ exports.getTokenPlugin = void 0;
 const tokenMiddleware_1 = require("./tokenMiddleware");
 const getTokenPlugin = (options) => ({
     applyToStack: (clientStack) => {
-        clientStack.addRelativeTo((0, tokenMiddleware_1.tokenMiddleware)(options), tokenMiddleware_1.TokenMiddlewareOptions);
+        clientStack.addRelativeTo((0, tokenMiddleware_1.tokenMiddleware)(options), tokenMiddleware_1.tokenMiddlewareOptions);
     },
 });
 exports.getTokenPlugin = getTokenPlugin;

package/dist-cjs/tokenMiddleware.js

@@ -1,19 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tokenMiddleware = exports.TokenMiddlewareOptions = void 0;
+exports.tokenMiddleware = exports.tokenMiddlewareOptions = void 0;
 const protocol_http_1 = require("@aws-sdk/protocol-http");
-exports.TokenMiddlewareOptions = {
+const types_1 = require("@aws-sdk/types");
+exports.tokenMiddlewareOptions = {
     name: "tokenMiddleware",
-    tags: ["TOKEN"],
+    tags: ["TOKEN", "AUTH"],
     relation: "after",
     toMiddleware: "retryMiddleware",
     override: true,
 };
-const tokenMiddleware = (options) => (next) => async (args) => {
-    if (!protocol_http_1.HttpRequest.isInstance(args.request))
+const tokenMiddleware = (options) => (next, context) => async (args) => {
+    if (!protocol_http_1.HttpRequest.isInstance(args.request) || context.currentAuthConfig)
         return next(args);
-    const token = await options.token();
-    args.request.headers["Authorization"] = `Bearer ${token.token}`;
+    const token = options.token && (await options.token());
+    if (token === null || token === void 0 ? void 0 : token.token) {
+        const authConfig = {
+            in: types_1.HttpAuthLocation.HEADER,
+            name: "authorization",
+            scheme: "Bearer",
+        };
+        context.currentAuthConfig = authConfig;
+        args.request.headers[authConfig.name] = `${authConfig.scheme} ${token.token}`;
+    }
+    else {
+        context.currentAuthConfig = undefined;
+    }
     return next(args);
 };
 exports.tokenMiddleware = tokenMiddleware;

package/dist-es/getTokenPlugin.js

@@ -1,6 +1,6 @@
-import { tokenMiddleware, TokenMiddlewareOptions } from "./tokenMiddleware";
+import { tokenMiddleware, tokenMiddlewareOptions } from "./tokenMiddleware";
 export const getTokenPlugin = (options) => ({
     applyToStack: (clientStack) => {
-        clientStack.addRelativeTo(tokenMiddleware(options), TokenMiddlewareOptions);
+        clientStack.addRelativeTo(tokenMiddleware(options), tokenMiddlewareOptions);
     },
 });

package/dist-es/tokenMiddleware.js

@@ -1,15 +1,27 @@
 import { HttpRequest } from "@aws-sdk/protocol-http";
-export const TokenMiddlewareOptions = {
+import { HttpAuthLocation, } from "@aws-sdk/types";
+export const tokenMiddlewareOptions = {
     name: "tokenMiddleware",
-    tags: ["TOKEN"],
+    tags: ["TOKEN", "AUTH"],
     relation: "after",
     toMiddleware: "retryMiddleware",
     override: true,
 };
-export const tokenMiddleware = (options) => (next) => async (args) => {
-    if (!HttpRequest.isInstance(args.request))
+export const tokenMiddleware = (options) => (next, context) => async (args) => {
+    if (!HttpRequest.isInstance(args.request) || context.currentAuthConfig)
         return next(args);
-    const token = await options.token();
-    args.request.headers["Authorization"] = `Bearer ${token.token}`;
+    const token = options.token && (await options.token());
+    if (token?.token) {
+        const authConfig = {
+            in: HttpAuthLocation.HEADER,
+            name: "authorization",
+            scheme: "Bearer",
+        };
+        context.currentAuthConfig = authConfig;
+        args.request.headers[authConfig.name] = `${authConfig.scheme} ${token.token}`;
+    }
+    else {
+        context.currentAuthConfig = undefined;
+    }
     return next(args);
 };

package/dist-types/tokenMiddleware.d.ts

@@ -1,4 +1,4 @@
 import { FinalizeRequestMiddleware, RelativeMiddlewareOptions } from "@aws-sdk/types";
 import { TokenResolvedConfig } from "./configurations";
-export declare const TokenMiddlewareOptions: RelativeMiddlewareOptions;
+export declare const tokenMiddlewareOptions: RelativeMiddlewareOptions;
 export declare const tokenMiddleware: <Input extends object, Output extends object>(options: TokenResolvedConfig) => FinalizeRequestMiddleware<Input, Output>;

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

@@ -3,7 +3,7 @@ import {
   RelativeMiddlewareOptions,
 } from "@aws-sdk/types";
 import { TokenResolvedConfig } from "./configurations";
-export declare const TokenMiddlewareOptions: RelativeMiddlewareOptions;
+export declare const tokenMiddlewareOptions: RelativeMiddlewareOptions;
 export declare const tokenMiddleware: <
   Input extends object,
   Output extends object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-token",
-  "version": "3.256.0",
+  "version": "3.258.0",
   "description": "Middleware and Plugin for setting token authentication",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -25,11 +25,11 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/property-provider": "3.254.0",
-    "@aws-sdk/protocol-http": "3.254.0",
-    "@aws-sdk/token-providers": "3.256.0",
-    "@aws-sdk/types": "3.254.0",
-    "@aws-sdk/util-middleware": "3.254.0",
+    "@aws-sdk/property-provider": "3.257.0",
+    "@aws-sdk/protocol-http": "3.257.0",
+    "@aws-sdk/token-providers": "3.258.0",
+    "@aws-sdk/types": "3.257.0",
+    "@aws-sdk/util-middleware": "3.257.0",
     "tslib": "^2.3.1"
   },
   "devDependencies": {