From d89ded9d43f8d41734a3e91ad782ebdfcab76ef8 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <benoti.san@gmail.com>
Date: Mon, 20 Jan 2025 09:28:30 +0100
Subject: [PATCH] Updates

---
 dist/package-shared/functions/api/users/api-login.d.ts | 2 +-
 dist/package-shared/functions/api/users/api-login.js   | 7 ++++---
 package-shared/functions/api/users/api-login.ts        | 6 +++---
 package.json                                           | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dist/package-shared/functions/api/users/api-login.d.ts b/dist/package-shared/functions/api/users/api-login.d.ts
index 2147afd..f6c9b2e 100644
--- a/dist/package-shared/functions/api/users/api-login.d.ts
+++ b/dist/package-shared/functions/api/users/api-login.d.ts
@@ -2,4 +2,4 @@ import { APILoginFunctionParams, APILoginFunctionReturn } from "../../../types";
 /**
  * # API Login
  */
-export default function apiLoginUser({ encryptionKey, email, username, password, database, additionalFields, email_login, email_login_code, email_login_field, token, skipPassword, social, dbUserId, debug, }: APILoginFunctionParams): Promise<APILoginFunctionReturn>;
+export default function apiLoginUser({ encryptionKey, email, username, password, database, additionalFields, email_login, email_login_code, email_login_field, skipPassword, social, dbUserId, debug, }: APILoginFunctionParams): Promise<APILoginFunctionReturn>;
diff --git a/dist/package-shared/functions/api/users/api-login.js b/dist/package-shared/functions/api/users/api-login.js
index 504f2aa..5f97c56 100644
--- a/dist/package-shared/functions/api/users/api-login.js
+++ b/dist/package-shared/functions/api/users/api-login.js
@@ -20,8 +20,9 @@ const hashPassword_1 = __importDefault(require("../../dsql/hashPassword"));
  * # API Login
  */
 function apiLoginUser(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ encryptionKey, email, username, password, database, additionalFields, email_login, email_login_code, email_login_field, token, skipPassword, social, dbUserId, debug, }) {
+    return __awaiter(this, arguments, void 0, function* ({ encryptionKey, email, username, password, database, additionalFields, email_login, email_login_code, email_login_field, skipPassword, social, dbUserId, debug, }) {
         const dbFullName = (0, grab_db_full_name_1.default)({ dbName: database, userId: dbUserId });
+        const dbAppend = global.DSQL_USE_LOCAL ? "" : `${dbFullName}.`;
         /**
          * Check input validity
          *
@@ -51,7 +52,7 @@ function apiLoginUser(_a) {
             console.log("apiLoginUser:Finding User ...");
         }
         let foundUser = yield (0, varDatabaseDbHandler_1.default)({
-            queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
+            queryString: `SELECT * FROM ${dbAppend}users WHERE email = ? OR username = ?`,
             queryValuesArray: [email, username],
             database: dbFullName,
             debug,
@@ -112,7 +113,7 @@ function apiLoginUser(_a) {
         }
         if (isPasswordCorrect && email_login) {
             const resetTempCode = yield (0, varDatabaseDbHandler_1.default)({
-                queryString: `UPDATE ${dbFullName}.users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
+                queryString: `UPDATE ${dbAppend}users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
                 queryValuesArray: [email, username],
                 database: dbFullName,
             });
diff --git a/package-shared/functions/api/users/api-login.ts b/package-shared/functions/api/users/api-login.ts
index 7c34359..b9e943b 100644
--- a/package-shared/functions/api/users/api-login.ts
+++ b/package-shared/functions/api/users/api-login.ts
@@ -20,13 +20,13 @@ export default async function apiLoginUser({
     email_login,
     email_login_code,
     email_login_field,
-    token,
     skipPassword,
     social,
     dbUserId,
     debug,
 }: APILoginFunctionParams): Promise<APILoginFunctionReturn> {
     const dbFullName = grabDbFullName({ dbName: database, userId: dbUserId });
+    const dbAppend = global.DSQL_USE_LOCAL ? "" : `${dbFullName}.`;
 
     /**
      * Check input validity
@@ -62,7 +62,7 @@ export default async function apiLoginUser({
     }
 
     let foundUser = await varDatabaseDbHandler({
-        queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
+        queryString: `SELECT * FROM ${dbAppend}users WHERE email = ? OR username = ?`,
         queryValuesArray: [email, username],
         database: dbFullName,
 
@@ -139,7 +139,7 @@ export default async function apiLoginUser({
 
     if (isPasswordCorrect && email_login) {
         const resetTempCode = await varDatabaseDbHandler({
-            queryString: `UPDATE ${dbFullName}.users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
+            queryString: `UPDATE ${dbAppend}users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
             queryValuesArray: [email, username],
             database: dbFullName,
         });
diff --git a/package.json b/package.json
index 058c347..3decf8a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "3.8.0",
+    "version": "3.8.1",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {