From ff4f4549e4ecc0e692763a0a11b0bdd41b855502 Mon Sep 17 00:00:00 2001 From: Gisle Aune Date: Sun, 16 Sep 2018 17:57:56 +0200 Subject: [PATCH] api: Fixed issues migrating to new gqlgen-based graphql server --- middleware/session.js | 12 +++++------- routes/auth.js | 6 ++++-- rpdata/api/LogHeader.js | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/middleware/session.js b/middleware/session.js index f306204..b5d7481 100644 --- a/middleware/session.js +++ b/middleware/session.js @@ -2,14 +2,12 @@ const session = require("express-session") const config = require("../config") var RedisStore = require('connect-redis')(session); -var sess = { +module.exports = session({ secret: config.session.secret, store: new RedisStore(config.redis), - cookie: {}, + cookie: { + secure: config.session.secure + }, resave: false, saveUninitialized: true, -} - -sess.cookie.secure = config.session.secure - -module.exports = session(sess) \ No newline at end of file +}) \ No newline at end of file diff --git a/routes/auth.js b/routes/auth.js index 7594322..f32f6a8 100644 --- a/routes/auth.js +++ b/routes/auth.js @@ -4,8 +4,10 @@ const passport = require("../middleware/passport") const router = express.Router() function saveReferer(req, res, next) { - req.session.loginReferrer = req.get("Referer") - req.session.save() + if (req.session != null) { + req.session.loginReferrer = req.get("Referer") + req.session.save() + } next() } diff --git a/rpdata/api/LogHeader.js b/rpdata/api/LogHeader.js index 3170c10..72e7984 100644 --- a/rpdata/api/LogHeader.js +++ b/rpdata/api/LogHeader.js @@ -65,7 +65,7 @@ const logHeaderApi = { channelName title description - event + eventName open characters { id