user forms added

backend/socket.io/serverSetup.ts

@@ -3,7 +3,7 @@ import type { Server as HttpServer } from "node:http";
 //import { fileURLToPath } from "node:url";
 import { instrument } from "@socket.io/admin-ui";
 import { Server } from "socket.io";
-import { auth } from "utils/auth.utils.js";
+
 import { createLogger } from "../logger/logger.controller.js";
 import { allowedOrigins } from "../utils/cors.utils.js";
 import { registerEmitter } from "./roomEmitter.socket.js";
@@ -15,6 +15,7 @@ const log = createLogger({ module: "socket.io", subModule: "setup" });
 
 //import type { Session, User } from "better-auth"; // adjust if needed
 import { protectedRooms } from "./roomDefinitions.socket.js";
+import { auth } from "../utils/auth.utils.js";
 
 // declare module "socket.io" {
 // 	interface Socket {

backend/utils/auth.utils.ts

@@ -77,7 +77,7 @@ export const auth = betterAuth({
 		minPasswordLength: 8, // optional config
 		resetPasswordTokenExpirySeconds: process.env.RESET_EXPIRY_SECONDS, // time in seconds
 		sendResetPassword: async ({ user, token }) => {
-			const frontendUrl = `${process.env.BETTER_AUTH_URL}/lst/app/user/resetpassword?token=${token}`;
+			const frontendUrl = `${process.env.URL}/lst/app/user/resetpassword?token=${token}`;
 			const expiryMinutes = Math.floor(
 				parseInt(process.env.RESET_EXPIRY_SECONDS ?? "3600", 10) / 60,
 			);
@@ -137,5 +137,3 @@ export const auth = betterAuth({
 		// },
 	},
 });
-
-type Session = typeof auth.$Infer.Session;

backend/utils/sendEmail.utils.ts

@@ -1,4 +1,3 @@
-import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
@@ -6,7 +5,6 @@ import type { Transporter } from "nodemailer";
 import nodemailer from "nodemailer";
 import type Mail from "nodemailer/lib/mailer/index.js";
 import type { Address } from "nodemailer/lib/mailer/index.js";
-import type SMTPTransport from "nodemailer/lib/smtp-transport/index.js";
 import hbs from "nodemailer-express-handlebars";
 import { returnFunc } from "./returnHelper.utils.js";
 import { tryCatch } from "./trycatch.utils.js";
@@ -24,62 +22,36 @@ interface EmailData {
 }
 
 export const sendEmail = async (data: EmailData) => {
-	let transporter: Transporter;
-	let fromEmail: string | Address;
+	const fromEmail: string = `DoNotReply@mail.alpla.com`;
+	const transporter: Transporter = nodemailer.createTransport({
+		host: "smtp.azurecomm.net",
+		port: 587,
+		//rejectUnauthorized: false,
+		tls: {
+			minVersion: "TLSv1.2",
+		},
+		auth: {
+			user: "donotreply@mail.alpla.com",
+			pass: process.env.SMTP_PASSWORD,
+		},
+		debug: true,
+	});
 
-	if (os.hostname().includes("OLP")) {
-		transporter = nodemailer.createTransport({
-			service: "gmail",
-			auth: {
-				user: process.env.EMAIL_USER,
-				pass: process.env.EMAIL_PASSWORD, // The 16-character App Password
-			},
-			//debug: true,
-		});
-
-		// update the from email
-		fromEmail = process.env.EMAIL_USER as string;
-
-		// update the from email
-		fromEmail = `donotreply@alpla.com`;
-	} else {
-		//create the servers smtp config
-		let host = `${os.hostname().replace("VMS006", "")}-smtp.alpla.net`;
-
-		if (os.hostname().includes("VMS036")) {
-			host = "USMCD1-smtp.alpla.net";
-		}
-
-		transporter = nodemailer.createTransport({
-			host: host,
-			port: 25,
-			rejectUnauthorized: false,
-			//secure: false,
-			// auth: {
-			//   user: "alplaprod",
-			//   pass: "obelix",
-			// },
-			debug: true,
-		} as SMTPTransport.Options);
-
-		// update the from email
-		fromEmail = `donotreply@alpla.com`;
-	}
-
-	// create the handlebars view
+	// creating the handlbar options
 	const viewPath = path.resolve(
 		path.dirname(fileURLToPath(import.meta.url)),
-		"./mailViews",
+		"../utils/mailViews/",
 	);
 
 	const handlebarOptions = {
 		viewEngine: {
 			extname: ".hbs",
-			defaultLayout: "",
+			//layoutsDir: path.resolve(viewPath, "layouts"), // Path to layouts directory
+			defaultLayout: "", // Specify the default layout
 			partialsDir: viewPath,
 		},
 		viewPath: viewPath,
-		extName: ".hbs",
+		extName: ".hbs", // File extension for Handlebars templates
 	};
 
 	transporter.use("compile", hbs(handlebarOptions));
@@ -89,7 +61,7 @@ export const sendEmail = async (data: EmailData) => {
 		to: data.email,
 		subject: data.subject,
 		//text: "You will have a reset token here and only have 30min to click the link before it expires.",
-		//html: emailTemplate("Blake's Test", "This is an example with css"),
+		//html: emailTemplate("BlakesTest", "This is an example with css"),
 		template: data.template, // Name of the Handlebars template (e.g., 'welcome.hbs')
 		context: data.context,
 	};