Updates

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

@@ -3,6 +3,7 @@ import {
     APILoginFunctionReturn,
     DATASQUIREL_LoggedInUser,
 } from "../../../types";
+import grabDbFullName from "../../../utils/grab-db-full-name";
 import varDatabaseDbHandler from "../../backend/varDatabaseDbHandler";
 import hashPassword from "../../dsql/hashPassword";
 
@@ -23,8 +24,10 @@ export default async function apiLoginUser({
     skipPassword,
     social,
     useLocal,
+    dbUserId,
+    debug,
 }: APILoginFunctionParams): Promise<APILoginFunctionReturn> {
-    const dbFullName = database.replace(/[^a-z0-9_]/g, "");
+    const dbFullName = grabDbFullName({ dbName: database, userId: dbUserId });
 
     /**
      * Check input validity
@@ -54,13 +57,23 @@ export default async function apiLoginUser({
           })
         : null;
 
+    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,
@@ -70,9 +83,20 @@ 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) {
+        if (debug) {
+            console.log("apiLoginUser:hashedPassword:", hashedPassword);
+            console.log(
+                "apiLoginUser:foundUser[0].password:",
+                foundUser[0].password
+            );
+        }
         isPasswordCorrect = hashedPassword === foundUser[0].password;
     } else if (
         foundUser &&
@@ -81,8 +105,11 @@ export default async function apiLoginUser({
         email_login_code &&
         email_login_field
     ) {
-        /** @type {string} */
-        const tempCode = foundUser[0][email_login_field];
+        const tempCode: string = foundUser[0][email_login_field];
+
+        if (debug) {
+            console.log("apiLoginUser:tempCode:", tempCode);
+        }
 
         if (!tempCode) throw new Error("No code Found!");
 
@@ -106,6 +133,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 = ?`,
@@ -139,6 +171,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",

dsql-app/package-shared/functions/api/users/reset-password/(utils)/encrypt-url.ts

@@ -0,0 +1,35 @@
+import EJSON from "../../../../../utils/ejson";
+import encrypt from "../../../../dsql/encrypt";
+
+type Param = {
+    email: string;
+    encryptionKey?: string;
+    encryptionSalt?: string;
+};
+
+export type EncryptResetPasswordObject = {
+    email: string;
+    createdAt: number;
+};
+
+export default function encryptReserPasswordUrl({
+    email,
+    encryptionKey,
+    encryptionSalt,
+}: Param) {
+    const encryptObject: EncryptResetPasswordObject = {
+        email,
+        createdAt: Date.now(),
+    };
+
+    const encryptStr = encrypt({
+        data: EJSON.stringify(encryptObject) as string,
+        encryptionKey,
+        encryptionSalt,
+    });
+
+    const defaultUrlOrigin = `https://datasquirel.com`;
+    let urlOrigin = process.env.DSQL_HOST || defaultUrlOrigin;
+
+    const url = `${defaultUrlOrigin}`;
+}

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

@@ -0,0 +1,77 @@
+import { DSQL_MYSQL_user_databases_Type } from "../../../../types";
+import grabDbFullName from "../../../../utils/grab-db-full-name";
+import varDatabaseDbHandler from "../../../backend/varDatabaseDbHandler";
+
+type Return = {
+    success: boolean;
+    msg?: string;
+    error?: string;
+};
+
+type Param = {
+    key?: string;
+    database: string;
+    email: string;
+    encryptionKey?: string;
+    encryptionSalt?: string;
+    useLocal?: boolean;
+    debug?: boolean;
+    apiUserID?: string | number;
+    dbUserId?: string | number;
+};
+
+/**
+ * # API Login
+ */
+export default async function apiSendResetPasswordLink({
+    database,
+    email,
+    apiUserID,
+    dbUserId,
+    debug,
+    encryptionKey,
+    encryptionSalt,
+    key,
+    useLocal,
+}: Param): Promise<Return> {
+    const dbFullName = grabDbFullName({ dbName: database, userId: dbUserId });
+
+    /**
+     * Check input validity
+     *
+     * @description Check input validity
+     */
+    if (email?.match(/ /)) {
+        return {
+            success: false,
+            msg: "Invalid Email/Password format",
+        };
+    }
+
+    let foundUser = await varDatabaseDbHandler({
+        queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
+        queryValuesArray: [email, email],
+        database: dbFullName,
+        useLocal,
+        debug,
+    });
+
+    if (debug) {
+        console.log("apiSendResetPassword:foundUser:", foundUser);
+    }
+
+    const targetUser = foundUser?.[0] as
+        | DSQL_MYSQL_user_databases_Type
+        | undefined;
+
+    if (!targetUser)
+        return {
+            success: false,
+            msg: "No user found",
+        };
+
+    return { success: true };
+}
+
+export type SendResetPasswordParam = Param;
+export type SendResetPasswordReturn = Return;