@jaypie/express 1.1.1 → 1.1.3

package/dist/module.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+var errors = require('@jaypie/errors');
+var expressCors = require('cors');
 var core = require('@jaypie/core');
 var serverlessExpress = require('@codegenie/serverless-express');
 
@@ -16,6 +18,98 @@ const EXPRESS = {
   },
 };
 
+//
+//
+// Constants
+//
+
+const DEFAULT_HEADERS = ["Authorization", "X-Session-Id"];
+const DEFAULT_METHODS = ["DELETE", "HEAD", "GET", "POST", "PUT"];
+const HTTP_PROTOCOL = "http://";
+const HTTPS_PROTOCOL = "https://";
+const SANDBOX_ENV = "sandbox";
+
+//
+//
+// Helper Functions
+//
+
+const ensureProtocol = (url) => {
+  if (!url) return url;
+  if (url.startsWith(HTTP_PROTOCOL) || url.startsWith(HTTPS_PROTOCOL))
+    return url;
+  return HTTPS_PROTOCOL + url;
+};
+
+//
+//
+// Main
+//
+
+const corsHelper = (config = {}) => {
+  const { origins, methods, headers, overrides = {} } = config;
+
+  const options = {
+    origin(origin, callback) {
+      // Handle wildcard origin
+      if (origins === "*") {
+        callback(null, true);
+        return;
+      }
+
+      // Allow requests with no origin (like mobile apps, curl, etc)
+      if (!origin) {
+        callback(null, true);
+        return;
+      }
+
+      const allowedOrigins = origins || [
+        ensureProtocol(process.env.BASE_URL),
+        ensureProtocol(process.env.PROJECT_BASE_URL),
+      ];
+
+      // Add localhost origins in sandbox
+      if (!origins && process.env.PROJECT_ENV === SANDBOX_ENV) {
+        allowedOrigins.push("http://localhost");
+        allowedOrigins.push(/^http:\/\/localhost:\d+$/);
+      }
+
+      const isAllowed = allowedOrigins.some((allowed) => {
+        if (allowed instanceof RegExp) {
+          return allowed.test(origin);
+        }
+        return origin.includes(allowed);
+      });
+
+      if (isAllowed) {
+        callback(null, true);
+      } else {
+        callback(new errors.CorsError());
+      }
+    },
+    methods: [...DEFAULT_METHODS, ...(methods || [])],
+    allowedHeaders: [...DEFAULT_HEADERS, ...(headers || [])],
+    ...overrides,
+  };
+
+  return expressCors(options);
+};
+
+//
+//
+// Export
+//
+
+console.log("Export cors middleware");
+var cors_helper = (config) => {
+  console.log("Create cors middleware");
+  const cors = corsHelper(config);
+  return (req, res, next) => {
+    console.log("Run cors middleware");
+    cors(req, res, next);
+  };
+};
+
 //
 //
 // Helper Functions
@@ -548,6 +642,7 @@ const {
 
 exports.EXPRESS = EXPRESS;
 exports.badRequestRoute = badRequestRoute;
+exports.cors = cors_helper;
 exports.echoRoute = echoRoute;
 exports.expressHandler = expressHandler;
 exports.expressHttpCodeHandler = httpHandler;

package/dist/module.esm.js

@@ -1,3 +1,5 @@
+import { CorsError } from '@jaypie/errors';
+import expressCors from 'cors';
 import { log, JAYPIE, HTTP, validate, force, jaypieHandler, UnhandledError, BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, MethodNotAllowedError, GoneError, TeapotError, InternalError, BadGatewayError, UnavailableError, GatewayTimeoutError, NotImplementedError } from '@jaypie/core';
 import { getCurrentInvoke } from '@codegenie/serverless-express';
 
@@ -14,6 +16,98 @@ const EXPRESS = {
   },
 };
 
