From 7ca90675332e79d029df73e977f42e6f08349e0d Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Thu, 15 Dec 2022 20:47:35 -0600
Subject: [PATCH] Updated server to more fit frontend requirements

---
 server/middleware/basicAuth.js       |  2 ++
 server/middleware/tokenAuth.js       |  2 +-
 server/routes/authRouter.js          |  3 ++-
 server/tests/auth/CreateUser.test.js | 12 ++++--------
 server/tests/auth/SetAudio.test.js   |  8 ++++----
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/server/middleware/basicAuth.js b/server/middleware/basicAuth.js
index d40dd82..cf97f0d 100644
--- a/server/middleware/basicAuth.js
+++ b/server/middleware/basicAuth.js
@@ -13,6 +13,8 @@ async function basicAuth(req, res, next) {
     const [email, password] = Buffer.from(b64Encoded, 'base64').toString().split(':');
     if (!email || !password) return res.status(400).send(config.errorIncomplete);
 
+    console.log(Buffer.from(b64Encoded, 'base64').toString());
+
     // Make sure that a user exists with that email
     const result = await User.findOne({
         where: { email: email },
diff --git a/server/middleware/tokenAuth.js b/server/middleware/tokenAuth.js
index 9b79d51..2af1a82 100644
--- a/server/middleware/tokenAuth.js
+++ b/server/middleware/tokenAuth.js
@@ -20,7 +20,7 @@ async function tokenAuth(req, res, next) {
         return res.status(401).send(config.errorUnauthed);
     }
 
-    const user = await token.getUser();
+    const user = await result.getUser();
 
     if (!user) return res.status(500).send(config.errorGeneric);
 
diff --git a/server/routes/authRouter.js b/server/routes/authRouter.js
index 7851d7d..d196338 100644
--- a/server/routes/authRouter.js
+++ b/server/routes/authRouter.js
@@ -29,8 +29,9 @@ router.post('/audio', parseFormData, tokenAuth, SetAudio);
 router.get('/reset', RequestReset);
 router.patch('/reset/:id', ResetPassword);
 
-router.get('/:userID', tokenAuth, checkKnownUser, GetUserDetails);
 router.get('/orgs', tokenAuth, GetOwnedOrgs);
 router.get('/orgs/member', tokenAuth, GetMemberOrgs);
 
+router.get('/:userID', tokenAuth, checkKnownUser, GetUserDetails);
+
 module.exports = router;
diff --git a/server/tests/auth/CreateUser.test.js b/server/tests/auth/CreateUser.test.js
index 6cd896a..e8cbb39 100644
--- a/server/tests/auth/CreateUser.test.js
+++ b/server/tests/auth/CreateUser.test.js
@@ -34,12 +34,12 @@ describe('CreateUser', function () {
             });
     });
 
-    test('[500] Request missing fields', async () => {
+    test('[400] Request missing fields', async () => {
         await supertest(app)
             .post('/api/auth/register')
             .send()
             .expect(400, 'The request is missing required fields.')
-            .set('Accept', 'text/html')
+            .set('Accept', 'application/json')
             .expect('Content-Type', /text/);
     });
 
@@ -90,12 +90,8 @@ describe('CreateUser', function () {
                     },
                 });
 
-                expect(response.body.user).toEqual(
-                    expect.objectContaining(user)
-                );
-                expect(org.member).toEqual(
-                    expect.arrayContaining([expect.objectContaining(user)])
-                );
+                expect(response.body.user).toEqual(expect.objectContaining(user));
+                expect(org.member).toEqual(expect.arrayContaining([expect.objectContaining(user)]));
             });
     });
 
diff --git a/server/tests/auth/SetAudio.test.js b/server/tests/auth/SetAudio.test.js
index 245d490..6319fb0 100644
--- a/server/tests/auth/SetAudio.test.js
+++ b/server/tests/auth/SetAudio.test.js
@@ -15,18 +15,18 @@ describe('SetAudio', function () {
 
     test('[403] Missing token', async () => {
         await supertest(app)
-            .post('/api/auth/logout')
+            .post('/api/auth/audio')
             .send()
             .expect(403, 'Unauthorized user')
             .set('Accept', 'text/html')
             .expect('Content-Type', /text/);
     });
 
-    test('[511] Token was not found', async () => {
+    test('[400] Token was not found', async () => {
         await supertest(app)
-            .post('/api/auth/logout')
+            .post('/api/auth/audio')
             .send({ token: 'randomString' })
-            .expect(511, 'Session expired')
+            .expect(400, 'Session expired')
             .set('Accept', 'text/html')
             .expect('Content-Type', /text/);
     });