@middy/sts 3.0.0-alpha.2 → 3.0.0-alpha.3

package/index.js

@@ -1,71 +1,81 @@
-import { canPrefetch, createPrefetchClient, createClient, getInternal, processCache, getCache, modifyCache } from '@middy/util';
-import STS from 'aws-sdk/clients/sts.js';
+import {
+  canPrefetch,
+  createPrefetchClient,
+  createClient,
+  getCache,
+  getInternal,
+  processCache,
+  modifyCache
+} from '@middy/util'
+import STS from 'aws-sdk/clients/sts.js' // v2
+// import { STS } from '@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: {},
+  fetchData: {}, // { contextKey: {RoleArn, RoleSessionName} }
   disablePrefetch: false,
   cacheKey: 'sts',
   cacheExpiry: -1,
   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)) {
-      if (cachedValues[internalKey]) continue;
-      const assumeRoleOptions = options.fetchData[internalKey];
-      assumeRoleOptions.RoleSessionName ?? (assumeRoleOptions.RoleSessionName = 'middy-sts-session-' + Math.ceil(Math.random() * 99999));
-      values[internalKey] = client.assumeRole(assumeRoleOptions).promise().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;
-      });
+      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 ??= '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 => {
+  const stsMiddlewareBefore = async (request) => {
     if (!client) {
-      client = await createClient(options, request);
+      client = await createClient(options, request)
     }
 
-    const {
-      value
-    } = 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
-  };
-};
-
-export default stsMiddleware;
+  }
+}
+export default stsMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/sts",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "STS (Security Token Service) credentials middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "test": "npm run test:unit",
-    "test:unit": "ava"
+    "test:unit": "ava",
+    "test:benchmark": "node __benchmarks__/index.js"
   },
   "license": "MIT",
   "keywords": [
@@ -47,12 +48,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^3.0.0-alpha.2"
+    "@middy/util": "^3.0.0-alpha.3"
   },
   "devDependencies": {
-    "@middy/core": "^3.0.0-alpha.2",
+    "@middy/core": "^3.0.0-alpha.3",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "de30419273ecbff08f367f47c7e320ec981cf145"
+  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
 }