+//
+//
+// Constants
+//
+
+const DEFAULT_HEADERS = ["Authorization", "X-Session-Id"];
+const DEFAULT_METHODS = ["DELETE", "HEAD", "GET", "POST", "PUT"];
+const HTTP_PROTOCOL = "http://";
+const HTTPS_PROTOCOL = "https://";
+const SANDBOX_ENV = "sandbox";
+
+//
+//
+// Helper Functions
+//
+
+const ensureProtocol = (url) => {
+  if (!url) return url;
+  if (url.startsWith(HTTP_PROTOCOL) || url.startsWith(HTTPS_PROTOCOL))
+    return url;
+  return HTTPS_PROTOCOL + url;
+};
+
+//
+//
+// Main
+//
+
+const corsHelper = (config = {}) => {
+  const { origins, methods, headers, overrides = {} } = config;
+
+  const options = {
+    origin(origin, callback) {
+      // Handle wildcard origin
+      if (origins === "*") {
+        callback(null, true);
+        return;
+      }
+
+      // Allow requests with no origin (like mobile apps, curl, etc)
+      if (!origin) {
+        callback(null, true);
+        return;
+      }
+
+      const allowedOrigins = origins || [
+        ensureProtocol(process.env.BASE_URL),
+        ensureProtocol(process.env.PROJECT_BASE_URL),
+      ];
+
+      // Add localhost origins in sandbox
+      if (!origins && process.env.PROJECT_ENV === SANDBOX_ENV) {
+        allowedOrigins.push("http://localhost");
+        allowedOrigins.push(/^http:\/\/localhost:\d+$/);
+      }
+
+      const isAllowed = allowedOrigins.some((allowed) => {
+        if (allowed instanceof RegExp) {
+          return allowed.test(origin);
+        }
+        return origin.includes(allowed);
+      });
+
+      if (isAllowed) {
+        callback(null, true);
+      } else {
+        callback(new CorsError());
+      }
+    },
+    methods: [...DEFAULT_METHODS, ...(methods || [])],
+    allowedHeaders: [...DEFAULT_HEADERS, ...(headers || [])],
+    ...overrides,
+  };
+
+  return expressCors(options);
+};
+
+//
+//
+// Export
+//
+
+console.log("Export cors middleware");
+var cors_helper = (config) => {
+  console.log("Create cors middleware");
+  const cors = corsHelper(config);
+  return (req, res, next) => {
+    console.log("Run cors middleware");
+    cors(req, res, next);
+  };
+};
+
 //
 //
 // Helper Functions
@@ -544,4 +638,4 @@ const {
   notImplementedRoute,
 } = routes;
 
-export { EXPRESS, badRequestRoute, echoRoute, expressHandler, httpHandler as expressHttpCodeHandler, forbiddenRoute, goneRoute, methodNotAllowedRoute, noContentRoute, notFoundRoute, notImplementedRoute };
+export { EXPRESS, badRequestRoute, cors_helper as cors, echoRoute, expressHandler, httpHandler as expressHttpCodeHandler, forbiddenRoute, goneRoute, methodNotAllowedRoute, noContentRoute, notFoundRoute, notImplementedRoute };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/express",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "license": "MIT",
   "author": "Finlayson Studio",
   "type": "module",
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "878517b1552208902adeef5f6658c0a5c580c3fc"
+  "gitHead": "cb9bf6543a9bd07129ea9354ceea73df0461de87"
 }

package/src/cors.helper.js

@@ -83,4 +83,12 @@ const corsHelper = (config = {}) => {
 // Export
 //
 
-export default corsHelper;
+console.log("Export cors middleware");
+export default (config) => {
+  console.log("Create cors middleware");
+  const cors = corsHelper(config);
+  return (req, res, next) => {
+    console.log("Run cors middleware");
+    cors(req, res, next);
+  };
+};

package/src/index.js

@@ -1,4 +1,5 @@
 export { EXPRESS } from "./constants.js";
+export { default as cors } from "./cors.helper.js";
 export { default as expressHandler } from "./expressHandler.js";
 export { default as expressHttpCodeHandler } from "./http.handler.js";
 export * from "./routes.js";