BLAH stupid middleware error

consumerWebsite/functions/user.js

@@ -8,7 +8,7 @@ moment = require('moment')
 
 //getuser
 //api/v0/user/me
-async function getUserID(userid) {
+async function getUserByID(userid) {
 	//console.log(userid);
 	//console.log(userid.id);
 	let userRes = await userModel.findByPk(userid.id, {
@@ -131,7 +131,7 @@ async function updateProfile(user, body) {
 }
 
 module.exports = {
-	getUserID,
+	getUserByID,
 	addUser,
 	loginUser,
 	updateProfile,

consumerWebsite/middleware/authChecker.js

@@ -10,7 +10,6 @@ async function auth(req, res, next) {
         const authToken = req.header("auth-token");
         if (!authToken) {
             const error = new Error("No Token key was supplied. Invalid request");
-            error.status = 401;
             throw error;
         }
 
@@ -22,15 +21,14 @@ async function auth(req, res, next) {
 
         if (!token) {
             const error = new Error("Token key not found. Invalid request");
-            error.status = 401;
             throw error;
         }
 
         const isMatch = await compareHash(suppliedToken, token.token);
 
+        console.log(isMatch);
         if (!isMatch) {
             const error = new Error("Token key not found. Invalid request");
-            error.status = 401;
             throw error;
         }
         //if token is a match
@@ -43,14 +41,10 @@ async function auth(req, res, next) {
         if (route.includes("/user/") && permission === "canRead") {
             next();
         }
-        else if ((req.method === "GET" && permission === "canRead") || (["GET", "POST", "PUT", "DELETE"].includes(req.method) && permission === "canWrite")) {
+        if ((req.method === "GET" && permission === "canRead") || (["GET", "POST", "PUT", "DELETE"].includes(req.method) && permission === "canWrite")) {
             next();
         }
-        else {
-            const error = new Error("Insufficient permission");
-            error.status = 401;
-            throw error;
-        }
+
         if (!isValid(token.expiration)){
             req.token.destroy();
             throw new Error("Token expired");            
@@ -63,3 +57,12 @@ async function auth(req, res, next) {
 }
 
 module.exports = { auth };
+
+/*
+        else {
+            const error = new Error("Insufficient permission");
+            error.status = 401;
+            throw error;
+        }
+
+*/

consumerWebsite/public/js/app.js

@@ -186,13 +186,14 @@ app.auth = (function (app) {
 	function isLoggedIn(callback) {
 		
 		if (getToken()) {
+			console.log("you shldnt appear at all");
 			return app.api.get("user/me", function (error, data) {
 				console.log(error, data);
 				if (!error) app.auth.user = data;
 				return callback(error, data);
 			});
 		} else {
-			callback(null, false);
+			callback(true);
 		}
 	}
 

consumerWebsite/routes/user.js

@@ -1,4 +1,4 @@
-const { getUserID, updateProfile } = require("../functions/user");
+const { getUserByID, updateProfile } = require("../functions/user");
 
 const express = require("express");
 const router = express.Router();
@@ -7,18 +7,11 @@ const router = express.Router();
 //getbyid
 router.get("/me", async function (req, res, next) {
 	try {
-		let user = await getUserID(req.user);
-		if (!user) {
-			let error = new Error("User not found");
-			error.status = 400;
-			console.log(error);
-			return next(error);
-		}
-		if (user){
+		let user = await getUserByID(req.user);
+		console.log(user);
 		res.json({
 			user: user,
 		});
-	}
 	} catch (error) {
 		next(error);
 	}

consumerWebsite/views/top.ejs

@@ -56,7 +56,8 @@
 	$(document).ready(function () {
 		//check if user is logged in
 		app.auth.isLoggedIn(function (error, data) {
-			if (data) {
+			if (!error) {
+				console.log(error);
 				$.scope.getUsername.update(data);
 
 				if (location.pathname == "/profile") {