express: Move general Express setup from webaccess.js

The `express-session`, `cookie-parser`, etc. middleware is not
specific to access checks.
This commit is contained in:
Richard Hansen 2020-10-03 18:10:00 -04:00 committed by John McLear
parent 821c06cc3a
commit 377560eb51
3 changed files with 62 additions and 64 deletions

View file

@ -1,8 +1,8 @@
const express = require("../express");
var settings = require('../../utils/Settings');
var socketio = require('socket.io');
var socketIORouter = require("../../handler/SocketIORouter");
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
var webaccess = require("ep_etherpad-lite/node/hooks/express/webaccess");
var padMessageHandler = require("../../handler/PadMessageHandler");
@ -44,7 +44,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
req.headers.cookie = socket.handshake.query.cookie;
}
// See: https://socket.io/docs/faq/#Usage-with-express-session
webaccess.sessionMiddleware(req, {}, next);
express.sessionMiddleware(req, {}, next);
});
// var socketIOLogger = log4js.getLogger("socket.io");