@middy/sts 2.5.3 → 3.0.0-alpha.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
+Copyright (c) 2017-2022 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -91,7 +91,7 @@ Everyone is very welcome to contribute to this repository. Feel free to [raise i
 
 ## License
 
-Licensed under [MIT License](LICENSE). Copyright (c) 2017-2021 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
+Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
 
 <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy?ref=badge_large">
   <img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy.svg?type=large" alt="FOSSA Status"  style="max-width:100%;">

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,30 +1,13 @@
-"use strict";
-
-const {
-  canPrefetch,
-  createPrefetchClient,
-  createClient,
-  getInternal,
-  processCache,
-  getCache,
-  modifyCache
-} = require('@middy/util');
-
-const STS = require('aws-sdk/clients/sts'); // v2
-// const { STS } = require('@aws-sdk/client-sts') // v3
-
-
+import { canPrefetch, createPrefetchClient, createClient, getInternal, processCache, getCache, modifyCache } from '@middy/util';
+import STS from 'aws-sdk/clients/sts.js';
 const defaults = {
   AwsClient: STS,
   awsClientOptions: {},
-  // awsClientAssumeRole: undefined, // Not Applicable, as this is the middleware that defines the roles
   awsClientCapture: undefined,
   fetchData: {},
-  // { contextKey: {RoleArn, RoleSessionName} }
   disablePrefetch: false,
   cacheKey: 'sts',
   cacheExpiry: -1,
-  // setToEnv: false, // returns object, cannot set to process.env
   setToContext: false
 };
 
@@ -37,21 +20,15 @@ const stsMiddleware = (opts = {}) => {
     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 => ({
+      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 => {
-        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 : {};
+        const value = getCache(options.cacheKey).value ?? {};
         value[internalKey] = undefined;
         modifyCache(options.cacheKey, value);
         throw e;
@@ -69,15 +46,13 @@ const stsMiddleware = (opts = {}) => {
   }
 
   const stsMiddlewareBefore = async request => {
-    var _prefetch;
-
     if (!client) {
       client = await createClient(options, request);
     }
 
     const {
       value
-    } = (_prefetch = prefetch) !== null && _prefetch !== void 0 ? _prefetch : processCache(options, fetch, request);
+    } = prefetch ?? processCache(options, fetch, request);
     Object.assign(request.internal, value);
 
     if (options.setToContext) {
@@ -93,4 +68,4 @@ const stsMiddleware = (opts = {}) => {
   };
 };
 
-module.exports = stsMiddleware;
+export default stsMiddleware;

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@middy/sts",
-  "version": "2.5.3",
+  "version": "3.0.0-alpha.2",
   "description": "STS (Security Token Service) credentials middleware for the middy framework",
-  "type": "commonjs",
+  "type": "module",
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
   },
-  "main": "index.js",
+  "exports": "./index.js",
   "types": "index.d.ts",
   "files": [
+    "index.js",
     "index.d.ts"
   ],
   "scripts": {
@@ -46,12 +47,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.3"
+    "@middy/util": "^3.0.0-alpha.2"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.3",
+    "@middy/core": "^3.0.0-alpha.2",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "690884d43b9cd632aeca9a5eba1612160b987cd4"
+  "gitHead": "de30419273ecbff08f367f47c7e320ec981cf145"
 }