@middy/http-cors 2.5.2 → 2.5.6

package/README.md

@@ -43,14 +43,14 @@ npm install --save @middy/http-cors
 
  - `credentials` (bool) (optional): if true, sets `Access-Control-Allow-Credentials` (default `false`)
  - `headers` (string) (optional): value to put in `Access-Control-Allow-Headers` (default: `false`)
- - `methods` (string) (optional): value to put in `Access-Control-Allow-Mehtods` (default: `false`)
+ - `methods` (string) (optional): value to put in `Access-Control-Allow-Methods` (default: `false`)
  - `getOrigin` (function(incomingOrigin:string, options)) (optional): take full control of the generating the returned origin. Defaults to using the origin or origins option.
  - `origin` (string) (optional): origin to put in the header (default: "`*`")
  - `origins` (array) (optional): An array of allowed origins. The incoming origin is matched against the list and is returned if present. 
  - `exposeHeaders` (string) (optional): value to put in `Access-Control-Expose-Headers` (default: `false`)
  - `maxAge` (string) (optional): value to put in Access-Control-Max-Age header (default: `null`)
  - `requestHeaders` (string) (optional): value to put in `Access-Control-Request-Headers` (default: `false`)
- - `requestMethods` (string) (optional): value to put in `Access-Control-Request-Mehtods` (default: `false`)
+ - `requestMethods` (string) (optional): value to put in `Access-Control-Request-Methods` (default: `false`)
  - `cacheControl` (string) (optional): value to put in Cache-Control header on pre-flight (OPTIONS) requests (default: `null`)
 
 ```javascript
@@ -59,7 +59,7 @@ import httpErrorHandler from '@middy/http-error-handler'
 import cors from '@middy/http-cors'
 
 const handler = middy((event, context) => {
-  throw new createError.UnprocessableEntity()
+  throw createError(422)
 })
 handler.use(httpErrorHandler())
        .use(cors())

package/index.d.ts

@@ -1,6 +1,7 @@
 import middy from '@middy/core'
 
-interface Options {
+export interface Options {
+  getOrigin?: (incomingOrigin: string, options: Options) => string
   credentials?: boolean | string
   headers?: string
   methods?: string

package/index.js

@@ -1,24 +1,19 @@
-"use strict";
-
-const {
-  normalizeHttpResponse
-} = require('@middy/util');
+const { normalizeHttpResponse } = require('@middy/util')
 
 const getOrigin = (incomingOrigin, options) => {
-  if ((options === null || options === void 0 ? void 0 : options.origins.length) > 0) {
+  if (options?.origins.length > 0) {
     if (incomingOrigin && options.origins.includes(incomingOrigin)) {
-      return incomingOrigin;
+      return incomingOrigin
     } else {
-      return options.origins[0];
+      return options.origins[0]
     }
   } else {
     if (incomingOrigin && options.credentials && options.origin === '*') {
-      return incomingOrigin;
+      return incomingOrigin
     }
-
-    return options.origin;
+    return options.origin
   }
-};
+}
 
 const defaults = {
   getOrigin,
@@ -32,79 +27,98 @@ const defaults = {
   requestHeaders: undefined,
   requestMethods: undefined,
   cacheControl: undefined
-};
+}
 
 const httpCorsMiddleware = (opts = {}) => {
-  const options = { ...defaults,
-    ...opts
-  };
-
-  const httpCorsMiddlewareAfter = async request => {
-    var _request$event, _request$event2, _request$event2$reque, _request$event2$reque2;
+  const options = { ...defaults, ...opts }
 
+  const httpCorsMiddlewareAfter = async (request) => {
     // API Gateway v1 & v2
-    if (!((_request$event = request.event) !== null && _request$event !== void 0 && _request$event.httpMethod) && !((_request$event2 = request.event) !== null && _request$event2 !== void 0 && (_request$event2$reque = _request$event2.requestContext) !== null && _request$event2$reque !== void 0 && (_request$event2$reque2 = _request$event2$reque.http) !== null && _request$event2$reque2 !== void 0 && _request$event2$reque2.method)) return;
-    request.response = normalizeHttpResponse(request.response);
-    const existingHeaders = Object.keys(request.response.headers); // Check if already setup the header Access-Control-Allow-Credentials
+    if (!request.event?.httpMethod && !request.event?.requestContext?.http?.method) return
 
+    request.response = normalizeHttpResponse(request.response)
+
+    const existingHeaders = Object.keys(request.response.headers)
+
+    // Check if already setup the header Access-Control-Allow-Credentials
     if (existingHeaders.includes('Access-Control-Allow-Credentials')) {
-      options.credentials = request.response.headers['Access-Control-Allow-Credentials'] === 'true';
+      options.credentials =
+        request.response.headers['Access-Control-Allow-Credentials'] === 'true'
     }
-
     if (options.credentials) {
-      request.response.headers['Access-Control-Allow-Credentials'] = String(options.credentials);
-    } // Check if already setup Access-Control-Allow-Headers
-
-
-    if (options.headers && !existingHeaders.includes('Access-Control-Allow-Headers')) {
-      request.response.headers['Access-Control-Allow-Headers'] = options.headers;
-    } // Check if already setup Access-Control-Allow-Methods
-
+      request.response.headers['Access-Control-Allow-Credentials'] = String(
+        options.credentials
+      )
+    }
 
-    if (options.methods && !existingHeaders.includes('Access-Control-Allow-Methods')) {
-      request.response.headers['Access-Control-Allow-Methods'] = options.methods;
-    } // Check if already setup the header Access-Control-Allow-Origin
+    // Check if already setup Access-Control-Allow-Headers
+    if (
+      options.headers &&
+      !existingHeaders.includes('Access-Control-Allow-Headers')
+    ) {
+      request.response.headers['Access-Control-Allow-Headers'] = options.headers
+    }
 
+    // Check if already setup Access-Control-Allow-Methods
+    if (
+      options.methods &&
+      !existingHeaders.includes('Access-Control-Allow-Methods')
+    ) {
+      request.response.headers['Access-Control-Allow-Methods'] = options.methods
+    }
 
+    // Check if already setup the header Access-Control-Allow-Origin
     if (!existingHeaders.includes('Access-Control-Allow-Origin')) {
-      var _request$event$header, _request$event3, _eventHeaders$origin;
-
-      const eventHeaders = (_request$event$header = (_request$event3 = request.event) === null || _request$event3 === void 0 ? void 0 : _request$event3.headers) !== null && _request$event$header !== void 0 ? _request$event$header : {};
-      const incomingOrigin = (_eventHeaders$origin = eventHeaders.origin) !== null && _eventHeaders$origin !== void 0 ? _eventHeaders$origin : eventHeaders.Origin;
-      request.response.headers['Access-Control-Allow-Origin'] = options.getOrigin(incomingOrigin, options);
-    } // Check if already setup Access-Control-Expose-Headers
-
+      const eventHeaders = request.event?.headers ?? {}
+      const incomingOrigin = eventHeaders.origin ?? eventHeaders.Origin
+      request.response.headers[
+        'Access-Control-Allow-Origin'
+      ] = options.getOrigin(incomingOrigin, options)
+    }
 
-    if (options.exposeHeaders && !existingHeaders.includes('Access-Control-Expose-Headers')) {
-      request.response.headers['Access-Control-Expose-Headers'] = options.exposeHeaders;
+    // Check if already setup Access-Control-Expose-Headers
+    if (
+      options.exposeHeaders &&
+      !existingHeaders.includes('Access-Control-Expose-Headers')
+    ) {
+      request.response.headers['Access-Control-Expose-Headers'] =
+        options.exposeHeaders
     }
 
     if (options.maxAge && !existingHeaders.includes('Access-Control-Max-Age')) {
-      request.response.headers['Access-Control-Max-Age'] = String(options.maxAge);
-    } // Check if already setup Access-Control-Request-Headers
-
-
-    if (options.requestHeaders && !existingHeaders.includes('Access-Control-Request-Headers')) {
-      request.response.headers['Access-Control-Request-Headers'] = options.requestHeaders;
-    } // Check if already setup Access-Control-Request-Methods
+      request.response.headers['Access-Control-Max-Age'] = String(
+        options.maxAge
+      )
+    }
 
+    // Check if already setup Access-Control-Request-Headers
+    if (
+      options.requestHeaders &&
+      !existingHeaders.includes('Access-Control-Request-Headers')
+    ) {
+      request.response.headers['Access-Control-Request-Headers'] =
+        options.requestHeaders
+    }
 
-    if (options !== null && options !== void 0 && options.requestMethods && !existingHeaders.includes('Access-Control-Request-Methods')) {
-      request.response.headers['Access-Control-Request-Methods'] = options.requestMethods;
+    // Check if already setup Access-Control-Request-Methods
+    if (
+      options?.requestMethods &&
+      !existingHeaders.includes('Access-Control-Request-Methods')
+    ) {
+      request.response.headers['Access-Control-Request-Methods'] =
+        options.requestMethods
     }
 
     if (request.event.httpMethod === 'OPTIONS') {
       if (options.cacheControl && !existingHeaders.includes('Cache-Control')) {
-        request.response.headers['Cache-Control'] = String(options.cacheControl);
+        request.response.headers['Cache-Control'] = String(options.cacheControl)
       }
     }
-  };
-
-  const httpCorsMiddlewareOnError = httpCorsMiddlewareAfter;
+  }
+  const httpCorsMiddlewareOnError = httpCorsMiddlewareAfter
   return {
     after: httpCorsMiddlewareAfter,
     onError: httpCorsMiddlewareOnError
-  };
-};
-
-module.exports = httpCorsMiddleware;
+  }
+}
+module.exports = httpCorsMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-cors",
-  "version": "2.5.2",
+  "version": "2.5.6",
   "description": "CORS (Cross-Origin Resource Sharing) middleware for the middy framework",
   "type": "commonjs",
   "engines": {
@@ -44,11 +44,11 @@
     "url": "https://github.com/middyjs/middy/issues"
   },
   "homepage": "https://github.com/middyjs/middy#readme",
-  "gitHead": "a2bb757a7a13638ae64277f8eecfcf11c1af17d4",
+  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b",
   "dependencies": {
-    "@middy/util": "^2.5.2"
+    "@middy/util": "^2.5.6"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.2"
+    "@middy/core": "^2.5.6"
   }
 }