@middy/sts 2.5.2 → 2.5.6

package/index.d.ts

@@ -1,18 +1,11 @@
 import { STS } from 'aws-sdk'
-import { captureAWSClient } from 'aws-xray-sdk'
 import middy from '@middy/core'
+import { Options as MiddyOptions } from '@middy/util'
 
-interface Options<S = STS> {
-  AwsClient?: new() => S
-  awsClientOptions?: Partial<STS.Types.ClientConfiguration>
-  // awsClientAssumeRole?: string,
-  awsClientCapture?: typeof captureAWSClient
-  fetchData?: { [key: string]: string }
-  disablePrefetch?: boolean
-  cacheKey?: string
-  cacheExpiry?: number
-  // setToEnv?: boolean,
-  setToContext?: boolean
+interface Options<S = STS>
+  extends Pick<MiddyOptions<S, STS.Types.ClientConfiguration>,
+  'AwsClient' | 'awsClientOptions' | 'awsClientCapture' |
+  'fetchData' | 'disablePrefetch' | 'cacheKey' | 'cacheExpiry' | 'setToContext'> {
 }
 
 declare function sts (options?: Options): middy.MiddlewareObj

package/index.js

@@ -1,5 +1,3 @@
-"use strict";
-
 const {
   canPrefetch,
   createPrefetchClient,
@@ -8,89 +6,79 @@ const {
   processCache,
   getCache,
   modifyCache
-} = require('@middy/util');
-
-const STS = require('aws-sdk/clients/sts'); // v2
+} = require('@middy/util')
+const STS = require('aws-sdk/clients/sts') // v2
 // const { STS } = require('@aws-sdk/client-sts') // v3
 
-
 const defaults = {
   AwsClient: STS,
   awsClientOptions: {},
   // awsClientAssumeRole: undefined, // Not Applicable, as this is the middleware that defines the roles
   awsClientCapture: undefined,
-  fetchData: {},
-  // { contextKey: {RoleArn, RoleSessionName} }
+  fetchData: {}, // { contextKey: {RoleArn, RoleSessionName} }
   disablePrefetch: false,
   cacheKey: 'sts',
   cacheExpiry: -1,
   // setToEnv: false, // returns object, cannot set to process.env
   setToContext: false
-};
+}
 
 const stsMiddleware = (opts = {}) => {
-  const options = { ...defaults,
-    ...opts
-  };
+  const options = { ...defaults, ...opts }
 
   const fetch = (request, cachedValues = {}) => {
-    const values = {};
+    const values = {}
 
     for (const internalKey of Object.keys(options.fetchData)) {
-      var _assumeRoleOptions$Ro;
-
-      if (cachedValues[internalKey]) continue;
-      const assumeRoleOptions = options.fetchData[internalKey]; // Date cannot be used here to assign default session name, possibility of collision when > 1 role defined
-
-      assumeRoleOptions.RoleSessionName = (_assumeRoleOptions$Ro = assumeRoleOptions === null || assumeRoleOptions === void 0 ? void 0 : assumeRoleOptions.RoleSessionName) !== null && _assumeRoleOptions$Ro !== void 0 ? _assumeRoleOptions$Ro : 'middy-sts-session-' + Math.ceil(Math.random() * 99999);
-      values[internalKey] = client.assumeRole(assumeRoleOptions).promise() // Required for aws-sdk v2
-      .then(resp => ({
-        accessKeyId: resp.Credentials.AccessKeyId,
-        secretAccessKey: resp.Credentials.SecretAccessKey,
-        sessionToken: resp.Credentials.SessionToken
-      })).catch(e => {
-        var _getCache$value, _getCache;
-
-        const value = (_getCache$value = (_getCache = getCache(options.cacheKey)) === null || _getCache === void 0 ? void 0 : _getCache.value) !== null && _getCache$value !== void 0 ? _getCache$value : {};
-        value[internalKey] = undefined;
-        modifyCache(options.cacheKey, value);
-        throw e;
-      });
+      if (cachedValues[internalKey]) continue
+      const assumeRoleOptions = options.fetchData[internalKey]
+      // Date cannot be used here to assign default session name, possibility of collision when > 1 role defined
+      assumeRoleOptions.RoleSessionName =
+        assumeRoleOptions?.RoleSessionName ??
+        'middy-sts-session-' + Math.ceil(Math.random() * 99999)
+      values[internalKey] = client
+        .assumeRole(assumeRoleOptions)
+        .promise() // Required for aws-sdk v2
+        .then((resp) => ({
+          accessKeyId: resp.Credentials.AccessKeyId,
+          secretAccessKey: resp.Credentials.SecretAccessKey,
+          sessionToken: resp.Credentials.SessionToken
+        }))
+        .catch((e) => {
+          const value = getCache(options.cacheKey)?.value ?? {}
+          value[internalKey] = undefined
+          modifyCache(options.cacheKey, value)
+          throw e
+        })
     }
 
-    return values;
-  };
-
-  let prefetch, client;
+    return values
+  }
 
+  let prefetch, client
   if (canPrefetch(options)) {
-    client = createPrefetchClient(options);
-    prefetch = processCache(options, fetch);
+    client = createPrefetchClient(options)
+    prefetch = processCache(options, fetch)
   }
 
-  const stsMiddlewareBefore = async request => {
-    var _prefetch;
-
+  const stsMiddlewareBefore = async (request) => {
     if (!client) {
-      client = await createClient(options, request);
+      client = await createClient(options, request)
     }
 
-    const {
-      value
-    } = (_prefetch = prefetch) !== null && _prefetch !== void 0 ? _prefetch : processCache(options, fetch, request);
-    Object.assign(request.internal, value);
+    const { value } = prefetch ?? processCache(options, fetch, request)
+
+    Object.assign(request.internal, value)
 
     if (options.setToContext) {
-      const data = await getInternal(Object.keys(options.fetchData), request);
-      if (options.setToContext) Object.assign(request.context, data);
+      const data = await getInternal(Object.keys(options.fetchData), request)
+      if (options.setToContext) Object.assign(request.context, data)
     }
-
-    prefetch = null;
-  };
+    prefetch = null
+  }
 
   return {
     before: stsMiddlewareBefore
-  };
-};
-
-module.exports = stsMiddleware;
+  }
+}
+module.exports = stsMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/sts",
-  "version": "2.5.2",
+  "version": "2.5.6",
   "description": "STS (Security Token Service) credentials middleware for the middy framework",
   "type": "commonjs",
   "engines": {
@@ -46,12 +46,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.2"
+    "@middy/util": "^2.5.6"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.2",
+    "@middy/core": "^2.5.6",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "a2bb757a7a13638ae64277f8eecfcf11c1af17d4"
+  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b"
 }