Updates

dist/package-shared/actions/users/login-user.d.ts

@@ -9,6 +9,9 @@ type Param = {
         password?: string;
     };
     additionalFields?: string[];
+    request?: http.IncomingMessage & {
+        [s: string]: any;
+    };
     response?: http.ServerResponse & {
         [s: string]: any;
     };
@@ -30,5 +33,5 @@ type Param = {
 /**
  * # Login A user
  */
-export default function loginUser({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, }: Param): Promise<APILoginFunctionReturn>;
+export default function loginUser({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, request, }: Param): Promise<APILoginFunctionReturn>;
 export {};

dist/package-shared/actions/users/login-user.js

@@ -22,11 +22,12 @@ const get_auth_cookie_names_1 = __importDefault(require("../../functions/backend
 const write_auth_files_1 = require("../../functions/backend/auth/write-auth-files");
 const debug_log_1 = __importDefault(require("../../utils/logging/debug-log"));
 const grab_cookie_expirt_date_1 = __importDefault(require("../../utils/grab-cookie-expirt-date"));
+const validate_email_1 = __importDefault(require("../../functions/email/fns/validate-email"));
 /**
  * # Login A user
  */
 function loginUser(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, }) {
+    return __awaiter(this, arguments, void 0, function* ({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, request, }) {
         var _b, _c, _d;
         const grabedHostNames = (0, grab_host_names_1.default)({ userId: user_id || apiUserID });
         const { host, port, scheme } = grabedHostNames;
@@ -63,11 +64,12 @@ function loginUser(_a) {
          *
          * @description Check required fields
          */
-        if (!payload.email) {
+        const isEmailValid = yield (0, validate_email_1.default)({ email: payload.email });
+        if (!payload.email || !isEmailValid.isValid) {
             return {
                 success: false,
                 payload: null,
-                msg: "Email Required",
+                msg: isEmailValid.message,
             };
         }
         /**

dist/package-shared/external-services/arcjet/index.js

@@ -0,0 +1,27 @@
+"use strict";
+// import arcjet, { ArcjetOptions, Primitive, Product } from "@arcjet/node";
+// interface Params<
+//     Rules extends (Primitive | Product)[],
+//     Characteristics extends readonly string[]
+// > {
+//     options?: Omit<ArcjetOptions<Rules, Characteristics>, "key" | "rules"> & {
+//         rules?: Rules;
+//     };
+// }
+// export default function arcjetClient<
+//     Rules extends (Primitive | Product)[],
+//     Characteristics extends readonly string[]
+// >(params?: Params<Rules, Characteristics>) {
+//     const ARCJET_KEY = process.env.DSQL_ARCJET_KEY;
+//     const ARCJET_ENV = process.env.NODE_ENV || "development";
+//     if (!ARCJET_KEY) {
+//         return null;
+//     }
+//     const aj = arcjet({
+//         key: ARCJET_KEY,
+//         characteristics: ["ip.src"],
+//         rules: [],
+//         ...params?.options,
+//     });
+//     return aj;
+// }

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

@@ -5,12 +5,12 @@ import { APICreateUserFunctionParams } from "../../../types";
 export default function apiCreateUser({ encryptionKey, payload, database, userId, }: APICreateUserFunctionParams): Promise<{
     success: boolean;
     msg: string;
-    payload: null;
+    payload?: undefined;
     sqlResult?: undefined;
 } | {
     success: boolean;
-    msg: string;
-    payload?: undefined;
+    msg: string | undefined;
+    payload: null;
     sqlResult?: undefined;
 } | {
     success: boolean;

dist/package-shared/functions/api/users/api-create-user.js

@@ -19,6 +19,7 @@ const addDbEntry_1 = __importDefault(require("../../backend/db/addDbEntry"));
 const updateUsersTableSchema_1 = __importDefault(require("../../backend/updateUsersTableSchema"));
 const varDatabaseDbHandler_1 = __importDefault(require("../../backend/varDatabaseDbHandler"));
 const hashPassword_1 = __importDefault(require("../../dsql/hashPassword"));
+const validate_email_1 = __importDefault(require("../../email/fns/validate-email"));
 /**
  * # API Create User
  */
@@ -104,6 +105,14 @@ function apiCreateUser(_a) {
                 payload: null,
             };
         }
+        const isEmailValid = yield (0, validate_email_1.default)({ email: payload.email });
+        if (!isEmailValid.isValid) {
+            return {
+                success: false,
+                msg: isEmailValid.message,
+                payload: null,
+            };
+        }
         const addUser = yield (0, addDbEntry_1.default)({
             dbFullName: dbFullName,
             tableName: "users",

dist/package-shared/functions/backend/handleNodemailer.d.ts

@@ -1,13 +1,11 @@
-type Param = {
-    to?: string;
-    subject?: string;
-    text?: string;
-    html?: string;
+import Mail from "nodemailer/lib/mailer";
+import SMTPTransport from "nodemailer/lib/smtp-transport";
+export type HandleNodemailerParam = Mail.Options & {
     senderName?: string;
     alias?: string | null;
+    options?: SMTPTransport.Options;
 };
 /**
  * # Handle mails With Nodemailer
  */
-export default function handleNodemailer({ to, subject, text, html, alias, senderName, }: Param): Promise<any>;
-export {};
+export default function handleNodemailer(params: HandleNodemailerParam): Promise<SMTPTransport.SentMessageInfo | undefined>;

dist/package-shared/functions/backend/handleNodemailer.js

@@ -14,76 +14,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = handleNodemailer;
 const fs_1 = __importDefault(require("fs"));
+const lodash_1 = __importDefault(require("lodash"));
 const nodemailer_1 = __importDefault(require("nodemailer"));
-let transporter = nodemailer_1.default.createTransport({
-    host: process.env.DSQL_MAIL_HOST,
-    port: 465,
-    secure: true,
-    auth: {
-        user: process.env.DSQL_MAIL_EMAIL,
-        pass: process.env.DSQL_MAIL_PASSWORD,
-    },
-});
 /**
  * # Handle mails With Nodemailer
  */
-function handleNodemailer(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ to, subject, text, html, alias, senderName, }) {
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        ////////////////////////////////////////
+function handleNodemailer(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         if (!process.env.DSQL_MAIL_HOST ||
             !process.env.DSQL_MAIL_EMAIL ||
             !process.env.DSQL_MAIL_PASSWORD) {
-            return null;
+            return undefined;
         }
+        let transporter = nodemailer_1.default.createTransport(Object.assign({ host: process.env.DSQL_MAIL_HOST, port: 465, secure: true, auth: {
+                user: process.env.DSQL_MAIL_EMAIL,
+                pass: process.env.DSQL_MAIL_PASSWORD,
+            } }, params.options));
         const sender = (() => {
-            if (alias === null || alias === void 0 ? void 0 : alias.match(/support/i))
+            var _a;
+            if ((_a = params.alias) === null || _a === void 0 ? void 0 : _a.match(/support/i))
                 return process.env.DSQL_MAIL_EMAIL;
             return process.env.DSQL_MAIL_EMAIL;
         })();
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        let sentMessage;
-        if (!fs_1.default.existsSync("./email/index.html")) {
-            return;
-        }
-        let mailRoot = fs_1.default.readFileSync("./email/index.html", "utf8");
+        const mailRootPath = process.env.DSQL_MAIL_ROOT || "./email/index.html";
+        let mailRoot = fs_1.default.existsSync(mailRootPath)
+            ? fs_1.default.readFileSync(mailRootPath, "utf8")
+            : undefined;
         let finalHtml = mailRoot
-            .replace(/{{email_body}}/, html ? html : "")
-            .replace(/{{issue_date}}/, Date().substring(0, 24));
-        ////////////////////////////////////////
-        ////////////////////////////////////////
-        ////////////////////////////////////////
+            ? mailRoot
+                .replace(/{{email_body}}/, ((_a = params.html) === null || _a === void 0 ? void 0 : _a.toString()) || "")
+                .replace(/{{issue_date}}/, Date().substring(0, 24))
+            : (_b = params.html) === null || _b === void 0 ? void 0 : _b.toString();
         try {
             let mailObject = {};
-            mailObject["from"] = `"${senderName || "Datasquirel"}" <${sender}>`;
+            mailObject["from"] = `"${params.senderName || "Datasquirel"}" <${sender}>`;
             mailObject["sender"] = sender;
-            if (alias)
+            if (params.alias)
                 mailObject["replyTo"] = sender;
-            mailObject["to"] = to;
-            mailObject["subject"] = subject;
-            mailObject["text"] = text;
+            mailObject["to"] = params.to;
+            mailObject["subject"] = params.subject;
+            mailObject["text"] = params.text;
             mailObject["html"] = finalHtml;
-            // send mail with defined transport object
-            let info = yield transporter.sendMail(mailObject);
-            sentMessage = info;
-            ////////////////////////////////////////
-            ////////////////////////////////////////
-            ////////////////////////////////////////
+            let info = yield transporter.sendMail(Object.assign(Object.assign({}, lodash_1.default.omit(mailObject, ["alias", "senderName", "options"])), mailObject));
+            return info;
         }
-        catch ( /** @type {any} */error) {
-            ////////////////////////////////////////
-            ////////////////////////////////////////
-            ////////////////////////////////////////
+        catch (error) {
             console.log("ERROR in handleNodemailer Function =>", error.message);
-            // serverError({
-            //     component: "handleNodemailer",
-            //     message: error.message,
-            //     user: { email: to },
-            // });
         }
-        return sentMessage;
+        return undefined;
     });
 }

dist/package-shared/functions/email/fns/validate-email.d.ts

@@ -0,0 +1,10 @@
+import { HandleNodemailerParam } from "../../backend/handleNodemailer";
+type Param = {
+    email?: string;
+    welcomeEmailOptions?: HandleNodemailerParam;
+};
+export default function validateEmail({ email, welcomeEmailOptions, }: Param): Promise<{
+    isValid: boolean;
+    message?: string;
+}>;
+export {};

dist/package-shared/functions/email/fns/validate-email.js

@@ -0,0 +1,55 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = validateEmail;
+const handleNodemailer_1 = __importDefault(require("../../backend/handleNodemailer"));
+const email_mx_lookup_1 = __importDefault(require("../verification/email-mx-lookup"));
+const email_regex_test_1 = __importDefault(require("../verification/email-regex-test"));
+function validateEmail(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ email, welcomeEmailOptions, }) {
+        var _b;
+        if (!email) {
+            return {
+                isValid: false,
+                message: "Email is required.",
+            };
+        }
+        if (!(0, email_regex_test_1.default)(email)) {
+            return {
+                isValid: false,
+                message: "Invalid email format.",
+            };
+        }
+        const checkEmailMxRecords = yield (0, email_mx_lookup_1.default)(email);
+        if (!checkEmailMxRecords) {
+            return {
+                isValid: false,
+                message: "Email domain does not have valid MX records.",
+            };
+        }
+        if (welcomeEmailOptions) {
+            const welcomeEmail = yield (0, handleNodemailer_1.default)(welcomeEmailOptions);
+            if (!((_b = welcomeEmail === null || welcomeEmail === void 0 ? void 0 : welcomeEmail.accepted) === null || _b === void 0 ? void 0 : _b[0])) {
+                return {
+                    isValid: false,
+                    message: "Email verification failed.",
+                };
+            }
+        }
+        return {
+            isValid: true,
+            message: "Email is valid.",
+        };
+    });
+}

dist/package-shared/functions/email/verification/email-mx-lookup.d.ts

@@ -0,0 +1 @@
+export default function emailMxLookup(email?: string, debug?: boolean): Promise<boolean>;

dist/package-shared/functions/email/verification/email-mx-lookup.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = emailMxLookup;
+const dns_1 = __importDefault(require("dns"));
+const debug_log_1 = __importDefault(require("../../../utils/logging/debug-log"));
+function emailMxLookup(email, debug) {
+    return new Promise((resolve, reject) => {
+        if (!email) {
+            resolve(false);
+            return;
+        }
+        const domain = email.split("@")[1];
+        dns_1.default.resolveMx(domain, (err, addresses) => {
+            if (err || !addresses.length) {
+                if (debug) {
+                    (0, debug_log_1.default)({
+                        log: (err === null || err === void 0 ? void 0 : err.message) || "No MX records found",
+                        addTime: true,
+                        label: "Email MX Lookup",
+                        type: "error",
+                    });
+                }
+                resolve(false);
+            }
+            else {
+                if (debug) {
+                    (0, debug_log_1.default)({
+                        log: addresses,
+                        addTime: true,
+                        label: "MX Records",
+                    });
+                }
+                resolve(true);
+            }
+        });
+    });
+}

dist/package-shared/functions/email/verification/email-regex-test.d.ts

@@ -0,0 +1 @@
+export default function emailRegexCheck(email: string): boolean;

dist/package-shared/functions/email/verification/email-regex-test.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = emailRegexCheck;
+function emailRegexCheck(email) {
+    const regex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return regex.test(email);
+}

dist/package-shared/functions/email/verification/smtp-verification.d.ts

@@ -0,0 +1 @@
+export default function verifyEmailSMTP(email: string): Promise<boolean>;

dist/package-shared/functions/email/verification/smtp-verification.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = verifyEmailSMTP;
+const net_1 = __importDefault(require("net"));
+const dns_1 = __importDefault(require("dns"));
+function verifyEmailSMTP(email) {
+    return new Promise((resolve, reject) => {
+        const domain = email.split("@")[1];
+        dns_1.default.resolveMx(domain, (err, addresses) => {
+            if (err || !addresses.length) {
+                console.log("Invalid email domain.");
+                return;
+            }
+            const mxServer = addresses[0].exchange;
+            console.log(`Connecting to ${mxServer} to verify email...`);
+            const client = net_1.default.createConnection(25, mxServer);
+            client.on("connect", () => {
+                console.log("Connected to SMTP server.");
+                client.write("HELO example.com\r\n");
+                client.write(`MAIL FROM: <test@example.com>\r\n`);
+                client.write(`RCPT TO: <${email}>\r\n`);
+            });
+            client.on("data", (data) => {
+                const response = data.toString();
+                if (response.includes("250")) {
+                    console.log("✅ Email exists!");
+                    resolve(true);
+                }
+                else {
+                    console.log("❌ Email does not exist.");
+                    resolve(false);
+                }
+                client.end();
+            });
+            client.on("error", (err) => {
+                console.log("SMTP verification failed:", err.message);
+                resolve(false);
+            });
+        });
+    });
+}