Updates

package-shared/functions/api/users/api-create-user.ts

@@ -1,5 +1,4 @@
-// @ts-check
-
+import { findDbNameInSchemaDir } from "../../../shell/createDbFromSchema/grab-required-database-schemas";
 import { APICreateUserFunctionParams } from "../../../types";
 import addUsersTableToDb from "../../backend/addUsersTableToDb";
 import addDbEntry from "../../backend/db/addDbEntry";
@@ -39,6 +38,19 @@ export default async function apiCreateUser({
         };
     }
 
+    const targetDbSchema = findDbNameInSchemaDir({
+        dbName: dbFullName,
+        userId,
+    });
+
+    if (!targetDbSchema?.id) {
+        return {
+            success: false,
+            msg: "targetDbSchema not found",
+            payload: null,
+        };
+    }
+
     const hashedPassword = hashPassword({
         encryptionKey: finalEncryptionKey,
         password: String(payload.password),
@@ -57,8 +69,8 @@ export default async function apiCreateUser({
         const newTable = await addUsersTableToDb({
             userId: Number(API_USER_ID),
             database: dbFullName,
-
             payload: payload,
+            dbId: targetDbSchema.id,
         });
 
         fields = await varDatabaseDbHandler({
@@ -87,6 +99,7 @@ export default async function apiCreateUser({
                 newPayload: {
                     [key]: payload[key],
                 },
+                dbId: targetDbSchema.id,
             });
         }
     }
@@ -143,8 +156,8 @@ export default async function apiCreateUser({
         },
     });
 
-    if (addUser?.insertId) {
-        const newlyAddedUserQuery = `SELECT id,uuid,first_name,last_name,email,username,image,image_thumbnail,verification_status FROM ${dbFullName}.users WHERE id='${addUser.insertId}'`;
+    if (addUser?.payload?.insertId) {
+        const newlyAddedUserQuery = `SELECT id,uuid,first_name,last_name,email,username,image,image_thumbnail,verification_status FROM ${dbFullName}.users WHERE id='${addUser.payload.insertId}'`;
 
         const newlyAddedUser = await varDatabaseDbHandler({
             queryString: newlyAddedUserQuery,

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

@@ -26,6 +26,14 @@ export default async function apiLoginUser({
     debug,
 }: APILoginFunctionParams): Promise<APILoginFunctionReturn> {
     const dbFullName = grabDbFullName({ dbName: database, userId: dbUserId });
+
+    if (!dbFullName) {
+        console.log(`Database Full Name couldn't be grabbed`);
+        return {
+            success: false,
+            msg: `Database Full Name couldn't be grabbed`,
+        };
+    }
     const dbAppend = global.DSQL_USE_LOCAL ? "" : `${dbFullName}.`;
 
     /**
@@ -152,6 +160,8 @@ export default async function apiLoginUser({
 
     let userPayload: DATASQUIREL_LoggedInUser = {
         id: foundUser[0].id,
+        uid: foundUser[0].uid,
+        uuid: foundUser[0].uuid,
         first_name: foundUser[0].first_name,
         last_name: foundUser[0].last_name,
         username: foundUser[0].username,

package-shared/functions/api/users/reset-password/api-send-reset-password-link.ts

@@ -30,11 +30,13 @@ export default async function apiSendResetPasswordLink({
 }: Param): Promise<Return> {
     const dbFullName = grabDbFullName({ dbName: database, userId: dbUserId });
 
-    /**
-     * Check input validity
-     *
-     * @description Check input validity
-     */
+    if (!dbFullName) {
+        return {
+            success: false,
+            msg: `Couldn't get database full name`,
+        };
+    }
+
     if (email?.match(/ /)) {
         return {
             success: false,