Update CSS, add relationship between sensorModel and locationModel, and remove console.log statements

consumerWebsite/functions/api.js

@@ -1,19 +1,41 @@
-const { hash, compareHash } = require("./bcrypt.js");
 const { tokenModel } = require("../database/model/tokenModel.js");
+const { userModel } = require("../database/model/userModel");
+const { hash, compareHash } = require("./bcrypt.js");
 const { generateUUID } = require("./generateUUID.js");
+const { isValid } = require("./isValid");
 
-/*
-1) take userid 
-2) generate random api key
-3) hash the api key
-4) append userid with - and api key
-5) you give the user rowid-uuidv4
-6) store in database
-*/
-//can be used for api key or token. Both are the same logic
-async function addToken(userId, permission , expiry) {
+async function getTokenByToken(token) {
+	const splitAuthToken = token.split("-");
+	const rowid = splitAuthToken[0];
+	const suppliedToken = splitAuthToken.slice(1).join("-");
+
+	token = await tokenModel.findByPk(rowid, { include: userModel });
+
+	token.isValid = await compareHash(suppliedToken, token.token); //true
+	console.log("function api getTokenByToken token", token.isValid);
+	token.isValid = token.isValid && isValid(token.expiration); 
+	console.log("function api getTokenByToken token", token.isValid);
+	if (!token.isValid) {
+		//add boolean to token table
+		token.destroy();
+	}
+	/*
+	console.log(
+		"function api getTokenByToken token",
+		await compareHash(suppliedToken, token.token),
+		isValid("token" , token.expiration)
+	);
+	*/
+	console.log(token.isValid);
+	return token;
+}
+
+async function addToken(userId, permission, expiry) {
 	let uuid = await generateUUID();
 	let hashtoken = await hash(uuid);
+	//console.log("user id", userId);
+	//	return { token: token, userid: userRes.id, username: userRes.username };
+	//	let token = await addToken(userRes.id , "canRead" , tokenToLive);
 
 	let token = await tokenModel.create({
 		userid: userId,
@@ -26,23 +48,4 @@ async function addToken(userId, permission , expiry) {
 	return token.id + "-" + uuid;
 }
 
-async function checkToken(Supplied, rowid) {
-	try {
-		const retrivedToken = await tokenModel.findOne({
-			raw: true,
-			attributes: ["token", "permission"],
-			where: {
-				id: rowid,
-			},
-		});
-		//console.log(retrivedKey.apikey);
-		if (compareHash(Supplied, retrivedToken.token)) {
-			//return true;
-			return retrivedToken.permission;
-		}
-	} catch (error) {
-		console.error(error);
-	}
-}
-
-module.exports = { addToken  , checkToken };
+module.exports = { addToken, getTokenByToken };

consumerWebsite/functions/isValid.js

@@ -1,20 +1,14 @@
-const moment = require("moment");
-const currentTime = moment().format("YYYY-MM-DD HH:mm:ss");
-
 //time is taken from the token
-function isValid(time){
-    const timeDiff = moment(currentTime).diff(time, "minutes");
-
-    if (timeDiff > 1) {
-        console.log(timeDiff);
-        return false;
-    }
-
-    return true;
+function isValid(time) {
 
+	if (
+		Math.floor(new Date(time).getTime() / 1000) <
+		Math.floor(new Date().getTime() / 1000)
+	) {
+		return false;
+	}
+	return true;
+    
 }
 
-
-
-
-module.exports = { isValid };
+module.exports = { isValid };

consumerWebsite/functions/sensorData.js

@@ -18,15 +18,19 @@ async function getSensorData() {
 	const sensorData = await sensorDataModel.findAll();
 	return sensorData;
 }
-
+let dataArray = [];
 async function addSensorData(id_sensor, id_location, sensordata) {
 	const sensorData = await sensorDataModel.create({
 		sensorid: id_sensor,
-		locationid: id_location,
-		measurement: sensordata,
+		locationid: id_location ,
+		measurement: sensordata.measurement,
 	});
-	io().emit('sensorData:new', sensorData)
-
+	//console.log("sensorData", sensorData);
+	//console.log("sensorData", sensordata);
+	dataArray.push(sensordata);
+	console.log("dataArray", dataArray);
+	
+	io().emit('sensorData:new', dataArray)
 	return sensorData;
 }
 
@@ -61,6 +65,14 @@ async function getSensorDataById(id) {
 	});
 	return sensorData;
 }
+
+async function getLatestData() {
+	const sensorData = await sensorDataModel.findAll({
+		limit: 1,
+		order: [["createdAt", "DESC"]],
+	});
+	return sensorData;
+}
 var ormQuery = {};
 var whereClause = {};
 var whereDate = {};
@@ -724,5 +736,6 @@ module.exports = {
 	getSensorDataById,
 	getData,
 	getDatabyRange,
+	getLatestData,
 
 };

consumerWebsite/functions/user.js

@@ -2,7 +2,6 @@ const { Op } = require('sequelize')
 const { hash, compareHash } = require("./bcrypt.js");
 const { addToken } = require("./api");
 const { userModel } = require("../database/model/userModel");
-moment = require('moment')
 
 
 
@@ -71,9 +70,11 @@ async function loginUser(user) {
 	if (!match) return false;
 	//console.log('loginUser', userRes.id, userRes.username);
 
-	//generate token and permission and experiation time 
-	const currentTime = moment().format('YYYY-MM-DD HH:mm:ss');
-	let token = await addToken(userRes.id , "canRead" , currentTime);
+	//generate token and permission and experiation time + 30 mins
+	//let tokenToLive = moment().add(30, 'minutes').format();
+	let currentDate = new Date();
+	let tokenToLive = new Date(currentDate.getTime() + 30 * 60000);
+	let token = await addToken(userRes.id , "canRead" , tokenToLive);
 	return { token: token, userid: userRes.id, username: userRes.username };
 }