fix(NA): fixed login and logout problems.

mistic · mistic · commit c2f068659952 · 2017-05-02T19:50:19.000+01:00
diff --git a/api/config.js b/api/config.js
@@ -6,4 +6,5 @@ export default {
   // and the extracted_queries.json file in both the client and API server
   // must be the same.
   persistedQueries: false,
+  sessionStoreSecret: 'your secret',
 };
diff --git a/api/githubLogin.js b/api/githubLogin.js
@@ -2,6 +2,7 @@ import session from 'express-session';
 import passport from 'passport';
 import { Strategy as GitHubStrategy } from 'passport-github';
 import knex from './sql/connector';
+import config from './config';
 
 import {
   GITHUB_CLIENT_ID,
@@ -33,11 +34,11 @@ export function setUpGitHubLogin(app) {
       cb(null, profile);
     }));
 
-  passport.serializeUser((user, cb) => cb(null, user));
-  passport.deserializeUser((obj, cb) => cb(null, obj));
+  passport.serializeUser((user, cb) => {cb(null, user);});
+  passport.deserializeUser((obj, cb) => {cb(null, obj);});
 
   app.use(session({
-    secret: 'your secret',
+    secret: config.sessionStoreSecret,
     resave: true,
     saveUninitialized: true,
     store,
@@ -57,4 +58,6 @@ export function setUpGitHubLogin(app) {
     req.logout();
     res.redirect('/');
   });
+
+  return store;
 }
diff --git a/api/server.js b/api/server.js
@@ -2,7 +2,6 @@ import path from 'path';
 import express from 'express';
 import cookie from 'cookie';
 import cookieParser from 'cookie-parser';
-import url from 'url';
 import cors from 'cors';
 import { graphqlExpress, graphiqlExpress } from 'graphql-server-express';
 import OpticsAgent from 'optics-agent';
@@ -27,7 +26,6 @@ import queryMap from '../extracted_queries.json';
 import config from './config';
 
 const SUBSCRIPTIONS_PATH = '/subscriptions';
-let wsSessionUser = null;
 
 // Arguments usually come from env vars
 export function run({
@@ -66,7 +64,7 @@ export function run({
     },
   );
 
-  var sessionStore = setUpGitHubLogin(app);
+  const sessionStore = setUpGitHubLogin(app);
   app.use(cookieParser('your secret'));
 
   if (OPTICS_API_KEY) {
@@ -154,54 +152,86 @@ export function run({
       schema,
       executor: graphqlExecutor,
 
+      /*
       onConnect: (msg, connectionContext) => {
         const socket = connectionContext.socket;
 
         // We get req.user from passport-github with some pretty oddly named fields,
         // let's convert that to the fields in our schema, which match the GitHub
         // API field names.
-        /**/
         if (socket.upgradeReq) {
-          var location = url.parse(socket.upgradeReq.url, true);
-          //get sessionID
-          var cookies = cookie.parse(socket.upgradeReq.headers.cookie);
-          var sessionID = cookieParser.signedCookie(cookies["connect.sid"], config.sessionStoreSecret);
-          //get the session object
-          sessionStore.get(sessionID, function (err, session) {
-            const sessionUser = session.passport.user;
-            wsSessionUser = {
-              login: sessionUser.username,
-              html_url: sessionUser.profileUrl,
-              avatar_url: sessionUser.photos[0].value,
-            };
-
-          }); 
-        };
+          // get sessionID
+
+          const cookies = cookie.parse(socket.upgradeReq.headers.cookie);
+          const sessionID = cookieParser.signedCookie(cookies['connect.sid'],
+          config.sessionStoreSecret);
+          // get the session object
+          sessionStore.get(sessionID, (err, session) => {
+            if (session && session.passport && session.passport.user) {
+              const sessionUser = session.passport.user;
+              wsSessionUser = {
+                login: sessionUser.username,
+                html_url: sessionUser.profileUrl,
+                avatar_url: sessionUser.photos[0].value,
+              };
+            }
+          });
+        }
       },
+      */
 
       // the onSubscribe function is called for every new subscription
       // and we use it to set the GraphQL context for this subscription
       onRequest: (msg, params, socket) => {
-        const gitHubConnector = new GitHubConnector({
-          clientId: GITHUB_CLIENT_ID,
-          clientSecret: GITHUB_CLIENT_SECRET,
-        });
-
-        let opticsContext;
-        if (OPTICS_API_KEY) {
-          opticsContext = OpticsAgent.context(req);
-        }
-
-        return Object.assign({}, params, {
-              context: {
-                user: wsSessionUser,
-                Repositories: new Repositories({ connector: gitHubConnector }),
-                Users: new Users({ connector: gitHubConnector }),
-                Entries: new Entries(),
-                Comments: new Comments(),
-                opticsContext,
-              },
+        return new Promise((resolve) => {
+          const gitHubConnector = new GitHubConnector({
+            clientId: GITHUB_CLIENT_ID,
+            clientSecret: GITHUB_CLIENT_SECRET,
+          });
+
+          let opticsContext;
+          if (OPTICS_API_KEY) {
+            opticsContext = OpticsAgent.context(socket.upgradeReq);
+          }
+
+          let wsSessionUser = null;
+          if (socket.upgradeReq) {
+            // get sessionID
+            const cookies = cookie.parse(socket.upgradeReq.headers.cookie);
+            const sessionID = cookieParser.signedCookie(cookies['connect.sid'], config.sessionStoreSecret);
+            // get the session object
+            sessionStore.get(sessionID, (err, session) => {
+              if (session && session.passport && session.passport.user) {
+                const sessionUser = session.passport.user;
+                wsSessionUser = {
+                  login: sessionUser.username,
+                  html_url: sessionUser.profileUrl,
+                  avatar_url: sessionUser.photos[0].value,
+                };
+                resolve(Object.assign({}, params, {
+                  context: {
+                    user: wsSessionUser,
+                    Repositories: new Repositories({ connector: gitHubConnector }),
+                    Users: new Users({ connector: gitHubConnector }),
+                    Entries: new Entries(),
+                    Comments: new Comments(),
+                    opticsContext,
+                  },
+                }));
+              } else {
+                resolve(resolve(Object.assign({}, params, {
+                  context: {
+                    Repositories: new Repositories({ connector: gitHubConnector }),
+                    Users: new Users({ connector: gitHubConnector }),
+                    Entries: new Entries(),
+                    Comments: new Comments(),
+                    opticsContext,
+                  },
+                })));
+              }
             });
+          }
+        });
       },
     },
     {
