From ff410194edb8aaf592606c4b7dbf1ae566e7e175 Mon Sep 17 00:00:00 2001
From: Kevin Midboe <kevin.midboe@gmail.com>
Date: Sat, 20 Aug 2022 17:17:31 +0200
Subject: [PATCH] Updated authentication middleware to handle checks
 consitenctly

---
 src/webserver/middleware/mustBeAdmin.js                 | 4 ++--
 src/webserver/middleware/mustBeAuthenticated.js         | 2 +-
 src/webserver/middleware/mustHaveAccountLinkedToPlex.js | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/webserver/middleware/mustBeAdmin.js b/src/webserver/middleware/mustBeAdmin.js
index 50e9c71..89e82a6 100644
--- a/src/webserver/middleware/mustBeAdmin.js
+++ b/src/webserver/middleware/mustBeAdmin.js
@@ -4,8 +4,8 @@ const establishedDatabase = require("../../database/database");
 const mustBeAdmin = (req, res, next) => {
   const database = establishedDatabase;
 
-  if (req.loggedInUser === undefined) {
-    res.status(401).send({
+  if (!req.loggedInUser) {
+    return res.status(401).send({
       success: false,
       message: "You must be logged in."
     });
diff --git a/src/webserver/middleware/mustBeAuthenticated.js b/src/webserver/middleware/mustBeAuthenticated.js
index 9a470db..4cbd8eb 100644
--- a/src/webserver/middleware/mustBeAuthenticated.js
+++ b/src/webserver/middleware/mustBeAuthenticated.js
@@ -1,6 +1,6 @@
 // eslint-disable-next-line consistent-return
 const mustBeAuthenticated = (req, res, next) => {
-  if (req.loggedInUser === undefined) {
+  if (!req.loggedInUser) {
     return res.status(401).send({
       success: false,
       message: "You must be logged in."
diff --git a/src/webserver/middleware/mustHaveAccountLinkedToPlex.js b/src/webserver/middleware/mustHaveAccountLinkedToPlex.js
index 49e4849..95fd3cc 100644
--- a/src/webserver/middleware/mustHaveAccountLinkedToPlex.js
+++ b/src/webserver/middleware/mustHaveAccountLinkedToPlex.js
@@ -3,9 +3,9 @@ const establishedDatabase = require("../../database/database");
 /* eslint-disable consistent-return */
 const mustHaveAccountLinkedToPlex = (req, res, next) => {
   const database = establishedDatabase;
-  const { loggedInUser } = req;
 
-  if (loggedInUser === null) {
+  // TODO use mustByAuthenticated middleware
+  if (!req.loggedInUser) {
     return res.status(401).send({
       success: false,
       message: "You must have your account linked to a plex account."
@@ -15,7 +15,7 @@ const mustHaveAccountLinkedToPlex = (req, res, next) => {
   database
     .get(
       `SELECT plex_userid FROM settings WHERE user_name IS ?`,
-      loggedInUser.username
+      req.loggedInUser.username
     )
     .then(row => {
       const plexUserId = row.plex_userid;