iotsensor fixed but session valid broken

consumerWebsite/routes/api_routes.js

@@ -2,42 +2,21 @@
 const router = require('express').Router();
 const { auth } = require("../middleware/authChecker")
 const { APIlogger } = require('../middleware/apiLogger.js');
-const { apikeyCheck } = require('../middleware/apiKey.js');
 
 router.use('/auth', require('./auth'));
 
-router.use('/apikey', require('./apikey'));
+router.use('/token', [auth, APIlogger], require('./token.js'));
 
 router.use('/user', [auth, APIlogger], require('./user'));
 
-//TO REFACTOR INTO ONE MIDDLWARE
+//location route
+router.use('/location', [auth, APIlogger], require('./location.js'));
 
 //location route
-router.use('/location', [apikeyCheck , APIlogger], require('./location.js'));
-
-//location route
-router.use('/sensor', [apikeyCheck , APIlogger], require('./sensor.js'));
+router.use('/sensor', [auth, APIlogger], require('./sensor.js'));
 
 //sensor data route
-router.use('/sensor-data', [ APIlogger], require('./sensorData.js'));
+router.use('/sensor-data', [auth, APIlogger], require('./sensorData.js'));
 
 module.exports = router;
 
-
-/*
-
-'use strict';
-const router = require('express').Router();
-const { auth }   = require("../middleware/authChecker")
-
-
-router.use('/auth', require('./auth'));
-
-router.use('/apikey', require('./apikey'));
-
-router.use('/user', auth ,require('./user'));
-
-module.exports = router;
-
-
-*/

consumerWebsite/routes/auth.js

@@ -51,7 +51,6 @@ router.post("/login", async (req, res, next) => {
 
 //contact
 //auth/contact
-
 router.post("/contact", async (req, res, next) => {
 
 });

consumerWebsite/routes/token.js

@@ -1,4 +1,4 @@
-const { addAPIKey } = require("../functions/api");
+const { addToken } = require("../functions/api");
 
 
 const express = require("express");
@@ -10,14 +10,13 @@ const router = express.Router();
 3) hash the api key
 4) store the api key in database
 */
+//token/new
+//curl localhost:3000/api/v0/token/new -H "Content-Type: application/json" -X POST -d 
+//'{"userid": "5", "permission": "canRead" ,}'
 router.post("/new", async (req, res, next) => {
 	try {
-        //curl localhost/api/v0/apikey/new -H "Content-Type: application/json" -X POST -d 
-        //'{"userid": 1, "permission": "canWrite"}'
-        const apikey = await addAPIKey(req.body.userid, req.body.permission);
-        //console.log(typeof req.body.userid);
-        //console.log(typeof req.body.permission);
-        res.json({apikey: apikey});
+        const token = await addToken(req.body.userid, req.body.permission , "2204-01-24 07:34:36" );
+        res.json({token: token});
 	} catch (error) {
 		console.error(error);
 		next(error);

consumerWebsite/routes/user.js

@@ -11,11 +11,14 @@ router.get("/me", async function (req, res, next) {
 		if (!user) {
 			let error = new Error("User not found");
 			error.status = 400;
+			console.log(error);
 			return next(error);
 		}
+		if (user){
 		res.json({
 			user: user,
 		});
+	}
 	} catch (error) {
 		next(error);
 	}