Add the option to override “failCallback” when creating middleware.

- This required changing the signature for getMiddleware. Switched to taking an options object to avoid this issue in the future.

Author: AdamPflug

index.js

@@ -41,12 +41,16 @@ var ExpressBrute = module.exports = function (store, options) {
 	// generate "prevent" middleware
 	this.prevent = this.getMiddleware();
 };
-ExpressBrute.prototype.getMiddleware = function (key) {
+ExpressBrute.prototype.getMiddleware = function (options) {
 	// standardize input
-	var keyFunc = key;
+	options = _.extend({}, options);
+	var keyFunc = options.key;
 	if (typeof keyFunc !== 'function') {
-		keyFunc = function (req, res, next) { next(key); };
+		keyFunc = function (req, res, next) { next(options.key); };
 	}
+	var getFailCallback = _.bind(function () {
+		return typeof options.failCallback === 'undefined' ? this.options.failCallback : options.failCallback;
+	}, this);
 
 	// create middleware
 	return _.bind(function (req, res, next) {
@@ -106,7 +110,8 @@ ExpressBrute.prototype.getMiddleware = function (key) {
 						typeof next == 'function' && next();
 					});
 				} else {
-					this.options.failCallback(req, res, next, new Date(nextValidRequestTime));
+					var failCallback = getFailCallback();
+					typeof failCallback === 'function' && failCallback(req, res, next, new Date(nextValidRequestTime));
 				}
 			}, this));
 		},this));

spec/ExpessBrute.js

@@ -170,6 +170,26 @@ describe("express brute", function () {
 				expect(errorSpy.calls.length).toEqual(1);
 			});
 		});
+		it('allows failCallback to be overridden', function () {
+			brute = new ExpressBrute(store, {
+				freeRetries: 0,
+				minWait: 10000,
+				maxWait: 10000,
+				lifetime: 1,
+				failCallback: errorSpy
+			});
+			var errorSpy2 = jasmine.createSpy();
+			var mid = brute.getMiddleware({
+				failCallback: errorSpy2
+			});
+
+			mid(req(), new ResponseMock(), nextSpy);
+			expect(errorSpy).not.toHaveBeenCalled();
+			expect(errorSpy2).not.toHaveBeenCalled();
+			mid(req(), new ResponseMock(), nextSpy);
+			expect(errorSpy).not.toHaveBeenCalled();
+			expect(errorSpy2).toHaveBeenCalled();
+		});
 	});
 	describe("multiple keys", function () {
 		var brute, store, errorSpy, nextSpy, req, done;
@@ -186,8 +206,8 @@ describe("express brute", function () {
 			});
 		});
 		it ('tracks keys separately', function () {
-			var first = brute.getMiddleware('first');
-			var second = brute.getMiddleware('second');
+			var first = brute.getMiddleware({key: 'first' });
+			var second = brute.getMiddleware({key: 'second' });
 
 			first(req(), new ResponseMock(), nextSpy);
 			expect(nextSpy.calls.length).toEqual(1);
@@ -208,8 +228,8 @@ describe("express brute", function () {
 					someData: "something cool"
 				};
 			};
-			var first = brute.getMiddleware(function(req, res, next) { next(req.someData); });
-			var second = brute.getMiddleware("something cool");
+			var first = brute.getMiddleware({key: function(req, res, next) { next(req.someData); } });
+			var second = brute.getMiddleware({key: "something cool" });
 
 			first(req(), new ResponseMock(), nextSpy);
 			expect(nextSpy.calls.length).toEqual(1);
@@ -219,7 +239,7 @@ describe("express brute", function () {
 			expect(nextSpy.calls.length).toEqual(1);
 		});
 		it ('supports brute.reset', function () {
-			var mid = brute.getMiddleware('withAKey');
+			var mid = brute.getMiddleware({key: 'withAKey' });
 
 			mid(req(), new ResponseMock(), nextSpy);
 			expect(nextSpy.calls.length).toEqual(1);
@@ -228,7 +248,7 @@ describe("express brute", function () {
 			expect(nextSpy.calls.length).toEqual(2);
 		});
 		it ('supports req.reset shortcut', function () {
-			var firstReq, mid = brute.getMiddleware('withAKey');
+			var firstReq, mid = brute.getMiddleware({key: 'withAKey' });
 
 			mid(firstReq = req(), new ResponseMock(), nextSpy);
 			expect(nextSpy.calls.length).toEqual(1);