Refactor login to use session manager.

jaredhanson · Oct 11, 2016 · f8bad7e · f8bad7e
1 parent b8bf04a
commit f8bad7e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/lib/authenticator.js b/lib/authenticator.js
@@ -1,7 +1,8 @@
 /**
  * Module dependencies.
  */
-var SessionStrategy = require('./strategies/session');
+var SessionManager = require('./sessionmgr')
+  , SessionStrategy = require('./strategies/session');
 
 
 /**
@@ -30,6 +31,8 @@ function Authenticator() {
 Authenticator.prototype.init = function() {
   this.protocol(require('./protocol/http'));
   this.framework(require('./framework/connect')());
+  this._sm = new SessionManager();
+
   this.use(new SessionStrategy());
 };
 

diff --git a/lib/http/request.js b/lib/http/request.js
@@ -47,16 +47,8 @@ req.logIn = function(user, options, done) {
     if (typeof done != 'function') { throw new Error('req#login requires a callback function'); }
 
     var self = this;
-    this._passport.instance.serializeUser(user, this, function(err, obj) {
+    this._passport.instance._sm.logIn(this, user, function(err) {
       if (err) { self[property] = null; return done(err); }
-      if (!self._passport.session) {
-        self._passport.session = {};
-      }
-      self._passport.session.user = obj;
-      if (!self.session) {
-        self.session = {};
-      }
-      self.session[self._passport.instance._key] = self._passport.session;
       done();
     });
   } else {

diff --git a/lib/middleware/authenticate.js b/lib/middleware/authenticate.js
@@ -152,6 +152,7 @@ module.exports = function authenticate(passport, name, options, callback) {
         }
 
         info = info || {};
+
         return passport._protocol.success.call(ctx, user, info, next);
       };
 

diff --git a/lib/sessionmgr.js b/lib/sessionmgr.js
@@ -0,0 +1,21 @@
+function SessionManager() {
+  this.legacy = true;
+}
+
+SessionManager.prototype.logIn = function(req, user, cb) {
+  req._passport.instance.serializeUser(user, req, function(err, obj) {
+    if (err) { return cb(err); }
+    if (!req._passport.session) {
+      req._passport.session = {};
+    }
+    req._passport.session.user = obj;
+    if (!req.session) {
+      req.session = {};
+    }
+    req.session[req._passport.instance._key] = req._passport.session;
+    cb();
+  });
+}
+
+
+module.exports = SessionManager;