Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby
2024-12-06 12:55:03 +01:00
parent 34868ee0cf
commit 8a8257d17e
48 changed files with 360 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-shared/functions/api/query/get.d.ts
Vendored
+2 -1
View File
@@ -1,8 +1,9 @@
declare function _exports({ query, dbFullName, queryValues, tableName, dbSchema, }: {
declare function _exports({ query, dbFullName, queryValues, tableName, dbSchema, useLocal, }: {
query: string;
queryValues?: (string | number)[];
dbFullName: string;
tableName?: string;
dbSchema?: import("../../../types").DSQL_DatabaseSchemaType;
useLocal?: boolean;
}): Promise<import("../../../types").GetReturn>;
export = _exports;
package-shared/functions/api/query/get.js
+3
View File
@@ -13,6 +13,7 @@ const runQuery = require("../../backend/db/runQuery");
* @param {string} params.dbFullName
* @param {string} [params.tableName]
* @param {import("../../../types").DSQL_DatabaseSchemaType} [params.dbSchema]
* @param {boolean} [params.useLocal]
*
* @returns {Promise<import("../../../types").GetReturn>}
*/
@@ -22,6 +23,7 @@ module.exports = async function apiGet({
queryValues,
tableName,
dbSchema,
useLocal,
}) {
if (
typeof query == "string" &&
@@ -46,6 +48,7 @@ module.exports = async function apiGet({
readOnly: true,
dbSchema,
tableName,
local: useLocal,
});
/** @type {import("../../../types").DSQL_TableSchemaType | undefined} */
package-shared/functions/api/query/post.d.ts
Vendored
+2 -1
View File
@@ -1,8 +1,9 @@
declare function _exports({ query, dbFullName, queryValues, tableName, dbSchema, }: {
declare function _exports({ query, dbFullName, queryValues, tableName, dbSchema, useLocal, }: {
query: any;
queryValues?: (string | number)[];
dbFullName: string;
tableName?: string;
dbSchema?: import("../../../types").DSQL_DatabaseSchemaType;
useLocal?: boolean;
}): Promise<import("../../../types").PostReturn>;
export = _exports;
package-shared/functions/api/query/post.js
+3
View File
@@ -13,6 +13,7 @@ const runQuery = require("../../backend/db/runQuery");
* @param {string} params.dbFullName
* @param {string} [params.tableName]
* @param {import("../../../types").DSQL_DatabaseSchemaType} [params.dbSchema]
* @param {boolean} [params.useLocal]
*
* @returns {Promise<import("../../../types").PostReturn>}
*/
@@ -22,6 +23,7 @@ module.exports = async function apiPost({
queryValues,
tableName,
dbSchema,
useLocal,
}) {
if (typeof query === "string" && query?.match(/^create |^alter |^drop /i)) {
return { success: false, msg: "Wrong Input" };
@@ -49,6 +51,7 @@ module.exports = async function apiPost({
dbSchema: dbSchema,
queryValuesArray: queryValues,
tableName,
local: useLocal,
});
results = result;
package-shared/functions/api/social-login/handleSocialDb.js
+57 -22
View File
@@ -20,6 +20,7 @@ const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
const encrypt = require("../../dsql/encrypt");
const addDbEntry = require("../../backend/db/addDbEntry");
const getAuthCookieNames = require("../../backend/cookies/get-auth-cookie-names");
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
@@ -51,6 +52,7 @@ module.exports = async function handleSocialDb({
invitation,
supEmail,
additionalFields,
useLocal,
}) {
////////////////////////////////////////////////
////////////////////////////////////////////////
@@ -61,11 +63,22 @@ module.exports = async function handleSocialDb({
////////////////////////////////////////////////
////////////////////////////////////////////////
let existingSocialIdUser = await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: `SELECT * FROM users WHERE social_id = ? AND social_login='1' AND social_platform = ? `,
queryValuesArray: [social_id.toString(), social_platform],
});
const existingSocialIdUserQuery = `SELECT * FROM users WHERE social_id = ? AND social_login='1' AND social_platform = ? `;
const existingSocialIdUserValues = [
social_id.toString(),
social_platform,
];
let existingSocialIdUser = useLocal
? await LOCAL_DB_HANDLER(
existingSocialIdUserQuery,
existingSocialIdUserValues
)
: await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: existingSocialIdUserQuery,
queryValuesArray: existingSocialIdUserValues,
});
if (existingSocialIdUser && existingSocialIdUser[0]) {
return await loginSocialUser({
@@ -75,6 +88,7 @@ module.exports = async function handleSocialDb({
invitation,
database,
additionalFields,
useLocal,
});
}
@@ -99,10 +113,14 @@ module.exports = async function handleSocialDb({
////////////////////////////////////////////////
////////////////////////////////////////////////
let existingEmailOnly = await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: `SELECT * FROM users WHERE email='${finalEmail}'`,
});
const existingEmailOnlyQuery = `SELECT * FROM users WHERE email='${finalEmail}'`;
let existingEmailOnly = useLocal
? await LOCAL_DB_HANDLER(existingEmailOnlyQuery)
: await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: existingEmailOnlyQuery,
});
if (existingEmailOnly && existingEmailOnly[0]) {
return {
@@ -117,10 +135,14 @@ module.exports = async function handleSocialDb({
////////////////////////////////////////////////
////////////////////////////////////////////////
const foundUser = await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: `SELECT * FROM users WHERE email='${finalEmail}' AND social_login='1' AND social_platform='${social_platform}' AND social_id='${social_id}'`,
});
const foundUserQuery = `SELECT * FROM users WHERE email='${finalEmail}' AND social_login='1' AND social_platform='${social_platform}' AND social_id='${social_id}'`;
const foundUser = useLocal
? await LOCAL_DB_HANDLER(foundUserQuery)
: await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: foundUserQuery,
});
if (foundUser && foundUser[0]) {
return await loginSocialUser({
@@ -130,6 +152,7 @@ module.exports = async function handleSocialDb({
invitation,
database,
additionalFields,
useLocal,
});
}
@@ -164,6 +187,7 @@ module.exports = async function handleSocialDb({
...data,
email: finalEmail,
},
useLocal,
});
if (newUser?.insertId) {
@@ -171,13 +195,17 @@ module.exports = async function handleSocialDb({
/**
* Add a Mariadb User for this User
*/
await addMariadbUser({ userId: newUser.insertId });
await addMariadbUser({ userId: newUser.insertId, useLocal });
}
const newUserQueried = await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: `SELECT * FROM users WHERE id='${newUser.insertId}'`,
});
const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.insertId}'`;
const newUserQueried = useLocal
? await LOCAL_DB_HANDLER(newUserQueriedQuery)
: await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: newUserQueriedQuery,
});
if (!newUserQueried || !newUserQueried[0])
return {
@@ -263,6 +291,7 @@ module.exports = async function handleSocialDb({
invitation,
database,
additionalFields,
useLocal,
});
////////////////////////////////////////////////
@@ -326,6 +355,7 @@ module.exports = async function handleSocialDb({
* @param {any} [params.invitation] - A query object if user was invited
* @param {string} [params.database] - Target Database
* @param {object} [params.additionalFields] - Additional fields to be added to the user payload
* @param {boolean} [params.useLocal]
*
* @returns {Promise<any>}
*/
@@ -336,11 +366,16 @@ async function loginSocialUser({
invitation,
database,
additionalFields,
useLocal,
}) {
const foundUser = await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: `SELECT * FROM users WHERE email='${user.email}' AND social_id='${user.social_id}' AND social_platform='${social_platform}'`,
});
const foundUserQuery = `SELECT * FROM users WHERE email='${user.email}' AND social_id='${user.social_id}' AND social_platform='${social_platform}'`;
const foundUser = useLocal
? await LOCAL_DB_HANDLER(foundUserQuery)
: await varDatabaseDbHandler({
database: database ? database : "datasquirel",
queryString: foundUserQuery,
});
if (!foundUser?.[0])
return {
package-shared/functions/api/users/api-create-user.js
+29 -5
View File
@@ -1,5 +1,6 @@
// @ts-check
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
const addUsersTableToDb = require("../../backend/addUsersTableToDb");
const addDbEntry = require("../../backend/db/addDbEntry");
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
@@ -11,25 +12,48 @@ module.exports = async function apiCreateUser({
payload,
database,
userId,
useLocal,
}) {
const dbFullName = database;
const finalEncryptionKey =
encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD;
if (!finalEncryptionKey) {
return {
success: false,
msg: "No encryption key provided",
payload: null,
};
}
if (!finalEncryptionKey?.match(/.{8,}/)) {
return {
success: false,
msg: "Encryption key must be at least 8 characters long",
payload: null,
};
}
const hashedPassword = hashPassword({
encryptionKey: encryptionKey,
encryptionKey: finalEncryptionKey,
password: String(payload.password),
});
payload.password = hashedPassword;
let fields = await varDatabaseDbHandler({
queryString: `SHOW COLUMNS FROM users`,
database: dbFullName,
});
let fields = useLocal
? await LOCAL_DB_HANDLER(`SHOW COLUMNS FROM users`)
: await varDatabaseDbHandler({
queryString: `SHOW COLUMNS FROM users`,
database: dbFullName,
});
if (!fields) {
const newTable = await addUsersTableToDb({
userId: Number(userId),
database: database,
useLocal,
});
fields = await varDatabaseDbHandler({
package-shared/functions/api/users/api-get-user.js
+14 -6
View File
@@ -1,16 +1,24 @@
// @ts-check
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
/** @type {import("../../../types").APIGetUserFunction} */
module.exports = async function apiGetUser({ fields, dbFullName, userId }) {
module.exports = async function apiGetUser({
fields,
dbFullName,
userId,
useLocal,
}) {
const query = `SELECT ${fields.join(",")} FROM users WHERE id=?`;
let foundUser = await varDatabaseDbHandler({
queryString: query,
queryValuesArray: [userId],
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
});
let foundUser = useLocal
? await LOCAL_DB_HANDLER(query, [userId])
: await varDatabaseDbHandler({
queryString: query,
queryValuesArray: [userId],
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
});
if (!foundUser || !foundUser[0]) {
return {
package-shared/functions/api/users/api-login.js
+22 -13
View File
@@ -1,5 +1,6 @@
// @ts-check
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
const hashPassword = require("../../dsql/hashPassword");
@@ -17,6 +18,7 @@ module.exports = async function apiLoginUser({
token,
skipPassword,
social,
useLocal,
}) {
const dbFullName = database;
@@ -48,14 +50,16 @@ module.exports = async function apiLoginUser({
})
: null;
let isSocialValidated = false;
let loginFailureReason = null;
let foundUser = await varDatabaseDbHandler({
queryString: `SELECT * FROM users WHERE email = ? OR username = ?`,
queryValuesArray: [email, username],
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
});
let foundUser = useLocal
? await LOCAL_DB_HANDLER(
`SELECT * FROM users WHERE email = ? OR username = ?`,
[email, username]
)
: await varDatabaseDbHandler({
queryString: `SELECT * FROM users WHERE email = ? OR username = ?`,
queryValuesArray: [email, username],
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
});
if ((!foundUser || !foundUser[0]) && !social)
return {
@@ -103,11 +107,16 @@ module.exports = async function apiLoginUser({
}
if (isPasswordCorrect && email_login) {
const resetTempCode = await varDatabaseDbHandler({
queryString: `UPDATE users SET ${email_login_field} = ? WHERE email = ? OR username = ?`,
queryValuesArray: ["", email, username],
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
});
const resetTempCode = useLocal
? await LOCAL_DB_HANDLER(
`UPDATE users SET ${email_login_field} = ? WHERE email = ? OR username = ?`,
["", email, username]
)
: await varDatabaseDbHandler({
queryString: `UPDATE users SET ${email_login_field} = ? WHERE email = ? OR username = ?`,
queryValuesArray: ["", email, username],
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
});
}
let csrfKey =
package-shared/functions/api/users/api-reauth-user.d.ts
Vendored
+2 -1
View File
@@ -1,9 +1,10 @@
declare function _exports({ existingUser, database, userId, additionalFields, }: {
declare function _exports({ existingUser, database, userId, additionalFields, useLocal, }: {
existingUser: {
[x: string]: any;
};
database: string;
userId?: string | number;
additionalFields?: string[];
useLocal?: boolean;
}): Promise<import("../../../types").ApiReauthUserReturn>;
export = _exports;
package-shared/functions/api/users/api-reauth-user.js
+12 -5
View File
@@ -1,5 +1,6 @@
// @ts-check
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
const nodemailer = require("nodemailer");
@@ -10,6 +11,7 @@ const nodemailer = require("nodemailer");
* @param {string} param.database
* @param {string | number} [param.userId]
* @param {string[]} [param.additionalFields]
* @param {boolean} [param.useLocal]
*
* @returns {Promise<import("../../../types").ApiReauthUserReturn>}
*/
@@ -18,14 +20,19 @@ module.exports = async function apiReauthUser({
database,
userId,
additionalFields,
useLocal,
}) {
let foundUser =
existingUser?.id && existingUser.id.toString().match(/./)
? await varDatabaseDbHandler({
queryString: `SELECT * FROM users WHERE id=?`,
queryValuesArray: [existingUser.id.toString()],
database,
})
? 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,
})
: null;
////////////////////////////////////////
package-shared/functions/api/users/api-send-email-code.d.ts
Vendored
+2 -1
View File
@@ -1,4 +1,4 @@
declare function _exports({ email, database, email_login_field, mail_domain, mail_port, sender, mail_username, mail_password, html, }: {
declare function _exports({ email, database, email_login_field, mail_domain, mail_port, sender, mail_username, mail_password, html, useLocal, }: {
email: string;
database: string;
email_login_field?: string;
@@ -8,6 +8,7 @@ declare function _exports({ email, database, email_login_field, mail_domain, mai
mail_username?: string;
mail_password?: string;
html: string;
useLocal?: boolean;
}): Promise<{
success: boolean;
msg?: string;
package-shared/functions/api/users/api-send-email-code.js
+22 -17
View File
@@ -1,5 +1,6 @@
// @ts-check
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
const nodemailer = require("nodemailer");
@@ -16,6 +17,7 @@ const nodemailer = require("nodemailer");
* @param {string} [param.mail_username]
* @param {string} [param.mail_password]
* @param {string} param.html
* @param {boolean} [param.useLocal]
*
* @returns {Promise<{success: boolean, msg?: string}>}
*/
@@ -29,6 +31,7 @@ module.exports = async function apiSendEmailCode({
mail_username,
mail_password,
html,
useLocal,
}) {
if (email?.match(/ /)) {
return {
@@ -41,11 +44,16 @@ module.exports = async function apiSendEmailCode({
////////////////////////////////////////
////////////////////////////////////////
let foundUser = await varDatabaseDbHandler({
queryString: `SELECT * FROM users WHERE email = ?`,
queryValuesArray: [email],
database,
});
const foundUserQuery = `SELECT * FROM users WHERE email = ?`;
const foundUserValues = [email];
let foundUser = useLocal
? await LOCAL_DB_HANDLER(foundUserQuery, foundUserValues)
: await varDatabaseDbHandler({
queryString: foundUserQuery,
queryValuesArray: foundUserValues,
database,
});
////////////////////////////////////////
////////////////////////////////////////
@@ -94,21 +102,18 @@ module.exports = async function apiSendEmailCode({
if (!info?.accepted) throw new Error("Mail not Sent!");
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
const setTempCodeQuery = `UPDATE users SET ${email_login_field} = ? WHERE email = ?`;
const setTempCodeValues = [tempCode + `-${Date.now()}`, email];
let setTempCode = await varDatabaseDbHandler({
queryString: `UPDATE users SET ${email_login_field} = ? WHERE email = ?`,
queryValuesArray: [tempCode + `-${Date.now()}`, email],
database: database,
});
let setTempCode = useLocal
? await LOCAL_DB_HANDLER(setTempCodeQuery, setTempCodeValues)
: await varDatabaseDbHandler({
queryString: setTempCodeQuery,
queryValuesArray: setTempCodeValues,
database: database,
});
}
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
return {
success: true,
msg: "Success",
package-shared/functions/api/users/api-update-user.d.ts
Vendored
+2 -1
View File
@@ -1,10 +1,11 @@
declare function _exports({ payload, dbFullName }: {
declare function _exports({ payload, dbFullName, useLocal, }: {
payload: {
id: string | number;
} & {
[x: string]: (string | number | null | undefined);
};
dbFullName: string;
useLocal?: boolean;
}): Promise<{
success: boolean;
payload: any;
package-shared/functions/api/users/api-update-user.js
+7 -1
View File
@@ -8,10 +8,15 @@ const updateDbEntry = require("../../backend/db/updateDbEntry");
* @param {object} params
* @param {{ id: string | number } & Object<string, (string | number | null | undefined)>} params.payload
* @param {string} params.dbFullName
* @param {boolean} [params.useLocal]
*
* @returns {Promise<{ success: boolean, payload: any }>}
*/
module.exports = async function apiUpdateUser({ payload, dbFullName }) {
module.exports = async function apiUpdateUser({
payload,
dbFullName,
useLocal,
}) {
const data = (() => {
const reqBodyKeys = Object.keys(payload);
@@ -34,6 +39,7 @@ module.exports = async function apiUpdateUser({ payload, dbFullName }) {
identifierColumnName: "id",
identifierValue: payload.id,
data: data,
useLocal,
});
return {