From bc324d2488124177c6d3ff3b821f69b760cfe022 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sat, 2 Apr 2022 23:39:33 -0500
Subject: [PATCH] Reworked middleware to work with new models

---
 server/middleware/checkKnownOrg.js  | 10 +++++-----
 server/middleware/checkKnownUser.js | 20 ++++++++++----------
 server/middleware/tokenAuth.js      |  7 +++----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/server/middleware/checkKnownOrg.js b/server/middleware/checkKnownOrg.js
index 532a12b..8d8e4f7 100644
--- a/server/middleware/checkKnownOrg.js
+++ b/server/middleware/checkKnownOrg.js
@@ -7,13 +7,13 @@ async function GetOrg(req, res, next) {
     const result = await Organization.findByPk(orgID, {
         include: [
             {
-                association: 'orgOwner',
-                where: { userID: user.userID },
+                association: 'owner',
+                where: { id: user.id },
                 required: false,
             },
             {
-                association: 'orgMember',
-                where: { userID: user.userID },
+                association: 'member',
+                where: { id: user.id },
                 required: false,
             },
         ],
@@ -23,7 +23,7 @@ async function GetOrg(req, res, next) {
         return res.status(500).send('There is no organization with this id.');
     }
 
-    if (!result.orgOwner && result.orgMember.length == 0) {
+    if (!result.owner && result.member.length == 0) {
         return res
             .status(403)
             .send('You do not know any organizations with this id.');
diff --git a/server/middleware/checkKnownUser.js b/server/middleware/checkKnownUser.js
index dce5c70..61b8ec6 100644
--- a/server/middleware/checkKnownUser.js
+++ b/server/middleware/checkKnownUser.js
@@ -4,7 +4,7 @@ async function checkKnownUser(req, res, next) {
     const user = req.user;
     const userID = req.params.userID || req.query.userID || req.body.userID;
 
-    if (user.userID == userID) {
+    if (user.id == userID) {
         return next();
     }
 
@@ -13,21 +13,21 @@ async function checkKnownUser(req, res, next) {
             {
                 association: 'ownedOrg',
                 include: {
-                    association: 'orgMember',
-                    where: { userID: user.userID },
+                    association: 'member',
+                    where: { id: user.id },
                 },
             },
             {
-                association: 'memberOrgs',
+                association: 'memberOrg',
                 include: [
                     {
-                        association: 'orgMember',
-                        where: { userID: user.userID },
+                        association: 'owner',
+                        where: { id: user.id },
                         required: false,
                     },
                     {
-                        association: 'orgOwner',
-                        where: { userID: user.userID },
+                        association: 'member',
+                        where: { id: user.id },
                         required: false,
                     },
                 ],
@@ -39,8 +39,8 @@ async function checkKnownUser(req, res, next) {
         return res.status(500).send('No user with that ID exists.');
     }
 
-    const filteredResult = result.memberOrgs.filter(
-        (org) => org.orgMembers.length != 0 || org_owner
+    const filteredResult = result.memberOrg.filter(
+        (org) => org.member.length != 0 || org.owner
     );
 
     if (filteredResult.length == 0 && result.ownedOrg) {
diff --git a/server/middleware/tokenAuth.js b/server/middleware/tokenAuth.js
index 034fc7b..e662023 100644
--- a/server/middleware/tokenAuth.js
+++ b/server/middleware/tokenAuth.js
@@ -7,17 +7,16 @@ async function tokenAuth(req, res, next) {
         return res.status(403).send('Unauthorized user');
     }
 
-    const result = await Token.findOne({
-        where: { tokenID: token },
-    });
+    const result = await Token.findByPk(token);
 
     const date = new Date();
+
     if (
         !result ||
         (token.expires == true &&
             date.setDate(date.getDate + 1) > result.createdAt)
     ) {
-        await Token.destroy({ where: { tokenID: token } });
+        await Token.destroy({ where: { id: token } });
         return res.status(511).send('Session expired');
     }