Merge branch 'main' of https://github.com/Newtbot/MP

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'));
+router.use('/sensor', [auth, APIlogger], require('./sensor.js'));
 
-//location route
-router.use('/sensor', [apikeyCheck , APIlogger], require('./sensor.js'));
-
-//location route
-router.use('/sensor-data', [apikeyCheck, APIlogger], require('./sensorData.js'));
+//sensor data route
+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/location.js

@@ -25,7 +25,6 @@ router.get("/", async (req, res, next) => {
 //add location 
 router.post("/new", async (req, res, next) => {
 	try {
-		console.log(req.body);
 		const { name, added_by, description } = req.body;
 		await addLocation(name, added_by, description);
 		res.sendStatus(200)

consumerWebsite/routes/render.js

@@ -1,42 +1,3 @@
-/*
-'use strict';
-
-var router = require('express').Router();
-const conf = require('../conf')
-
-const values ={
-  title: conf.environment !== 'production' ? `<i class="fa-brands fa-dev"></i>` : ''
-}
-
-router.get('/', async function(req, res, next) {
-  res.render('runner', {...values});
-});
-
-
-router.get('/topics', function(req, res, next) {
-  res.render('topics', {...values});
-});
-
-router.get('/chat', function(req, res, next) {
-  res.render('chat', {...values});
-});
-
-router.get('/login*', function(req, res, next) {
-  res.render('login', {redirect: req.query.redirect, ...values});
-});
-
-router.get('/runner', function(req, res, next) {
-  res.render('runner', {...values});
-});
-
-router.get('/worker', function(req, res, next) {
-  res.render('worker', {...values});
-});
-
-module.exports = router;
-
-*/
-
 "use strict";
 
 var router = require("express").Router();

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

@@ -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,12 +7,8 @@ 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;
-			return next(error);
-		}
+		let user = await getUserByID(req.user);
+		console.log(user);
 		res.json({
 			user: user,
 		});