Improve compatibility with old strategies and new lazy sessions.

cuulee · Nov 9, 2015 · e62afe0 · e62afe0
1 parent aa74207
commit e62afe0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/lib/framework/connect.js b/lib/framework/connect.js
@@ -15,13 +15,25 @@ var initialize = require('../middleware/initialize')
  * @return {Object}
  * @api protected
  */
-module.exports = function() {
+exports = module.exports = function() {
 
   // HTTP extensions.
-  require('../http/request');
+  exports.__monkeypatchNode();
 
   return {
     initialize: initialize,
     authenticate: authenticate
   };
 };
+
+exports.__monkeypatchNode = function() {
+  var http = require('http');
+  var IncomingMessageExt = require('../http/request');
+
+  http.IncomingMessage.prototype.login
+  http.IncomingMessage.prototype.logIn = IncomingMessageExt.logIn;
+  http.IncomingMessage.prototype.logout
+  http.IncomingMessage.prototype.logOut = IncomingMessageExt.logOut;
+  http.IncomingMessage.prototype.isAuthenticated = IncomingMessageExt.isAuthenticated;
+  http.IncomingMessage.prototype.isUnauthenticated = IncomingMessageExt.isUnauthenticated;
+};
diff --git a/lib/http/request.js b/lib/http/request.js
@@ -1,10 +1,12 @@
 /**
  * Module dependencies.
  */
-var http = require('http')
-  , req = http.IncomingMessage.prototype;
+//var http = require('http')
+//  , req = http.IncomingMessage.prototype;
 
 
+var req = exports = module.exports = {};
+
 /**
  * Intiate a login session for `user`.
  *

diff --git a/lib/middleware/authenticate.js b/lib/middleware/authenticate.js
@@ -2,6 +2,7 @@
  * Module dependencies.
  */
 var http = require('http')
+  , IncomingMessageExt = require('../http/request')
   , AuthenticationError = require('../errors/authenticationerror');
 
 
@@ -78,6 +79,12 @@ module.exports = function authenticate(passport, name, options, callback) {
   }
 
   return function authenticate(req, res, next) {
+    if (http.IncomingMessage.prototype.logIn
+        && http.IncomingMessage.prototype.logIn !== IncomingMessageExt.logIn) {
+      require('../framework/connect').__monkeypatchNode();
+    }
+
+
     // accumulator for failures from each strategy in the chain
     var failures = [];