This commit is contained in:
Benjamin Toby
2024-12-09 12:45:39 +01:00
parent 7bd4b2fe65
commit 586e3cfa85
43 changed files with 216 additions and 506 deletions
@@ -15,6 +15,7 @@ module.exports = async function apiCreateUser({
useLocal,
}) {
const dbFullName = database;
const API_USER_ID = userId || process.env.DSQL_API_USER_ID;
const finalEncryptionKey =
encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD;
@@ -52,7 +53,7 @@ module.exports = async function apiCreateUser({
if (!fields?.[0]) {
const newTable = await addUsersTableToDb({
userId: Number(userId),
userId: Number(API_USER_ID),
database: dbFullName,
useLocal,
payload: payload,
@@ -82,7 +83,7 @@ module.exports = async function apiCreateUser({
const key = Object.keys(payload)[i];
if (!fieldsTitles.includes(key)) {
await updateUsersTableSchema({
userId: Number(userId),
userId: Number(API_USER_ID),
database: dbFullName,
newPayload: {
[key]: payload[key],
@@ -130,6 +131,7 @@ module.exports = async function apiCreateUser({
image: "/images/user-preset.png",
image_thumbnail: "/images/user-preset-thumbnail.png",
},
useLocal,
});
if (addUser?.insertId) {
@@ -10,10 +10,11 @@ module.exports = async function apiGetUser({
useLocal,
}) {
const query = `SELECT ${fields.join(",")} FROM users WHERE id=?`;
const API_USER_ID = userId || process.env.DSQL_API_USER_ID;
let foundUser = await varDatabaseDbHandler({
queryString: query,
queryValuesArray: [userId],
queryValuesArray: [API_USER_ID],
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
useLocal,
});
@@ -1,7 +1,5 @@
// @ts-check
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
const { writeAuthFile } = require("../../backend/auth/write-auth-files");
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
const hashPassword = require("../../dsql/hashPassword");
+1 -1
View File
@@ -2,7 +2,7 @@ declare function _exports({ existingUser, database, additionalFields, useLocal,
existingUser: {
[x: string]: any;
};
database: string;
database?: string;
additionalFields?: string[];
useLocal?: boolean;
}): Promise<import("../../../types").APILoginFunctionReturn>;
@@ -8,7 +8,7 @@ const nodemailer = require("nodemailer");
* # Re-authenticate API user
* @param {object} param
* @param {Object<string, any>} param.existingUser
* @param {string} param.database
* @param {string} [param.database]
* @param {string[]} [param.additionalFields]
* @param {boolean} [param.useLocal]
*
@@ -22,15 +22,12 @@ module.exports = async function apiReauthUser({
}) {
let foundUser =
existingUser?.id && existingUser.id.toString().match(/./)
? useLocal
? await LOCAL_DB_HANDLER(`SELECT * FROM users WHERE id=?`, [
existingUser.id.toString(),
])
: await varDatabaseDbHandler({
queryString: `SELECT * FROM users WHERE id=?`,
queryValuesArray: [existingUser.id.toString()],
database,
})
? await varDatabaseDbHandler({
queryString: `SELECT * FROM users WHERE id=?`,
queryValuesArray: [existingUser.id.toString()],
database,
useLocal,
})
: null;
////////////////////////////////////////
@@ -1,6 +1,5 @@
// @ts-check
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
const updateDbEntry = require("../../backend/db/updateDbEntry");
const encrypt = require("../../dsql/encrypt");
const hashPassword = require("../../dsql/hashPassword");