From e36be9e38115c6ebd6385c048eea71f2abd40626 Mon Sep 17 00:00:00 2001
From: Katalina / stardust <katie@player.me>
Date: Wed, 27 Dec 2017 00:51:14 -0600
Subject: [PATCH] server: fix sessions store not being in koa-session
 middleware

---
 Server/api/auth.js          |  3 ---
 Server/index.js             | 19 +++++++++----------
 Server/services/sessions.js |  7 +++++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Server/api/auth.js b/Server/api/auth.js
index bc9753b..2f77cd9 100644
--- a/Server/api/auth.js
+++ b/Server/api/auth.js
@@ -11,13 +11,10 @@ module.exports = (R, $) => {
     console.log(ctx.session.expiresAt >= new Date(), ctx.session.expiresAt, new Date())
 
     if (ctx.session.accessToken === undefined || ctx.session.expiresAt >= new Date()) {
-      console.log('getting auth token')
       const data = await $.discord.getAuthToken(token)
-      console.log(data)
       ctx.session.accessToken = data.access_token
       ctx.session.refreshToken = data.refresh_token
       ctx.session.expiresAt = new Date() + ctx.expires_in
-      console.log(ctx.session)
     }
 
     const user = await $.discord.getUser(ctx.session.accessToken)
diff --git a/Server/index.js b/Server/index.js
index f48dbf7..931b23e 100644
--- a/Server/index.js
+++ b/Server/index.js
@@ -19,17 +19,12 @@ app.keys = [ process.env.APP_KEY ]
 const DEVEL = process.env.NODE_ENV === 'development'
 
 async function start () {
+  await M.awaitServices()
+
   // body parser
   const bodyParser = require('koa-bodyparser')
   app.use(bodyParser({ types: ['json'] }))
 
-  const session = require('koa-session')
-  app.use(session({
-    key: 'roleypoly:sess',
-    maxAge: 'session',
-    store: M.sessions
-  }, app))
-
   // Request logger
   app.use(async (ctx, next) => {
     let timeStart = new Date()
@@ -52,11 +47,15 @@ async function start () {
     return null
   })
 
-  // Construct the Roleypoly!
+  const session = require('koa-session')
+  app.use(session({
+    key: 'roleypoly:sess',
+    maxAge: 'session',
+    store: M.ctx.sessions
+  }, app))
+
   await M.mountRoutes()
 
-  // Start it!
-  await M.awaitServices()
   log.info(`starting HTTP server on ${process.env.APP_PORT || 6769}`)
   server.listen(process.env.APP_PORT || 6769)
 }
diff --git a/Server/services/sessions.js b/Server/services/sessions.js
index d6ba868..793ae5e 100644
--- a/Server/services/sessions.js
+++ b/Server/services/sessions.js
@@ -29,9 +29,12 @@ class SessionsService extends Service {
   }
 
   async destroy (id) {
-    return (await this.Session.findOne({ where: { id } })).destroy()
-  }
+    const sess = await this.Session.findOne({ where: { id } })
 
+    if (sess != null) {
+      return sess.destroy()
+    }
+  }
 }
 
 module.exports = SessionsService