fix(conditional): Allow additional arguments to be used in conditiona…

…l functions (#57)
elliotttf · Jan 10, 2018 · eca21f3 · eca21f3
1 parent fa02fc6
commit eca21f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/conditional.js b/lib/conditional.js
@@ -33,7 +33,7 @@ const once = require('once');
  */
 module.exports = (condition, success, fail) => (req, res, next, ...rest) => {
   const nextOnce = once(next);
-  if (condition === true || (typeof condition === 'function' && condition(req, res, nextOnce))) {
+  if (condition === true || (typeof condition === 'function' && condition(req, res, nextOnce, ...rest))) {
     return success(req, res, nextOnce, ...rest);
   }
   if (fail) {

diff --git a/test/index.js b/test/index.js
@@ -72,6 +72,17 @@ module.exports = {
     });
   },
 
+  funcAdditional(test) {
+    const conditionFunc = (req, res, next, extra) => extra === true;
+
+    const middleware = conditional(conditionFunc, (req, res, next) => {
+      test.ok(true, 'Conditional function returned true.');
+      next();
+    });
+
+    middleware({ working: true }, {}, () => test.done(), true);
+  },
+
   funcOnce(test) {
     test.expect(2);