Clean up cookie-session instance.
Ylian Saint-Hilaire committed
Jul 11, 2022 at 11:19 UTC
43828994681c732a697b4ecae82f8134cc6de7c5
2 files changed
+3
-5
webrelayserver.js
+2
-3
@@ -19,7 +19,6 @@ module.exports.CreateWebRelayServer = function (parent, db, args, certificates,
19
obj.parent = parent;
20
obj.db = db;
21
obj.express = require('express');
22
- obj.session = require('cookie-session');
22
obj.expressWs = null;
23
obj.tlsServer = null;
24
obj.net = require('net');
@@ -74,8 +73,8 @@ module.exports.CreateWebRelayServer = function (parent, db, args, certificates,
73
secure: (args.tlsoffload == null), // Use this cookie only over TLS (Check this: https://expressjs.com/en/guide/behind-proxies.html)
74
sameSite: (args.sessionsamesite ? args.sessionsamesite : 'lax')
75
}
77
- if (args.sessiontime != null) { sessionOptions.maxAge = (args.sessiontime * 60 * 1000); }
78
- obj.app.use(obj.session(sessionOptions));
76
+ if (args.sessiontime != null) { sessionOptions.maxAge = (args.sessiontime * 60000); } // sessiontime is minutes
77
+ obj.app.use(require('cookie-session')(sessionOptions));
78
79
// Add HTTP security headers to all responses
80
obj.app.use(function (req, res, next) {
webserver.js
+1
-2
@@ -40,7 +40,6 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
40
obj.tls = require('tls');
41
obj.path = require('path');
42
obj.bodyParser = require('body-parser');
43
- obj.session = require('cookie-session');
43
obj.exphbs = require('express-handlebars');
44
obj.crypto = require('crypto');
45
obj.common = require('./common.js');
@@ -5773,7 +5772,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
5772
sameSite: (obj.args.sessionsamesite ? obj.args.sessionsamesite : 'lax')
5773
}
5774
if (obj.args.sessiontime != null) { sessionOptions.maxAge = (obj.args.sessiontime * 60000); } // sessiontime is minutes
5776
- obj.app.use(obj.session(sessionOptions));
5775
+ obj.app.use(require('cookie-session')(sessionOptions));
5776
5777
// Handle all incoming web sockets, see if some need to be handled as web relays
5778
obj.app.ws('/*', function (ws, req, next) {