@adaptivestone/framework 4.11.1 → 4.11.3

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 4.11.3
+
+[UPDATE] deps update
+
+### 4.11.2
+
+[FIX] Cors middleware return proper headers on multidomains
+
 ### 4.11.1
 
 [FIX] Cors middleware return proper status

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "4.11.1",
+  "version": "4.11.3",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "engines": {

package/services/http/middleware/Cors.js

@@ -14,28 +14,29 @@ class Cors extends AbstractMiddleware {
   }
 
   async middleware(req, res, next) {
-    if (req.method !== 'OPTIONS') {
-      // only get supported
-      return next();
-    }
     for (const host of this.params.origins) {
       if (
         (typeof host === 'string' && req.headers.origin === host) ||
         (host instanceof RegExp && host.test(req.headers.origin))
       ) {
         res.set('Access-Control-Allow-Origin', req.headers.origin);
-        res.set(
-          'Access-Control-Allow-Methods',
-          'GET,HEAD,PUT,PATCH,POST,DELETE',
-        );
-        res.set('Vary', 'Origin, Access-Control-Request-Headers');
+        res.set('Vary', 'Origin');
+
+        if (req.method === 'OPTIONS') {
+          res.set(
+            'Access-Control-Allow-Methods',
+            'GET,HEAD,PUT,PATCH,POST,DELETE',
+          );
+          res.set('Vary', 'Origin, Access-Control-Request-Headers');
 
-        const allowedHeaders = req.headers['access-control-request-headers'];
-        if (allowedHeaders) {
-          res.set('Access-Control-Allow-Headers', allowedHeaders);
+          const allowedHeaders = req.headers['access-control-request-headers'];
+          if (allowedHeaders) {
+            res.set('Access-Control-Allow-Headers', allowedHeaders);
+          }
+          res.set('Content-Length', '0');
+          res.status(204);
+          return res.end();
         }
-        res.status(204);
-        return res.end();
       }
     }
     return next();

package/services/http/middleware/Cors.test.js

@@ -28,21 +28,30 @@ describe('cors middleware methods', () => {
     expect(() => new Cors(global.server.app, { origins: 'origins' })).toThrow();
   });
 
-  it('non options should be ignored', async () => {
-    expect.assertions(1);
+  it('non options should be different', async () => {
+    expect.assertions(2);
     let isCalled = false;
     const nextFunction = () => {
       isCalled = true;
     };
+    const map = new Map();
     const req = {
       method: 'GET',
+
+      headers: { origin: 'https://localhost' },
+    };
+    const res = {
+      set: (key, val) => {
+        map.set(key, val);
+      },
     };
     const middleware = new Cors(global.server.app, {
-      origins: ['something'],
+      origins: ['https://localhost'],
     });
 
-    await middleware.middleware(req, {}, nextFunction);
+    await middleware.middleware(req, res, nextFunction);
     expect(isCalled).toBeTruthy();
+    expect(map.get('Vary')).toBe('Origin');
   });
 
   it('host the not match origin', async () => {
@@ -78,6 +87,7 @@ describe('cors middleware methods', () => {
       set: (key, val) => {
         map.set(key, val);
       },
+      status: () => {},
       end: () => {
         isEndCalled = true;
       },
@@ -113,6 +123,8 @@ describe('cors middleware methods', () => {
       set: (key, val) => {
         map.set(key, val);
       },
+      status: () => {},
+
       end: () => {
         isEndCalled = true;
       },

package/tests/setup.js

@@ -107,13 +107,11 @@ afterAll(async () => {
     global.server.app.httpServer.shutdown();
     global.server.app.events.emit('shutdown');
   }
-  // setTimeout(async () => {
+
   if (typeof global.testSetup.afterAll === 'function') {
     await global.testSetup.afterAll();
   }
 
   await mongoose.disconnect();
   await mongoMemoryServerInstance.stop();
-
-  // }, 2000);
 });