From 1acdad97a2a458643f2765fa43fa19dbd6469564 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <benoti.san@gmail.com>
Date: Mon, 27 Jan 2025 16:21:55 +0100
Subject: [PATCH] Bugfix

---
 dist/package-shared/actions/users/reauth-user.js         | 1 -
 .../functions/api/users/api-reauth-user.js               | 8 ++++++--
 dist/package-shared/utils/db/conn-db-handler.js          | 1 -
 package-shared/actions/users/reauth-user.ts              | 1 -
 package-shared/functions/api/users/api-reauth-user.ts    | 9 +++++++--
 package-shared/utils/db/conn-db-handler.ts               | 1 -
 package.json                                             | 2 +-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dist/package-shared/actions/users/reauth-user.js b/dist/package-shared/actions/users/reauth-user.js
index bd00078..9cb52b5 100644
--- a/dist/package-shared/actions/users/reauth-user.js
+++ b/dist/package-shared/actions/users/reauth-user.js
@@ -66,7 +66,6 @@ function reauthUser(_a) {
             (DSQL_DB_PASSWORD === null || DSQL_DB_PASSWORD === void 0 ? void 0 : DSQL_DB_PASSWORD.match(/./)) &&
             (DSQL_DB_NAME === null || DSQL_DB_NAME === void 0 ? void 0 : DSQL_DB_NAME.match(/./)) &&
             global.DSQL_USE_LOCAL) {
-            /** @type {import("../../types").DSQL_DatabaseSchemaType | undefined} */
             let dbSchema;
             try {
                 const localDbSchemaPath = path_1.default.resolve(process.cwd(), "dsql.schema.json");
diff --git a/dist/package-shared/functions/api/users/api-reauth-user.js b/dist/package-shared/functions/api/users/api-reauth-user.js
index 268f7b5..e26d31e 100644
--- a/dist/package-shared/functions/api/users/api-reauth-user.js
+++ b/dist/package-shared/functions/api/users/api-reauth-user.js
@@ -19,9 +19,14 @@ const varDatabaseDbHandler_1 = __importDefault(require("../../backend/varDatabas
  */
 function apiReauthUser(_a) {
     return __awaiter(this, arguments, void 0, function* ({ existingUser, database, additionalFields, }) {
+        const dbAppend = global.DSQL_USE_LOCAL
+            ? ""
+            : database
+                ? `${database}.`
+                : "";
         let foundUser = (existingUser === null || existingUser === void 0 ? void 0 : existingUser.id) && existingUser.id.toString().match(/./)
             ? yield (0, varDatabaseDbHandler_1.default)({
-                queryString: `SELECT * FROM ${database}.users WHERE id=?`,
+                queryString: `SELECT * FROM ${dbAppend}users WHERE id=?`,
                 queryValuesArray: [existingUser.id.toString()],
                 database,
             })
@@ -35,7 +40,6 @@ function apiReauthUser(_a) {
         let csrfKey = Math.random().toString(36).substring(2) +
             "-" +
             Math.random().toString(36).substring(2);
-        /** @type {import("../../../types").DATASQUIREL_LoggedInUser} */
         let userPayload = {
             id: foundUser[0].id,
             first_name: foundUser[0].first_name,
diff --git a/dist/package-shared/utils/db/conn-db-handler.js b/dist/package-shared/utils/db/conn-db-handler.js
index 49e3880..34fde60 100644
--- a/dist/package-shared/utils/db/conn-db-handler.js
+++ b/dist/package-shared/utils/db/conn-db-handler.js
@@ -59,7 +59,6 @@ values) {
         }
         catch (error) {
             console.log(`connDbHandler Error: ${error.message}`);
-            console.log(conn === null || conn === void 0 ? void 0 : conn.getConfig());
             return null;
         }
         finally {
diff --git a/package-shared/actions/users/reauth-user.ts b/package-shared/actions/users/reauth-user.ts
index 0bd2698..852bc20 100644
--- a/package-shared/actions/users/reauth-user.ts
+++ b/package-shared/actions/users/reauth-user.ts
@@ -92,7 +92,6 @@ export default async function reauthUser({
         DSQL_DB_NAME?.match(/./) &&
         global.DSQL_USE_LOCAL
     ) {
-        /** @type {import("../../types").DSQL_DatabaseSchemaType | undefined} */
         let dbSchema: import("../../types").DSQL_DatabaseSchemaType | undefined;
 
         try {
diff --git a/package-shared/functions/api/users/api-reauth-user.ts b/package-shared/functions/api/users/api-reauth-user.ts
index 6425024..f9210a5 100644
--- a/package-shared/functions/api/users/api-reauth-user.ts
+++ b/package-shared/functions/api/users/api-reauth-user.ts
@@ -15,10 +15,16 @@ export default async function apiReauthUser({
     database,
     additionalFields,
 }: Param): Promise<APILoginFunctionReturn> {
+    const dbAppend = global.DSQL_USE_LOCAL
+        ? ""
+        : database
+        ? `${database}.`
+        : "";
+
     let foundUser =
         existingUser?.id && existingUser.id.toString().match(/./)
             ? await varDatabaseDbHandler({
-                  queryString: `SELECT * FROM ${database}.users WHERE id=?`,
+                  queryString: `SELECT * FROM ${dbAppend}users WHERE id=?`,
                   queryValuesArray: [existingUser.id.toString()],
                   database,
               })
@@ -36,7 +42,6 @@ export default async function apiReauthUser({
         "-" +
         Math.random().toString(36).substring(2);
 
-    /** @type {import("../../../types").DATASQUIREL_LoggedInUser} */
     let userPayload: import("../../../types").DATASQUIREL_LoggedInUser = {
         id: foundUser[0].id,
         first_name: foundUser[0].first_name,
diff --git a/package-shared/utils/db/conn-db-handler.ts b/package-shared/utils/db/conn-db-handler.ts
index 1396fb7..1d9d8ff 100644
--- a/package-shared/utils/db/conn-db-handler.ts
+++ b/package-shared/utils/db/conn-db-handler.ts
@@ -56,7 +56,6 @@ export default async function connDbHandler<ReturnType = any>(
         }
     } catch (error: any) {
         console.log(`connDbHandler Error: ${error.message}`);
-        console.log(conn?.getConfig());
         return null;
     } finally {
         conn?.end();
diff --git a/package.json b/package.json
index 860c229..021e0f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "3.9.6",
+    "version": "3.9.7",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {