Merge pull request strongloop#1561 from strongloop/feature/allow-midd…

…leware-methods Allow methods filter for middleware config
firetix · Aug 6, 2015 · 9b748cb · 9b748cb
2 parents 004baad + c44a19d
commit 9b748cb
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/lib/server-app.js b/lib/server-app.js
@@ -65,6 +65,34 @@ proto.middlewareFromConfig = function(factory, config) {
   }
 
   var handler = factory.apply(null, params);
+
+  // Check if methods/verbs filter exists
+  var verbs = config.methods || config.verbs;
+  if (Array.isArray(verbs)) {
+    verbs = verbs.map(function(verb) {
+      return verb && verb.toUpperCase();
+    });
+    if (verbs.indexOf('ALL') === -1) {
+      var originalHandler = handler;
+      if (handler.length <= 3) {
+        // Regular handler
+        handler = function(req, res, next) {
+          if (verbs.indexOf(req.method.toUpperCase()) === -1) {
+            return next();
+          }
+          originalHandler(req, res, next);
+        };
+      } else {
+        // Error handler
+        handler = function(err, req, res, next) {
+          if (verbs.indexOf(req.method.toUpperCase()) === -1) {
+            return next(err);
+          }
+          originalHandler(err, req, res, next);
+        };
+      }
+    }
+  }
   this.middleware(config.phase, config.paths || [], handler);
 
   return this;

diff --git a/test/app.test.js b/test/app.test.js
@@ -438,12 +438,29 @@ describe('app', function() {
         params: null
       });
 
+      // This should be triggered with matching verbs
+      app.middlewareFromConfig(handlerFactory, {
+        enabled: true,
+        phase: 'routes:before',
+        methods: ['get', 'head'],
+        params: {x: 1}
+      });
+
+      // This should be skipped as the verb doesn't match
+      app.middlewareFromConfig(handlerFactory, {
+        enabled: true,
+        phase: 'routes:before',
+        methods: ['post'],
+        params: {x: 2}
+      });
+
       executeMiddlewareHandlers(app, function(err) {
         if (err) return done(err);
         expect(steps).to.eql([
           ['before'],
           [expectedConfig],
-          ['after', 2]
+          ['after', 2],
+          [{x: 1}]
         ]);
         done();
       });