From cbd3ed9d3eedd97a36db378649edd18adafab270 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Thu, 11 Mar 2021 00:41:24 +1100
Subject: [PATCH] Found a mistyped header

---
 server/auth/account.js         | 2 +-
 server/auth/index.js           | 4 ++--
 server/utilities/token-auth.js | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/auth/account.js b/server/auth/account.js
index 2dff079..daf45fa 100644
--- a/server/auth/account.js
+++ b/server/auth/account.js
@@ -14,7 +14,7 @@ const route = async (req, res) => {
 
 	//respond with the private-facing data
 	res.status(200).json({
-		contact: await account.contact
+		contact: account.contact
 	});
 };
 
diff --git a/server/auth/index.js b/server/auth/index.js
index 4faa274..357dd95 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -2,7 +2,7 @@ const express = require('express');
 const router = express.Router();
 
 //middleware
-const authToken = require('../utilities/token-auth');
+const tokenAuth = require('../utilities/token-auth');
 
 //signup -> validate -> login all without a token
 router.post('/signup', require('./signup'));
@@ -13,7 +13,7 @@ router.post('/login', require('./login'));
 router.post('/token', require('./token'));
 
 //middleware
-router.use(authToken);
+router.use(tokenAuth);
 
 //basic account management (needs a token)
 router.delete('/logout', require('./logout'));
diff --git a/server/utilities/token-auth.js b/server/utilities/token-auth.js
index 0231b31..40f0a34 100644
--- a/server/utilities/token-auth.js
+++ b/server/utilities/token-auth.js
@@ -6,16 +6,16 @@ module.exports = (req, res, next) => {
 	const token = authHeader?.split (' ')[1]; //'Bearer token'
 
 	if (!token) {
-		return res.status(401).end();
+		return res.status(401).send('No token found');
 	}
 
-	jwt.verify(token, process.env.SECRET_ACCESS, (err, user) => {
+	return jwt.verify(token, process.env.SECRET_ACCESS, (err, user) => {
 		if (err) {
-			return res.status(403).end();
+			return res.status(403).send(err);
 		}
 
 		req.user = user;
 
-		next();
+		return next();
 	});
 };
\ No newline at end of file