fixes

VidithM · VidithM · commit bb226f5c19b4 · 2021-09-02T17:40:08.000-05:00
diff --git a/background.js b/background.js
@@ -37,6 +37,4 @@ const initScheduler = async () => {
 
 initScheduler();
 
-serverAdapter.getRouter();
-
 module.exports.bullBoardServerAdapter = serverAdapter;
diff --git a/main.js b/main.js
@@ -3,6 +3,7 @@ if (process.env.NODE_ENV !== "production") {
 }
 const express = require("express");
 const rateLimit = require("express-rate-limit");
+const path = require('path');
 const expressLayouts = require("express-ejs-layouts");
 const bodyParser = require("body-parser");
 
@@ -36,14 +37,15 @@ app.set("view engine", "ejs");
 app.set("views", __dirname + "/views");
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(express.static("public"));
+app.use(expressLayouts);
 
 // background
 if (process.env.BACKGROUND == true) {
     const { bullBoardServerAdapter } = require("./background");
     const {ensureLoggedIn} = require("connect-ensure-login");
     const passport = require('passport');
     const session = require('express-session');
-    app.use(session({secret : 'keyboard cat'}));
+    app.use(session({secret : process.env.SESSION_SECRET}));
     app.use(passport.initialize({}));
     app.use(passport.session({}));
     const authRouter = require("./routes/auth");
@@ -59,15 +61,8 @@ if (process.env.BACKGROUND == true) {
 if (process.env.WEB == true) {
     app.set("layout", "layouts/layout");
     app.set("layout extractScripts", true);
-    app.use(expressLayouts);
-    const unless = require('express-unless');
     const webRouter = require("./web");
-    webRouter.unless = unless;
-    app.use("/", 
-        webRouter.unless({
-            path : ['/login', '/bull-board']
-        }),
-    );
+    app.use("/", webRouter);
     console.info("WEB is up.");
 }
 
@@ -87,6 +82,12 @@ if (!process.env.API_DISABLED) {
     console.info("API is up.");
 }
 
+app.use((req, res) => {
+    res.status(404).render('errors/404', {
+        title : '404 Not Found'
+    });
+});
+
 const port = process.env.PORT || 8080;
 
 app.listen(port, (err) => {
diff --git a/routes/auth.js b/routes/auth.js
@@ -7,7 +7,7 @@ const LocalStrategy = require('passport-local').Strategy;
 passport.use(
     new LocalStrategy(function (username, password, cb) {
       if (username === process.env.BULLBOARD_USERNAME && password === process.env.BULLBOARD_PASS) {
-        return cb(null, { user: 'bull-board' });
+        return cb(null, {user : process.env.BULLBOARD_USERNAME});
       }
       return cb(null, false);
     })
@@ -22,7 +22,6 @@ passport.deserializeUser((user, cb) => {
 });
 
 router.get('/', (req, res) => {
-    //console.log('Received login');
     res.render('login', {
         title : 'Login'
     });
diff --git a/views/errors/404.ejs b/views/errors/404.ejs
@@ -0,0 +1,13 @@
+<body>
+    <div style="text-align: center">
+        <h1 style="font-weight: bold; font-size: x-large; color: slategray;">
+            404 
+        </h1>
+        <br>
+        <h1 style="font-size: medium;">    
+            This page does not exist.
+        </h1>
+        <br>
+        <a href='/'>Back to home</a>
+    </div>
+</body>
diff --git a/views/login.ejs b/views/login.ejs
@@ -1,8 +1,10 @@
 <body>
-    <h1>Login to bull-board</h1>
-    <form action='/login', method='POST'>
-        <input type="text" name="username" placeholder="Enter username here">
-        <input type="password" name="password" placeholder="Enter password here">
-        <input type="submit" name="submit" value="Submit">
-    </form>
+    <div style="text-align: center">
+        <h1>Login to bull-board</h1>
+        <form action='/login', method='POST'>
+            <input type="text" name="username" placeholder="Enter username here">
+            <input type="password" name="password" placeholder="Enter password here">
+            <input type="submit" name="submit" value="Submit">
+        </form>
+    </div>
 </body>
