Fix passport session

Strider-CD · Feb 20, 2017 · 2202e05 · 2202e05
1 parent 7e3fd5c
commit 2202e05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/routes/api/session.js b/lib/routes/api/session.js
@@ -38,7 +38,10 @@ router.route('/')
       if (!user) {
         res.status(404).send({message: 'No such username / password'});
       } else {
-        req.session.user = user.id;
+        if (!req.session.passport) {
+          req.session.passport = {};
+        }
+        req.session.passport.user = user.id;
         res.send(user);
       }
     });

diff --git a/lib/websockets.js b/lib/websockets.js
@@ -44,8 +44,9 @@ UserSockets.prototype = {
   // socket callback. Adds a new socket
   connected: function (socket) {
     var session = socket.handshake.session;
-    if (session && session.user) {
-      this.addSocket(session.user, socket);
+
+    if (session && session.passport) {
+      this.addSocket(session.passport.user, socket);
     } else {
       console.debug('Websocket connection does not have authorization - nothing to do.');
     }