minor fixes + push version up to 1.4.1

app.js

@@ -15,15 +15,8 @@ const eventDispatcher = new Dispatcher();
 
 let app = express();
 let server = require('http').Server(app);
-let io = require('socket.io')(server, {
-    cookieHttpOnly: true,
-    cookieSecure: false,
-    cookie: false,
-    cors: {
-        origin: "*",
-        methods: ["GET", "POST"]
-      }
-});
+let io = require('socket.io')(server);
+
 let i18next = require("i18next");
 let FilesystemBackend = require("i18next-node-fs-backend");
 let i18nextMiddleware = require("i18next-express-middleware");
@@ -199,11 +192,11 @@ let pluginManager = new PluginManager(app, io, eventDispatcher);
 let websocket = require("./modules/websocket")(pluginManager, io, eventDispatcher);
 let indexRouter = require('./routes/index.js')(pluginManager, websocket, eventDispatcher);
 let adminRouter = require('./routes/admin.js')(pluginManager, websocket, eventDispatcher);
-let authRouter = require('./routes/auth.js')(app, websocket, eventDispatcher);
+let authRouter = require('./routes/auth.js')(websocket, eventDispatcher);
 
+app.use('/', authRouter);
 app.use('/', indexRouter);
 app.use('/admin', adminRouter);
-app.use('/', authRouter);
 
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "infoscreen3",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "scripts": {
     "start": "node --expose-gc ./bin/infoscreen3",
@@ -27,7 +27,7 @@
     "lodash": "^4.17.21",
     "minimist": "1.2.5",
     "morgan": "1.10.0",
-    "node-media-server": "2.2.8",
+    "node-media-server": "2.3.8",
     "node.extend": "2.0.2",
     "passport": "^0.4.1",
     "passport-local": "^1.0.0",

routes/auth.js

@@ -1,4 +1,6 @@
 let passport = require("passport");
+let express = require('express');
+let router = express.Router();
 const {RateLimiterMemory} = require('rate-limiter-flexible');
 const maxWrongAttemptsByIPperDay = 30;
 const maxConsecutiveFailsByUsernameAndIP = 5;
@@ -17,14 +19,13 @@ const limiterConsecutiveFailsByUsernameAndIP = new RateLimiterMemory({
 
 const getUsernameIPkey = (username, ip) => `${username}_${ip}`;
 
-module.exports = function (app, websocket, dispatcher) {
+module.exports = function (websocket, dispatcher) {
 
-
-    app.get('/login', function (req, res, next) {
+    router.get('/login', function (req, res, next) {
         res.render('auth/login');
     });
 
-    app.post('/login',
+    router.post('/login',
         function (req, res, next) {
             passport.authenticate('local', async function (err, user, info) {
                 const ipAddr = req.ip;
@@ -94,15 +95,15 @@ module.exports = function (app, websocket, dispatcher) {
             })(req, res, next);
         });
 
-    app.get('/logout',
+    router.get('/logout',
         function (req, res) {
             req.logout();
             res.redirect('/');
         });
 
-    app.get('/empty', function (req, res, next) {
+    router.get('/empty', function (req, res, next) {
         res.render('empty');
     });
-
-    return app;
+    
+    return router;
 };