apimiddleware done?

Not fully tested

consumerWebsite/database/model/apiKeyModel.js

@@ -3,7 +3,7 @@ const { Sequelize, DataTypes } = require("sequelize");
 const { sequelize } = require("../mySQL");
 const { userModel } = require("./userModel");
 
-sequelize.sync();
+//sequelize.sync();
 const apikeyModel = sequelize.define(
 	"apikey",
 	{

consumerWebsite/database/model/userModel.js

@@ -6,7 +6,7 @@ const {
 	isAddress,
 } = require("../../functions/validateData");
 
-sequelize.sync();
+//sequelize.sync();
 const userModel = sequelize.define(
 	"user",
 	{

consumerWebsite/functions/apiDatabase.js

@@ -1,30 +1,58 @@
-const { sequelize }  = require("../database/mySql.js");
+const { sequelize } = require("../database/mySql.js");
 const { apikeyModel } = require("../database/model/apikeyModel.js");
 const { userModel } = require("../database/model/userModel.js");
 const { Op, Sequelize } = require("sequelize");
+const { hashAPIKey } = require("../functions/bcrypt.js");
+const { generateUUID } = require("../functions/generateUUID.js");
 
 async function getUser() {
-        const user = await userModel.findAll();
-        return user;
+	const user = await userModel.findAll();
+	return user;
 }
 
 async function addUser(user) {
-    //console.log(user);
-    await userModel.create(user);
+	//console.log(user);
+	await userModel.create(user);
 }
 
 async function getAPIKey() {
-    const apikey = await apikeyModel.findAll();
-    return apikey;
+	const apikey = await apikeyModel.findAll();
+	return apikey;
 }
 
-async function addAPIKey(apikey) {
-    await apikeyModel.create(apikey);
+/*
+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
+*/
+
+
+async function addAPIKey(userId, permission) {
+	let token = await generateUUID();
+    let usertoken = userId + "-" + token;
+	let apikey = await hashAPIKey(token);
+
+    console.log(token);
+    console.log(apikey);
+
+    await apikeyModel.create({ 
+        userid: userId,
+        apikey: apikey,
+        permission: permission
+    });
+
+
+    //user token with - 
+    //"apikey": "1-9beba05f-1bf1-4d8a-9ee8-9f61e1428e20"
+	return usertoken;
 }
 
 module.exports = {
-    getUser,
-    addUser,
-    getAPIKey,
-    addAPIKey,
+	getUser,
+	addUser,
+	getAPIKey,
+	addAPIKey,
 };

consumerWebsite/routes/apikey.js

@@ -1,6 +1,5 @@
 const { getAPIKey , addAPIKey } = require("../functions/apiDatabase.js");
-const { hashAPIKey } = require("../functions/bcrypt.js");
-const { generateUUID } = require("../functions/generateUUID.js");
+
 
 const express = require("express");
 const router = express.Router();
@@ -17,21 +16,18 @@ router.get("/", async (req, res, next) => {
 
 /*
 1) ensure user is logged in (frontend session validation blah or wtv)
-2) when user click on generate api key button, it will generate a random api key 
+2) when user click on generate api key button, it will generate a random api key. how to get userid can be done by session or wtv
 3) hash the api key
 4) store the api key in database
 */
 router.post("/new", async (req, res, next) => {
 	try {
-        let uuid = await generateUUID()
-        //attach uuid to req.body
-        req.body.apikey = uuid
-        //hash apikey
-        req.body.apikey = await hashAPIKey(req.body.apikey)
-
-        await addAPIKey(req.body);
-		res.sendStatus(200);
-
+        //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});
 	} catch (error) {
 		console.error(error);
 		next(error);
@@ -44,26 +40,3 @@ router.post("/new", async (req, res, next) => {
 
 module.exports = router;
 
-
-/*
-async function addAPIKey(userId) {
-    let apikey = await generateUUID()
-    apikey = await hashAPIKey(req.body.apikey)
-    let token =  await apikeyModel.create({apikey, userId});
-    return `${token.id}-${apikey}`
-}
-
-
-router.post("/new", async (req, res, next) => {
-    try {
-        let apikey = await addAPIKey(req.body.userid)
-        res.json({apiKey: apikey})
-
-    } catch (error) {
-        console.error(error);
-        next(error);
-    }
-});
-
-
-*/