From 3265f5bd4be5fc2dbd4f579a05993704b829d934 Mon Sep 17 00:00:00 2001
From: Reaby <petri.jarvisalo@gmail.com>
Date: Fri, 31 Jan 2020 21:34:50 +0200
Subject: [PATCH] fixes

---
 app.js          |  4 ++--
 modules/db.js   |  1 -
 routes/auth.js  |  3 +--
 routes/index.js | 14 +++++++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 32cc87b..2583004 100644
--- a/app.js
+++ b/app.js
@@ -138,11 +138,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')(websocket, eventDispatcher);
+let authRouter = require('./routes/auth.js')(app, websocket, eventDispatcher);
 
 app.use('/', indexRouter);
 app.use('/admin', adminRouter);
-app.use('/', authRouter);
+//app.use('/', authRouter);
 
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {
diff --git a/modules/db.js b/modules/db.js
index d8e54c7..794e225 100644
--- a/modules/db.js
+++ b/modules/db.js
@@ -24,5 +24,4 @@ module.exports = {
             return cb(null, null);
         });
     }
-
 };
diff --git a/routes/auth.js b/routes/auth.js
index ec99427..e57897f 100644
--- a/routes/auth.js
+++ b/routes/auth.js
@@ -1,7 +1,6 @@
-let router = require('express').Router();
 let passport = require("passport");
 
-module.exports = function (websocket, dispatcher) {
+module.exports = function (router, websocket, dispatcher) {
 
     router.get('/login', function (req, res, next) {
         res.render('auth/login');
diff --git a/routes/index.js b/routes/index.js
index a01db0c..16cfce8 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -6,12 +6,16 @@ let availableDisplays = config.displays;
 const cli = require('../modules/cli.js');
 
 function ensureIsAdmin(req, res, next) {
-    if (!req.isAuthenticated || !req.isAuthenticated()) {
-        console.log(req.originalUrl);
-        req.session.location = req.originalUrl;
-        return res.redirect("/login");
+    let test = req.url.match(/^\/(login|logout|empty)\//);
+    if (test) {
+        next();
+    } else {
+        if (!req.isAuthenticated || !req.isAuthenticated()) {
+            req.session.location = req.originalUrl;
+            return res.redirect("/login");
+        }
     }
-    return next();
+    next();
 }
 
 module.exports = function (pluginManager, websocket, dispatcher) {