Renaming database primary key

This commit is contained in:
2021-04-23 21:20:02 +10:00
parent 8ffa64a71d
commit e141583f91
8 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -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
}
});
+1 -1
View File
@@ -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
}
});
+1 -1
View File
@@ -16,7 +16,7 @@ const route = async (req, res) => {
hash: hash
}, {
where: {
id: req.user.id
index: req.user.index
}
});
+2 -2
View File
@@ -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);
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -3,5 +3,5 @@ const sequelize = require('..');
module.exports = sequelize.define('tokens', {
token: 'varchar(320)',
username: 'varchar(320)'
username: 'varchar(320)' //TODO: why username?
});
+2 -2
View File
@@ -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,
+1 -1
View File
@@ -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);