From e141583f91dbed2cfad306cd6c603291ac5301c7 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Fri, 23 Apr 2021 21:20:02 +1000
Subject: [PATCH] Renaming database primary key

---
 server/auth/account-delete.js      | 4 ++--
 server/auth/account-query.js       | 2 +-
 server/auth/account-update.js      | 2 +-
 server/auth/login.js               | 4 ++--
 server/database/models/accounts.js | 2 +-
 server/database/models/tokens.js   | 2 +-
 server/utilities/token-generate.js | 4 ++--
 server/utilities/token-refresh.js  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/auth/account-delete.js b/server/auth/account-delete.js
index 239936b..6e7b782 100644
--- a/server/auth/account-delete.js
+++ b/server/auth/account-delete.js
@@ -11,7 +11,7 @@ const { accounts } = require('../database/models');
 const route = async (req, res) => {
 	const account = await accounts.findOne({
 		where: {
-			id: req.user.id
+			index: req.user.index
 		}
 	});
 
@@ -30,7 +30,7 @@ const route = async (req, res) => {
 	},
 	{
 		where: {
-			id: req.user.id
+			index: req.user.index
 		}
 	});
 
diff --git a/server/auth/account-query.js b/server/auth/account-query.js
index 91bbed2..9350da7 100644
--- a/server/auth/account-query.js
+++ b/server/auth/account-query.js
@@ -4,7 +4,7 @@ const { accounts } = require('../database/models');
 const route = async (req, res) => {
 	const account = await accounts.findOne({
 		where: {
-			id: req.user.id
+			index: req.user.index
 		}
 	});
 
diff --git a/server/auth/account-update.js b/server/auth/account-update.js
index 64acab1..74a7476 100644
--- a/server/auth/account-update.js
+++ b/server/auth/account-update.js
@@ -16,7 +16,7 @@ const route = async (req, res) => {
 		hash: hash
 	}, {
 		where: {
-			id: req.user.id
+			index: req.user.index
 		}
 	});
 
diff --git a/server/auth/login.js b/server/auth/login.js
index 8140da0..061a8b2 100644
--- a/server/auth/login.js
+++ b/server/auth/login.js
@@ -38,7 +38,7 @@ const route = async (req, res) => {
 	//cancel deletion if any
 	await accounts.update({ deletion: null }, {
 		where: {
-			id: account.id
+			index: account.index
 		}
 	});
 
@@ -48,7 +48,7 @@ const route = async (req, res) => {
 	}
 
 	//generate the JWT
-	const tokens = generate(account.id, account.username, account.type, account.admin, account.mod);
+	const tokens = generate(account.index, account.username, account.type, account.admin, account.mod);
 
 	//finally
 	res.status(200).json(tokens);
diff --git a/server/database/models/accounts.js b/server/database/models/accounts.js
index 2bd7625..f034740 100644
--- a/server/database/models/accounts.js
+++ b/server/database/models/accounts.js
@@ -2,7 +2,7 @@ const Sequelize = require('sequelize');
 const sequelize = require('..');
 
 module.exports = sequelize.define('accounts', {
-	id: {
+	index: {
 		type: Sequelize.INTEGER(11),
 		allowNull: false,
 		autoIncrement: true,
diff --git a/server/database/models/tokens.js b/server/database/models/tokens.js
index c7dfb8c..519d9ae 100644
--- a/server/database/models/tokens.js
+++ b/server/database/models/tokens.js
@@ -3,5 +3,5 @@ const sequelize = require('..');
 
 module.exports = sequelize.define('tokens', {
 	token: 'varchar(320)',
-	username: 'varchar(320)'
+	username: 'varchar(320)' //TODO: why username?
 });
diff --git a/server/utilities/token-generate.js b/server/utilities/token-generate.js
index 3f70394..47bfb57 100644
--- a/server/utilities/token-generate.js
+++ b/server/utilities/token-generate.js
@@ -2,9 +2,9 @@ const jwt = require('jsonwebtoken');
 const { tokens } = require('../database/models');
 
 //generates a JWT token based on the given arguments
-module.exports = (id, username, type, admin, mod) => {
+module.exports = (index, username, type, admin, mod) => {
 	const content = {
-		id,
+		index,
 		username,
 		type,
 		admin,
diff --git a/server/utilities/token-refresh.js b/server/utilities/token-refresh.js
index f8d7b15..9807ca5 100644
--- a/server/utilities/token-refresh.js
+++ b/server/utilities/token-refresh.js
@@ -24,7 +24,7 @@ module.exports = (token, callback) => {
 			return callback(403);
 		}
 
-		const result = generate(user.id, user.username, user.type, user.admin, user.mod);
+		const result = generate(user.index, user.username, user.type, user.admin, user.mod);
 
 		destroy(token);