Updates

package-shared/functions/api/users/api-login.ts

@@ -25,6 +25,7 @@ export default async function apiLoginUser({
     social,
     useLocal,
     dbUserId,
+    debug,
 }: APILoginFunctionParams): Promise<APILoginFunctionReturn> {
     const dbFullName = grabDbFullName({ dbName: database, userId: dbUserId });
 
@@ -56,17 +57,23 @@ export default async function apiLoginUser({
           })
         : null;
 
-    console.log(
-        `Logging in: Checking for Existing user in ${dbFullName} database.`
-    );
+    if (debug) {
+        console.log("apiLoginUser:database:", dbFullName);
+        console.log("apiLoginUser:Finding User ...");
+    }
 
     let foundUser = await varDatabaseDbHandler({
         queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
         queryValuesArray: [email, username],
         database: dbFullName,
         useLocal,
+        debug,
     });
 
+    if (debug) {
+        console.log("apiLoginUser:foundUser:", foundUser);
+    }
+
     if ((!foundUser || !foundUser[0]) && !social)
         return {
             success: false,
@@ -76,6 +83,10 @@ export default async function apiLoginUser({
 
     let isPasswordCorrect = false;
 
+    if (debug) {
+        console.log("apiLoginUser:isPasswordCorrect:", isPasswordCorrect);
+    }
+
     if (foundUser?.[0] && !email_login && skipPassword) {
         isPasswordCorrect = true;
     } else if (foundUser?.[0] && !email_login) {
@@ -89,6 +100,10 @@ export default async function apiLoginUser({
     ) {
         const tempCode: string = foundUser[0][email_login_field];
 
+        if (debug) {
+            console.log("apiLoginUser:tempCode:", tempCode);
+        }
+
         if (!tempCode) throw new Error("No code Found!");
 
         const tempCodeArray = tempCode.split("-");
@@ -111,6 +126,11 @@ export default async function apiLoginUser({
         };
     }
 
+    if (debug) {
+        console.log("apiLoginUser:isPasswordCorrect:", isPasswordCorrect);
+        console.log("apiLoginUser:email_login:", email_login);
+    }
+
     if (isPasswordCorrect && email_login) {
         const resetTempCode = await varDatabaseDbHandler({
             queryString: `UPDATE ${dbFullName}.users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
@@ -144,6 +164,11 @@ export default async function apiLoginUser({
         date: Date.now(),
     };
 
+    if (debug) {
+        console.log("apiLoginUser:userPayload:", userPayload);
+        console.log("apiLoginUser:Sending Response Object ...");
+    }
+
     const resposeObject: APILoginFunctionReturn = {
         success: true,
         msg: "Login Successful",

package-shared/functions/backend/varDatabaseDbHandler.ts

@@ -1,8 +1,7 @@
 import parseDbResults from "./parseDbResults";
 import serverError from "./serverError";
-import DB_HANDLER from "../../utils/backend/global-db/DB_HANDLER";
-import DSQL_USER_DB_HANDLER from "../../utils/backend/global-db/DSQL_USER_DB_HANDLER";
-import LOCAL_DB_HANDLER from "../../utils/backend/global-db/LOCAL_DB_HANDLER";
+import grabDSQLConnection from "../../utils/grab-dsql-connection";
+import connDbHandler from "../../utils/db/conn-db-handler";
 
 type Param = {
     queryString: string;
@@ -10,6 +9,7 @@ type Param = {
     database?: string;
     tableSchema?: import("../../types").DSQL_TableSchemaType;
     useLocal?: boolean;
+    debug?: boolean;
 };
 
 /**
@@ -21,66 +21,27 @@ export default async function varDatabaseDbHandler({
     database,
     tableSchema,
     useLocal,
+    debug,
 }: Param): Promise<any> {
-    /**
-     * Declare variables
-     *
-     * @description Declare "results" variable
-     */
-    const isMaster = useLocal
-        ? true
-        : database?.match(/^datasquirel$/)
-        ? true
-        : false;
+    let CONNECTION = grabDSQLConnection({ fa: true });
+    if (useLocal) CONNECTION = grabDSQLConnection({ local: true });
+    if (database?.match(/^datasquirel$/)) CONNECTION = grabDSQLConnection();
 
-    const FINAL_DB_HANDLER: any = useLocal
-        ? LOCAL_DB_HANDLER
-        : isMaster
-        ? DB_HANDLER
-        : DSQL_USER_DB_HANDLER;
+    if (debug) {
+        console.log(`varDatabaseDbHandler:query:`, queryString);
+        console.log(`varDatabaseDbHandler:values:`, queryValuesArray);
+    }
 
-    let results;
+    let results = await connDbHandler(
+        CONNECTION,
+        queryString,
+        queryValuesArray
+    );
 
-    /**
-     * Fetch from db
-     *
-     * @description Fetch data from db if no cache
-     */
-    try {
-        if (
-            queryString &&
-            queryValuesArray &&
-            Array.isArray(queryValuesArray) &&
-            queryValuesArray[0]
-        ) {
-            results = isMaster
-                ? await FINAL_DB_HANDLER(queryString, queryValuesArray)
-                : await FINAL_DB_HANDLER({
-                      paradigm: "Full Access",
-                      queryString,
-                      queryValues: queryValuesArray,
-                  });
-        } else {
-            results = isMaster
-                ? await FINAL_DB_HANDLER(queryString)
-                : await FINAL_DB_HANDLER({
-                      paradigm: "Full Access",
-                      queryString,
-                  });
-        }
-    } catch (error: any) {
-        console.log(`varDatabaseDbHandler Error: ${error.message}`);
-        serverError({
-            component: "varDatabaseDbHandler/lines-29-32",
-            message: error.message,
-        });
+    if (debug) {
+        console.log(`varDatabaseDbHandler:results:`, results);
     }
 
-    /**
-     * Return results
-     *
-     * @description Return results add to cache if "req" param is passed
-     */
     if (results && tableSchema) {
         try {
             const unparsedResults = results;