pass the whole action to the whitelist function

Author: michaelcontento

src/__tests__/createMiddleware-test.js

@@ -101,15 +101,38 @@ describe('createMiddleware', () => {
  const store = { getState: sinon.spy() };
  const next = sinon.spy();
  const action = { type: 'ALLOWED' };
- const whitelistFn = (type) => {
- return type === 'ALLOWED';
- };
+ const whitelistFn = () => true;
 
  createMiddleware(engine, [], whitelistFn)(store)(next)(action);
 
  engine.save.should.have.been.called;
  });
 
+ it('should ignore actions if the whitelist function returns false', () => {
+ const engine = { save: sinon.stub().resolves() };
+ const store = { getState: sinon.spy() };
+ const next = sinon.spy();
+ const action = { type: 'ALLOWED' };
+ const whitelistFn = () => false;
+
+ createMiddleware(engine, [], whitelistFn)(store)(next)(action);
+
+ engine.save.should.not.have.been.called;
+ });
+
+ it('should pass the whole action to the whitelist function', (done) => {
+ const engine = { save: sinon.stub().resolves() };
+ const store = { getState: sinon.spy() };
+ const next = sinon.spy();
+ const action = { type: 'ALLOWED' };
+ const whitelistFn = (checkAction) => {
+ checkAction.should.deep.equal(action);
+ done();
+ };
+
+ createMiddleware(engine, [], whitelistFn)(store)(next)(action);
+ });
+
  describeConsoleWarnInNonProduction(
  'should not process functions',
  () => {

src/createMiddleware.js

@@ -53,11 +53,13 @@ function isValidAction(action) {
 
 function handleWhitelist(action, actionWhitelist) {
  if (Array.isArray(actionWhitelist)) {
- // Don't filter if the whitelist is empty
- return actionWhitelist.length === 0 ? true : actionWhitelist.indexOf(action.type) !== -1;
+ return actionWhitelist.length === 0
+ ? true // Don't filter if the whitelist is empty
+ : actionWhitelist.indexOf(action.type) !== -1;
  }
+
  // actionWhitelist is a function that returns true or false
- return actionWhitelist(action.type);
+ return actionWhitelist(action);
 }
 
 export default (engine, actionBlacklist = [], actionWhitelist = []) => {