Merge 4ca2166 into 79fa146

SphericalElephant · Dec 2, 2019 · 85d18e6 · 85d18e6
2 parents 79fa146 + 4ca2166
commit 85d18e6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/lib/route/route-exposure-handler.js b/lib/route/route-exposure-handler.js
@@ -6,7 +6,10 @@ class RouteExposureHandler {
   }
 
   isRouteExposed(httpVerb, route) {
-    const result = !this.exposedRoutes[route] || !this.exposedRoutes[route][httpVerb] === false;
+    const result =
+      !this.exposedRoutes[route] ||
+      (this.exposedRoutes[route][httpVerb] === null || this.exposedRoutes[route][httpVerb] === undefined) ||
+      !this.exposedRoutes[route][httpVerb] === false;
     if (this.exposedRoutes[route] && this.exposedRoutes[route][httpVerb] === true && route === '/search' && httpVerb === 'get') {
       console.error('exposing /search via GET will be removed.');
     }

diff --git a/test/lib/route/route-exposure-handler.test.js b/test/lib/route/route-exposure-handler.test.js
@@ -10,21 +10,33 @@ const sinon = require('sinon');
 
 describe('RouteExposureHandler', () => {
   describe('isRouteExposed', () => {
-    it('should expose a route if no rule was specified', () => {
+    it('should expose a route if no rules were specified', () => {
       expect(new RouteExposureHandler({}).isRouteExposed('get', '/:id')).to.be.true;
     });
+    it('should expose a route if no rules for the method were specified but rules for other methods were specified', () => {
+      const rules = new RouteExposureHandler({
+        '/': {
+          post: false
+        }
+      });
+      expect(rules.isRouteExposed('get', '/')).to.be.true;
+      expect(rules.isRouteExposed('post', '/')).to.be.false;
+      expect(rules.isRouteExposed('head', '/')).to.be.true;
+      expect(rules.isRouteExposed('put', '/')).to.be.true;
+      expect(rules.isRouteExposed('patch', '/')).to.be.true;
+    });
     it('should not expose a route if specified', () => {
       expect(new RouteExposureHandler({
         '/:id': {
           get: false
         }}).isRouteExposed('get', '/:id')).to.be.false;
     });
     it('should expose a route if specified', () => {
-      expect(new RouteExposureHandler(({
+      expect(new RouteExposureHandler({
         '/:id': {
           get: true
         }
-      }).isRouteExposed('get', '/:id'))).to.be.true;
+      }).isRouteExposed('get', '/:id')).to.be.true;
     });
     it('should print an error if the user exposed /search via GET', () => {
       const consoleStub = sinon.stub(console, 'error');

diff --git a/test/version-sequelize-4/sequelize4.test.js b/test/version-sequelize-4/sequelize4.test.js
@@ -7,5 +7,6 @@ describe('sequelize4', () => {
   require('../lib/openapi/sequelize/model-converter.test')(Sequelize4);
   require('../lib/data-mapper/sequelize/operator-table.test');
   require('../lib/data-mapper/sequelize/query-builder.test')(Sequelize4);
+  require('../lib/route/route-exposure-handler.test');
 });
 
diff --git a/test/version-sequelize-5/sequelize5.test.js b/test/version-sequelize-5/sequelize5.test.js
@@ -7,4 +7,5 @@ describe('sequelize5', () => {
   require('../lib/openapi/sequelize/model-converter.test')(Sequelize5);
   require('../lib/data-mapper/sequelize/operator-table.test');
   require('../lib/data-mapper/sequelize/query-builder.test')(Sequelize5);
+  require('../lib/route/route-exposure-handler.test');
 });