No need to bind returned middleware functions.

ktastrophy · Jan 25, 2014 · c84c312 · c84c312
1 parent 9f6af1f
commit c84c312
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/lib/authenticator.js b/lib/authenticator.js
@@ -132,7 +132,7 @@ Authenticator.prototype.initialize = function(options) {
   options = options || {};
   this._userProperty = options.userProperty || 'user';
 
-  return this._framework.initialize().bind(this);
+  return this._framework.initialize(this);
 }
 
 /**
@@ -164,7 +164,7 @@ Authenticator.prototype.initialize = function(options) {
  * @api public
  */
 Authenticator.prototype.authenticate = function(strategy, options, callback) {
-  return this._framework.authenticate(strategy, options, callback).bind(this);
+  return this._framework.authenticate(this, strategy, options, callback);
 }
 
 /**
@@ -192,7 +192,7 @@ Authenticator.prototype.authorize = function(strategy, options, callback) {
   options.assignProperty = 'account';
 
   var fn = this._framework.authorize || this._framework.authenticate;
-  return fn(strategy, options, callback).bind(this);
+  return fn(this, strategy, options, callback);
 }
 
 /**

diff --git a/lib/middleware/authenticate.js b/lib/middleware/authenticate.js
@@ -53,7 +53,7 @@ var http = require('http')
  * @return {Function}
  * @api public
  */
-module.exports = function authenticate(name, options, callback) {
+module.exports = function authenticate(passport, name, options, callback) {
   if (typeof options == 'function') {
     callback = options;
     options = {};
@@ -78,8 +78,6 @@ module.exports = function authenticate(name, options, callback) {
   }
 
   return function authenticate(req, res, next) {
-    var passport = this;
-
     // accumulator for failures from each strategy in the chain
     var failures = [];
 

diff --git a/lib/middleware/initialize.js b/lib/middleware/initialize.js
@@ -41,10 +41,9 @@
  * @return {Function}
  * @api public
  */
-module.exports = function initialize() {
+module.exports = function initialize(passport) {
 
   return function initialize(req, res, next) {
-    var passport = this;
     req._passport = {};
     req._passport.instance = passport;