diff --git a/backend/server.js b/backend/server.js index 5586778..0999ceb 100644 --- a/backend/server.js +++ b/backend/server.js @@ -18,16 +18,6 @@ app.use((req, res, next) => { }) -app.use((req, res, next) => { - - const authenticatedUser = verifyAuthToken(req.cookies.auth_token); - - if(authenticatedUser){ - res.locals.user = getUser(authenticatedUser.user_id) - } - next() -}) - const frontendPath = { views: path.join(__dirname, "..", "frontend", "views"), public: path.join(__dirname, "..", "frontend", "public") @@ -96,12 +86,13 @@ function getUser(userid){ } app.get('/users/:id/settings', (req, res) => { + let authenticatedUser = verifyAuthToken(req.cookies.auth_token) let userId = Number(req.params.id); - if(res.locals.user){ - if(res.locals.user.user_id === userId){ + if(authenticatedUser){ + if(authenticatedUser.user_id === userId){ res.render("user_settings", {id: userId}) }else { - res.redirect(`/users/${res.locals.user.user_id}/settings`) + res.redirect(`/users/${authenticatedUser.user_id}/settings`) } }else { res.redirect("/") @@ -109,7 +100,7 @@ app.get('/users/:id/settings', (req, res) => { }) app.get('/register', (req, res) => { - if(res.locals.user){ + if(verifyAuthToken(req.cookies.auth_token)){ res.redirect("/"); return; } @@ -118,9 +109,11 @@ app.get('/register', (req, res) => { }) app.get('/', (req, res) => { - if(res.locals.user){ + const authenticatedUser = verifyAuthToken(req.cookies.auth_token); + if(authenticatedUser){ + const user = getUser(authenticatedUser.user_id) const footer = ""; - res.render("dashboard", {user: res.locals.user, footer: footer}) + res.render("dashboard", {user: user, footer: footer}) }else{ res.render("invalid_login") } @@ -133,10 +126,9 @@ app.get('/logout', (req, res) => { app.get('/login', (req, res) => { if(req.query.invalid === "yes"){ - let invalidMessage = "Username or password incorrect" - res.render("login", {invalid_login: true, invalid_message: invalidMessage}) + res.render("login_incorrect") }else{ - res.render("login", {invalid_login: false, invalid_message: ""}) + res.render("login") } }) diff --git a/frontend/views/invalid_login.ejs b/frontend/views/invalid_login.ejs new file mode 100644 index 0000000..8a990a4 --- /dev/null +++ b/frontend/views/invalid_login.ejs @@ -0,0 +1,14 @@ + + +
+ + +Please login before you can access the control panel.
+Register here
+ + \ No newline at end of file diff --git a/frontend/views/login.ejs b/frontend/views/login.ejs index 2ff7840..acb60cb 100644 --- a/frontend/views/login.ejs +++ b/frontend/views/login.ejs @@ -13,7 +13,6 @@<%= invalid_message %>