Fix database model associations and update API route

consumerWebsite/functions/api.js

@@ -30,7 +30,7 @@ async function getTokenByToken(token) {
 	return token;
 }
 
-async function addToken(userId, permission, expiry) {
+async function addToken(userId, permission, isKey ,expiry) {
 	let uuid = await generateUUID();
 	let hashtoken = await hash(uuid);
 	//console.log("user id", userId);
@@ -41,6 +41,7 @@ async function addToken(userId, permission, expiry) {
 		userid: userId,
 		token: hashtoken,
 		permission: permission,
+		isKey: isKey,
 		expiration: expiry,
 	});
 
@@ -48,4 +49,16 @@ async function addToken(userId, permission, expiry) {
 	return token.id + "-" + uuid;
 }
 
-module.exports = { addToken, getTokenByToken };
+async function checkToken(id) {
+	let tokenRes = await tokenModel.findOne(
+		{
+			where: {
+				userid: id,
+			}
+		}
+
+	);	
+	return tokenRes;
+}
+
+module.exports = { addToken, getTokenByToken , checkToken};

consumerWebsite/functions/user.js

@@ -84,7 +84,7 @@ async function loginUser(user) {
 	//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);
+	let token = await addToken(userRes.id , "canRead" , "isNotKey" , tokenToLive);
 	return { token: token, userid: userRes.id, username: userRes.username };
 }
 

consumerWebsite/functions/validateData.js

@@ -1,5 +1,9 @@
 var validator = require("validator");
 
+/*
+All the validation functions are used by database model.
+*/
+
 const dateRegex = /^[A-Za-z]{3}, \d{2} [A-Za-z]{3} \d{4} \d{2}:\d{2}:\d{2} GMT$/;
 
 function isValidDateString(value) {