Updates
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
// @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");
|
||||
|
||||
@@ -50,16 +51,12 @@ module.exports = async function apiLoginUser({
|
||||
})
|
||||
: null;
|
||||
|
||||
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, ""),
|
||||
});
|
||||
let foundUser = await varDatabaseDbHandler({
|
||||
queryString: `SELECT * FROM users WHERE email = ? OR username = ?`,
|
||||
queryValuesArray: [email, username],
|
||||
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
|
||||
useLocal,
|
||||
});
|
||||
|
||||
if ((!foundUser || !foundUser[0]) && !social)
|
||||
return {
|
||||
@@ -107,16 +104,12 @@ module.exports = async function apiLoginUser({
|
||||
}
|
||||
|
||||
if (isPasswordCorrect && email_login) {
|
||||
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, ""),
|
||||
});
|
||||
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, ""),
|
||||
useLocal,
|
||||
});
|
||||
}
|
||||
|
||||
let csrfKey =
|
||||
@@ -144,6 +137,7 @@ module.exports = async function apiLoginUser({
|
||||
date: Date.now(),
|
||||
};
|
||||
|
||||
/** @type {import("../../../types").APILoginFunctionReturn} */
|
||||
const resposeObject = {
|
||||
success: true,
|
||||
msg: "Login Successful",
|
||||
@@ -152,6 +146,7 @@ module.exports = async function apiLoginUser({
|
||||
userPayload
|
||||
),
|
||||
userId: foundUser[0].id,
|
||||
csrf: csrfKey,
|
||||
};
|
||||
|
||||
if (
|
||||
|
||||
Reference in New Issue
Block a user