Updates

package-shared/functions/api/social-login/handleSocialDb.ts

@@ -27,7 +27,11 @@ export default async function handleSocialDb({
     debug,
 }: HandleSocialDbFunctionParams): Promise<APILoginFunctionReturn> {
     try {
-        const finalDbName = database ? database : "datasquirel";
+        const finalDbName = useLocal
+            ? undefined
+            : database
+            ? database
+            : "datasquirel";
         const dbAppend = useLocal ? "" : `${finalDbName}.`;
 
         const existingSocialIdUserQuery = `SELECT * FROM ${dbAppend}users WHERE social_id = ? AND social_login='1' AND social_platform = ? `;
@@ -48,7 +52,7 @@ export default async function handleSocialDb({
         }
 
         let existingSocialIdUser = await varDatabaseDbHandler({
-            database: database ? database : "datasquirel",
+            database: finalDbName,
             queryString: existingSocialIdUserQuery,
             queryValuesArray: existingSocialIdUserValues,
             useLocal,
@@ -67,7 +71,7 @@ export default async function handleSocialDb({
                 user: existingSocialIdUser[0],
                 social_platform,
                 invitation,
-                database,
+                database: finalDbName,
                 additionalFields,
                 useLocal,
                 debug,
@@ -94,7 +98,7 @@ export default async function handleSocialDb({
         }
 
         let existingEmailOnly = await varDatabaseDbHandler({
-            database: database ? database : "datasquirel",
+            database: finalDbName,
             queryString: existingEmailOnlyQuery,
             useLocal,
             debug,
@@ -116,7 +120,7 @@ export default async function handleSocialDb({
         const foundUserQueryValues = [finalEmail, social_platform, social_id];
 
         const foundUser = await varDatabaseDbHandler({
-            database: database ? database : "datasquirel",
+            database: finalDbName,
             queryString: foundUserQuery,
             queryValuesArray: foundUserQueryValues,
             useLocal,
@@ -128,7 +132,7 @@ export default async function handleSocialDb({
                 user: payload,
                 social_platform,
                 invitation,
-                database,
+                database: finalDbName,
                 additionalFields,
                 useLocal,
                 debug,
@@ -150,9 +154,9 @@ export default async function handleSocialDb({
         });
 
         const newUser = await addDbEntry({
-            dbContext: database ? "Dsql User" : undefined,
-            paradigm: database ? "Full Access" : undefined,
-            dbFullName: database ? database : "datasquirel",
+            dbContext: finalDbName ? "Dsql User" : undefined,
+            paradigm: finalDbName ? "Full Access" : undefined,
+            dbFullName: finalDbName,
             tableName: "users",
             duplicateColumnName: "email",
             duplicateColumnValue: finalEmail,
@@ -174,7 +178,7 @@ export default async function handleSocialDb({
             const newUserQueriedQuery = `SELECT * FROM ${dbAppend}users WHERE id='${newUser.insertId}'`;
 
             const newUserQueried = await varDatabaseDbHandler({
-                database: database ? database : "datasquirel",
+                database: finalDbName,
                 queryString: newUserQueriedQuery,
                 useLocal,
                 debug,
@@ -253,7 +257,7 @@ export default async function handleSocialDb({
                 user: newUserQueried[0],
                 social_platform,
                 invitation,
-                database,
+                database: finalDbName,
                 additionalFields,
                 useLocal,
                 debug,

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

@@ -46,18 +46,6 @@ export default async function apiGoogleLogin({
 
         if (!gUser?.email_verified) throw new Error("No Google User.");
 
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-
-        if (!database || typeof database != "string" || database?.match(/ /)) {
-            return {
-                success: false,
-                payload: undefined,
-                msg: "Please provide a database slug(database name in lowercase with no spaces)",
-            };
-        }
-
         /**
          * Create new user folder and file
          *

package-shared/functions/backend/varDatabaseDbHandler.ts

@@ -30,6 +30,7 @@ export default async function varDatabaseDbHandler({
     if (debug) {
         console.log(`varDatabaseDbHandler:query:`, queryString);
         console.log(`varDatabaseDbHandler:values:`, queryValuesArray);
+        console.log(`varDatabaseDbHandler:CONNECTION:`, CONNECTION.getConfig());
     }
 
     let results = await connDbHandler(

package-shared/types/index.ts

@@ -1254,7 +1254,7 @@ export type APIGetUserFunctionParams = {
  */
 export type APIGoogleLoginFunctionParams = {
     token: string;
-    database: string;
+    database?: string;
     additionalFields?: string[];
     additionalData?: { [key: string]: string | number };
     debug?: boolean;

package-shared/utils/db/conn-db-handler.ts

@@ -56,6 +56,7 @@ 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();