Updates

dsql-app/package-shared/functions/api/users/api-create-user.js

@@ -128,8 +128,12 @@ module.exports = async function apiCreateUser({
         tableName: "users",
         data: {
             ...payload,
-            image: "/images/user-preset.png",
-            image_thumbnail: "/images/user-preset-thumbnail.png",
+            image:
+                process.env.DSQL_DEFAULT_USER_IMAGE ||
+                "/images/user-preset.png",
+            image_thumbnail:
+                process.env.DSQL_DEFAULT_USER_IMAGE ||
+                "/images/user-preset-thumbnail.png",
         },
         useLocal,
     });

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

@@ -103,8 +103,8 @@ module.exports = async function apiLoginUser({
 
     if (isPasswordCorrect && email_login) {
         const resetTempCode = await varDatabaseDbHandler({
-            queryString: `UPDATE users SET ${email_login_field} = ? WHERE email = ? OR username = ?`,
-            queryValuesArray: ["", email, username],
+            queryString: `UPDATE users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
+            queryValuesArray: [email, username],
             database: dbFullName.replace(/[^a-z0-9_]/g, ""),
             useLocal,
         });

dsql-app/package-shared/functions/api/users/api-send-email-code.js

@@ -1,8 +1,11 @@
 // @ts-check
 
-const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
 const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
 const nodemailer = require("nodemailer");
+const http = require("http");
+const getAuthCookieNames = require("../../backend/cookies/get-auth-cookie-names");
+const encrypt = require("../../dsql/encrypt");
+const serializeCookies = require("../../../utils/serialize-cookies");
 
 /**
  * # Send Email Login Code
@@ -18,8 +21,10 @@ const nodemailer = require("nodemailer");
  * @param {string} [param.mail_password]
  * @param {string} param.html
  * @param {boolean} [param.useLocal]
+ * @param {http.ServerResponse & Object<string,any>} [param.response]
+ * @param {import("../../../../package-shared/types").CookieObject[]} [param.extraCookies]
  *
- * @returns {Promise<{success: boolean, msg?: string}>}
+ * @returns {Promise<import("../../../types").SendOneTimeCodeEmailResponse>}
  */
 module.exports = async function apiSendEmailCode({
     email,
@@ -32,6 +37,8 @@ module.exports = async function apiSendEmailCode({
     mail_password,
     html,
     useLocal,
+    response,
+    extraCookies,
 }) {
     if (email?.match(/ /)) {
         return {
@@ -39,10 +46,7 @@ module.exports = async function apiSendEmailCode({
             msg: "Invalid Email/Password format",
         };
     }
-
-    ////////////////////////////////////////
-    ////////////////////////////////////////
-    ////////////////////////////////////////
+    const createdAt = Date.now();
 
     const foundUserQuery = `SELECT * FROM users WHERE email = ?`;
     const foundUserValues = [email];
@@ -74,12 +78,12 @@ module.exports = async function apiSendEmailCode({
         return code;
     }
 
-    if (foundUser && foundUser[0] && email_login_field) {
+    if (foundUser?.[0] && email_login_field) {
         const tempCode = generateCode();
 
         let transporter = nodemailer.createTransport({
             host: mail_domain || process.env.DSQL_MAIL_HOST,
-            port: mail_port || 465,
+            port: mail_port || process.env.DSQL_MAIL_PORT || 465,
             secure: true,
             auth: {
                 user: mail_username || process.env.DSQL_MAIL_EMAIL,
@@ -102,7 +106,7 @@ module.exports = async function apiSendEmailCode({
         if (!info?.accepted) throw new Error("Mail not Sent!");
 
         const setTempCodeQuery = `UPDATE users SET ${email_login_field} = ? WHERE email = ?`;
-        const setTempCodeValues = [tempCode + `-${Date.now()}`, email];
+        const setTempCodeValues = [tempCode + `-${createdAt}`, email];
 
         let setTempCode = await varDatabaseDbHandler({
             queryString: setTempCodeQuery,
@@ -110,10 +114,57 @@ module.exports = async function apiSendEmailCode({
             database: database,
             useLocal,
         });
-    }
 
-    return {
-        success: true,
-        msg: "Success",
-    };
+        /** @type {import("../../../types").SendOneTimeCodeEmailResponse} */
+        const resObject = {
+            success: true,
+            code: tempCode,
+            email: email,
+            createdAt,
+            msg: "Success",
+        };
+
+        if (response) {
+            const cookieKeyNames = getAuthCookieNames();
+            const oneTimeCodeCookieName = cookieKeyNames.oneTimeCodeName;
+
+            const encryptedPayload = encrypt({
+                data: JSON.stringify(resObject),
+            });
+
+            if (!encryptedPayload) {
+                throw new Error(
+                    "apiSendEmailCode Error: Failed to encrypt payload"
+                );
+            }
+
+            /** @type {import("../../../../package-shared/types").CookieObject} */
+            const oneTimeCookieObject = {
+                name: oneTimeCodeCookieName,
+                value: encryptedPayload,
+                sameSite: "Strict",
+                path: "/",
+                httpOnly: true,
+                secure: true,
+            };
+
+            /** @type {import("../../../../package-shared/types").CookieObject[]} */
+            const cookiesObjectArray = extraCookies
+                ? [...extraCookies, oneTimeCookieObject]
+                : [oneTimeCookieObject];
+
+            const serializedCookies = serializeCookies({
+                cookies: cookiesObjectArray,
+            });
+
+            response.setHeader("Set-Cookie", serializedCookies);
+        }
+
+        return resObject;
+    } else {
+        return {
+            success: false,
+            msg: "Invalid Email/Password format",
+        };
+    }
 };

dsql-app/package-shared/functions/api/users/social/api-github-login.js

@@ -16,7 +16,7 @@ const camelJoinedtoCamelSpace = require("../../../../utils/camelJoinedtoCamelSpa
  * @param {string} [param.email]
  * @param {string | number} [param.userId]
  *
- * @returns {Promise<import("../../../../types").APIGoogleLoginFunctionReturn>}
+ * @returns {Promise<import("../../../../types").APILoginFunctionReturn>}
  */
 module.exports = async function apiGithubLogin({
     code,

dsql-app/package-shared/functions/api/users/social/api-google-login.js

@@ -45,7 +45,7 @@ module.exports = async function apiGoogleLogin({
         if (!database || typeof database != "string" || database?.match(/ /)) {
             return {
                 success: false,
-                user: undefined,
+                payload: undefined,
                 msg: "Please provide a database slug(database name in lowercase with no spaces)",
             };
         }
@@ -89,7 +89,7 @@ module.exports = async function apiGoogleLogin({
 
         return {
             success: false,
-            user: undefined,
+            payload: undefined,
             msg: error.message,
         };
     }