From 3437be2c0875a2d2509cc40884f587f6595ce846 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Sat, 19 Jul 2025 07:58:18 +0100 Subject: [PATCH] Updates --- dist/package-shared/actions/users/send-email-code.js | 3 +-- .../functions/api/users/api-send-email-code.d.ts | 2 +- .../functions/api/users/api-send-email-code.js | 8 +++----- dist/package-shared/types/index.d.ts | 2 -- package-shared/actions/users/send-email-code.ts | 2 -- package-shared/functions/api/users/api-send-email-code.ts | 8 ++------ package-shared/types/index.ts | 2 -- package.json | 2 +- 8 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dist/package-shared/actions/users/send-email-code.js b/dist/package-shared/actions/users/send-email-code.js index 1a76259..ee59847 100644 --- a/dist/package-shared/actions/users/send-email-code.js +++ b/dist/package-shared/actions/users/send-email-code.js @@ -21,7 +21,7 @@ const query_dsql_api_1 = __importDefault(require("../../functions/api/query-dsql */ function sendEmailCode(params) { return __awaiter(this, void 0, void 0, function* () { - const { apiKey, email, database, temp_code_field_name, mail_domain, mail_password, mail_username, mail_port, sender, response, extraCookies, useLocal, apiVersion, dbUserId, html, } = params; + const { apiKey, email, database, temp_code_field_name, mail_domain, mail_password, mail_username, mail_port, sender, response, extraCookies, useLocal, apiVersion, html, } = params; const defaultTempLoginFieldName = "temp_login_code"; const emailLoginTempCodeFieldName = temp_code_field_name ? temp_code_field_name @@ -40,7 +40,6 @@ function sendEmailCode(params) { sender, response, extraCookies, - dbUserId, }; if (useLocal) { return yield (0, api_send_email_code_1.default)(apiSendEmailCodeParams); diff --git a/dist/package-shared/functions/api/users/api-send-email-code.d.ts b/dist/package-shared/functions/api/users/api-send-email-code.d.ts index 5c12520..0a4bc49 100644 --- a/dist/package-shared/functions/api/users/api-send-email-code.d.ts +++ b/dist/package-shared/functions/api/users/api-send-email-code.d.ts @@ -2,4 +2,4 @@ import { APIResponseObject, APISendEmailCodeFunctionParams } from "../../../type /** * # Send Email Login Code */ -export default function apiSendEmailCode({ email, database, email_login_field, mail_domain, mail_port, sender, mail_username, mail_password, html, response, extraCookies, dbUserId, }: APISendEmailCodeFunctionParams): Promise; +export default function apiSendEmailCode({ email, database, email_login_field, mail_domain, mail_port, sender, mail_username, mail_password, html, response, extraCookies, }: APISendEmailCodeFunctionParams): Promise; diff --git a/dist/package-shared/functions/api/users/api-send-email-code.js b/dist/package-shared/functions/api/users/api-send-email-code.js index aee3998..d1ec701 100644 --- a/dist/package-shared/functions/api/users/api-send-email-code.js +++ b/dist/package-shared/functions/api/users/api-send-email-code.js @@ -18,26 +18,24 @@ const nodemailer_1 = __importDefault(require("nodemailer")); const get_auth_cookie_names_1 = __importDefault(require("../../backend/cookies/get-auth-cookie-names")); const encrypt_1 = __importDefault(require("../../dsql/encrypt")); const serialize_cookies_1 = __importDefault(require("../../../utils/serialize-cookies")); -const grab_db_full_name_1 = __importDefault(require("../../../utils/grab-db-full-name")); /** * # Send Email Login Code */ function apiSendEmailCode(_a) { - return __awaiter(this, arguments, void 0, function* ({ email, database, email_login_field, mail_domain, mail_port, sender, mail_username, mail_password, html, response, extraCookies, dbUserId, }) { + return __awaiter(this, arguments, void 0, function* ({ email, database, email_login_field, mail_domain, mail_port, sender, mail_username, mail_password, html, response, extraCookies, }) { if (email === null || email === void 0 ? void 0 : email.match(/ /)) { return { success: false, msg: "Invalid Email/Password format", }; } - const dbFullName = (0, grab_db_full_name_1.default)({ dbName: database, userId: dbUserId }); const createdAt = Date.now(); const foundUserQuery = `SELECT * FROM users WHERE email = ?`; const foundUserValues = [email]; let foundUser = (yield (0, dbHandler_1.default)({ query: foundUserQuery, values: foundUserValues, - database: dbFullName, + database, })); if (!foundUser || !foundUser[0]) { return { @@ -83,7 +81,7 @@ function apiSendEmailCode(_a) { yield (0, dbHandler_1.default)({ query: setTempCodeQuery, values: setTempCodeValues, - database: dbFullName, + database, }); const resObject = { success: true, diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index 6237b76..896a0b0 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1858,7 +1858,6 @@ export type APISendEmailCodeFunctionParams = { [s: string]: any; }; extraCookies?: CookieObject[]; - dbUserId?: string | number; }; export type SendEmailCodeParams = { apiKey?: string; @@ -1876,7 +1875,6 @@ export type SendEmailCodeParams = { extraCookies?: CookieObject[]; useLocal?: boolean; apiVersion?: string; - dbUserId?: string | number; /** * HTML string with {{code}} placeholder for the code */ diff --git a/package-shared/actions/users/send-email-code.ts b/package-shared/actions/users/send-email-code.ts index 068c2f8..35a87d5 100644 --- a/package-shared/actions/users/send-email-code.ts +++ b/package-shared/actions/users/send-email-code.ts @@ -27,7 +27,6 @@ export default async function sendEmailCode( extraCookies, useLocal, apiVersion, - dbUserId, html, } = params; @@ -52,7 +51,6 @@ export default async function sendEmailCode( sender, response, extraCookies, - dbUserId, }; if (useLocal) { diff --git a/package-shared/functions/api/users/api-send-email-code.ts b/package-shared/functions/api/users/api-send-email-code.ts index 97904ab..7872034 100644 --- a/package-shared/functions/api/users/api-send-email-code.ts +++ b/package-shared/functions/api/users/api-send-email-code.ts @@ -8,7 +8,6 @@ import { APISendEmailCodeFunctionParams, CookieObject, } from "../../../types"; -import grabDbFullName from "../../../utils/grab-db-full-name"; /** * # Send Email Login Code @@ -25,7 +24,6 @@ export default async function apiSendEmailCode({ html, response, extraCookies, - dbUserId, }: APISendEmailCodeFunctionParams): Promise { if (email?.match(/ /)) { return { @@ -34,8 +32,6 @@ export default async function apiSendEmailCode({ }; } - const dbFullName = grabDbFullName({ dbName: database, userId: dbUserId }); - const createdAt = Date.now(); const foundUserQuery = `SELECT * FROM users WHERE email = ?`; @@ -44,7 +40,7 @@ export default async function apiSendEmailCode({ let foundUser = (await dbHandler({ query: foundUserQuery, values: foundUserValues, - database: dbFullName, + database, })) as any[]; if (!foundUser || !foundUser[0]) { @@ -101,7 +97,7 @@ export default async function apiSendEmailCode({ await dbHandler({ query: setTempCodeQuery, values: setTempCodeValues, - database: dbFullName, + database, }); const resObject: APIResponseObject = { diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index 778c09a..3052264 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -2406,7 +2406,6 @@ export type APISendEmailCodeFunctionParams = { html: string; response?: ServerResponse & { [s: string]: any }; extraCookies?: CookieObject[]; - dbUserId?: string | number; }; export type SendEmailCodeParams = { @@ -2423,7 +2422,6 @@ export type SendEmailCodeParams = { extraCookies?: CookieObject[]; useLocal?: boolean; apiVersion?: string; - dbUserId?: string | number; /** * HTML string with {{code}} placeholder for the code */ diff --git a/package.json b/package.json index 6c5e694..a46fa88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.0.8", + "version": "5.0.9", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {