minimonolith 0.26.8 → 0.26.11

package/index.js

@@ -3,11 +3,12 @@ import SERVER_MODULE from './src/server/index.js';
 import AUTOTEST_MODULE from './src/autotest/index.js';
 
 const { getNewAPI } = API_MODULE;
-const { getServerFactory } = SERVER_MODULE;
+const { getServerFactory, getHttpsServerFactory } = SERVER_MODULE;
 const { getMethodTest } = AUTOTEST_MODULE;
 
 export {
   getServerFactory,
+  getHttpsServerFactory,
   getNewAPI,
   getMethodTest,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minimonolith",
   "type": "module",
-  "version": "0.26.8",
+  "version": "0.26.11",
   "main": "index.js",
   "license": "MIT",
   "scripts": {

package/src/middleware/postCors/corsHeaders.js

@@ -1,6 +1,6 @@
-export default {
-  'Access-Control-Allow-Origin': '*',
+export default ({ origin }) => ({
+  'Access-Control-Allow-Origin': origin,
   'Access-Control-Allow-Methods': 'OPTIONS, POST, GET, PUT, PATCH, DELETE',
   'Access-Control-Allow-Headers': '*',
   'Access-Control-Allow-Credentials': true,
-};
+});

package/src/middleware/postCors/index.js

@@ -10,11 +10,19 @@ export default () =>  {
       LOG_MODULE.postINFO('Header de prueba: X_TRIGGER_ERROR_HEADER');
       throw new Error('X_TRIGGER_ERROR_HEADER');
     }
-    res.cors(); next();
+
+    //console.log('req.headers', req.headers);
+    const origin = req.headers.origin ? req.headers.origin : '*';
+    for (let k in CORS_HEADERS({ origin })) {
+        res.header(k, CORS_HEADERS({ origin })[k]);
+    }
+    //res.cors();
+    next();
   });
 
   API_MODULE.get().options('/*', (req, res) => {
-    for (let k in CORS_HEADERS) { res.header(k, CORS_HEADERS[k]); }
+    const origin = req.headers.origin ? req.headers.origin : '*';
+    for (let k in CORS_HEADERS({ origin })) { res.header(k, CORS_HEADERS({ origin })[k]); }
     res.status(200).send({})
   });
 };

package/src/middleware/postError/index.js

@@ -1,10 +1,15 @@
 import API_MODULE from '../../api/index.js';
 import LOG_MODULE from '../../log/index.js';
 
+import CORS_HEADERS from '../postCors/corsHeaders.js';
+
 export default () =>  {
   API_MODULE.get().use((err, req, res, next) => {
     LOG_MODULE.postERROR({ ROUTE_CODE: 'LAMBDA_API', ERROR: err });
-    res.cors(); //next();
+    const origin = req.headers.origin ? req.headers.origin : '*';
+    for (let k in CORS_HEADERS({ origin })) { res.header(k, CORS_HEADERS({ origin })[k]); }
+
+    //res.cors(); //next();
     res.status(500).send({ ROUTE_CODE: 'LAMBDA_API', ERROR: err.message });
   });
 };

package/src/server/getHttpsServerFactory/index.js

@@ -0,0 +1,13 @@
+import https from 'https';
+
+import getNodejsServerHandler from '../getNodejsServerHandler/index.js';
+
+export default async ({ key, cert }) => {
+
+  return (lambdaHandler) => {
+    const serverHandler = getNodejsServerHandler(lambdaHandler);
+
+    const server = https.createServer({ key, cert }, serverHandler);
+    return server;
+  }
+}

package/src/server/getNodejsServerHandler/index.js

@@ -32,7 +32,8 @@ const getLambdaEvent = (req, queryString, jwtClaims, body) => {
     headers: {},
     body,
   };
-  
+
+  if (req.headers['origin']) event.headers['origin'] = req.headers['origin'];
   if (req.headers['content-type']) event.headers['Content-Type'] = req.headers['content-type'];
   if (req.headers['x-trigger-error']) event.headers['x-trigger-error'] = 'TRUE';
   if (req.headers.accept) event.headers.accept = req.headers.accept;
@@ -65,7 +66,10 @@ export default lambdaHandler => async (req, res) => {
   } catch(SERVER_ERROR) {
     LOG_MODULE.postERROR({ SERVER_ERROR });
     res.statusCode = 500;
-    for (let k in CORS_HEADERS) res.setHeader(k, CORS_HEADERS[k]);
+    const origin = req.headers.origin ? req.headers.origin : '*';
+    for (let k in CORS_HEADERS({ origin })) {
+        res.setHeader(k, CORS_HEADERS({ origin })[k]);
+    }
     res.end(JSON.stringify({ REQUEST_PARSING_ERROR: SERVER_ERROR.toString() }));
   }
 }

package/src/server/index.js

@@ -1,3 +1,4 @@
 import getServerFactory from './getServerFactory/index.js';
+import getHttpsServerFactory from './getHttpsServerFactory/index.js';
 
-export default { getServerFactory };
+export default { getServerFactory, getHttpsServerFactory };