@middy/http-cors 3.0.0-alpha.2 → 3.0.0-alpha.3

package/index.js

@@ -1,20 +1,19 @@
-import { normalizeHttpResponse } from '@middy/util';
+import { normalizeHttpResponse } from '@middy/util'
 
 const getOrigin = (incomingOrigin, options = {}) => {
   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,
@@ -28,83 +27,107 @@ const defaults = {
   requestHeaders: undefined,
   requestMethods: undefined,
   cacheControl: undefined
-};
+}
 
 const httpCorsMiddleware = (opts = {}) => {
-  const options = { ...defaults,
-    ...opts
-  };
+  const options = { ...defaults, ...opts }
 
-  const httpCorsMiddlewareAfter = async request => {
-    var _getVersionHttpMethod;
+  const httpCorsMiddlewareAfter = async (request) => {
+    normalizeHttpResponse(request)
 
-    normalizeHttpResponse(request);
-    const existingHeaders = Object.keys(request.response.headers);
+    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);
+      request.response.headers['Access-Control-Allow-Credentials'] = String(
+        options.credentials
+      )
     }
 
-    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-Headers
+    if (
+      options.headers &&
+      !existingHeaders.includes('Access-Control-Allow-Headers')
+    ) {
+      request.response.headers['Access-Control-Allow-Headers'] = options.headers
     }
 
-    if (options.methods && !existingHeaders.includes('Access-Control-Allow-Methods')) {
-      request.response.headers['Access-Control-Allow-Methods'] = options.methods;
+    // 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')) {
-      const eventHeaders = request.event.headers ?? {};
-      const incomingOrigin = eventHeaders.origin ?? eventHeaders.Origin;
-      request.response.headers['Access-Control-Allow-Origin'] = options.getOrigin(incomingOrigin, options);
+      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);
+      request.response.headers['Access-Control-Max-Age'] = String(
+        options.maxAge
+      )
     }
 
-    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-Headers
+    if (
+      options.requestHeaders &&
+      !existingHeaders.includes('Access-Control-Request-Headers')
+    ) {
+      request.response.headers['Access-Control-Request-Headers'] =
+        options.requestHeaders
     }
 
-    if (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
     }
 
-    const httpMethod = (_getVersionHttpMethod = getVersionHttpMethod[request.event.version ?? '1.0']) === null || _getVersionHttpMethod === void 0 ? void 0 : _getVersionHttpMethod.call(getVersionHttpMethod, request.event);
-
+    const httpMethod = getVersionHttpMethod[request.event.version ?? '1.0']?.(request.event)
     if (!httpMethod) {
-      throw new Error('Unknown API Gateway Payload format');
+      throw new Error('Unknown API Gateway Payload format')
     }
-
     if (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 = async request => {
-    if (request.response === undefined) return;
-    return httpCorsMiddlewareAfter(request);
-  };
-
+  }
+  const httpCorsMiddlewareOnError = async (request) => {
+    if (request.response === undefined) return
+    return httpCorsMiddlewareAfter(request)
+  }
   return {
     after: httpCorsMiddlewareAfter,
     onError: httpCorsMiddlewareOnError
-  };
-};
+  }
+}
 
 const getVersionHttpMethod = {
-  '1.0': event => event.httpMethod,
-  '2.0': event => event.requestContext.http.method
-};
-export default httpCorsMiddleware;
+  '1.0': (event) => event.httpMethod,
+  '2.0': (event) => event.requestContext.http.method
+}
+
+export default httpCorsMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-cors",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "CORS (Cross-Origin Resource Sharing) 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": [
@@ -45,11 +46,11 @@
     "url": "https://github.com/middyjs/middy/issues"
   },
   "homepage": "https://github.com/middyjs/middy#readme",
-  "gitHead": "de30419273ecbff08f367f47c7e320ec981cf145",
+  "gitHead": "1441158711580313765e6d156046ef0fade0d156",
   "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"
   }
 }