fix: smtp error for SMTP_SECURE false. Added in .env

src/lib/auth/auth.ts

@@ -9,7 +9,7 @@ import {ac, admin, orgAdmin, orgMember, orgOwner, pending, superadmin, user} fro
 import {headers} from "next/headers";
 import {count, eq} from "drizzle-orm";
 import {MemberWithUser, OrganizationWithMembersAndUsers} from "@/db/schema/03_organization";
-import {sendEmail} from "@/lib/email/email-helper";
+import {sendEmail} from "@/lib/email";
 import {render} from "@react-email/render";
 import {AuthProviderConfig, SUPPORTED_PROVIDERS} from "../../../portabase.config";
 import {withUpdatedAt} from "@/db/utils";

src/lib/email/email-helper.ts

@@ -1,104 +0,0 @@
-"use server";
-
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import nodemailer from "nodemailer";
-import * as drizzleDb from "@/db";
-
-type Payload = {
-    to: string;
-    from?: string;
-    subject: string;
-    html: any;
-};
-
-type Server = {
-    host: string;
-    port: number;
-    user: string;
-    pass: string;
-    from: string;
-};
-
-type EmailCustomProps = {
-    data: Payload;
-    server: Server;
-};
-
-type EmailMassProps = {
-    data: Payload;
-    servers: Server[];
-};
-
-export const sendEmail = async (data: Payload) => {
-    const settings = await db
-        .select()
-        .from(drizzleDb.schemas.setting)
-        .where(eq(drizzleDb.schemas.setting.name, "system"))
-        .then((res) => res[0]);
-
-    if (!settings) {
-        throw new Error("SMTP system settings not found.");
-    }
-
-    if (!settings.smtpHost || !settings.smtpPort || !settings.smtpUser || !settings.smtpPassword || !settings.smtpFrom) {
-        console.warn("Incomplete SMTP settings. Email not sent.");
-        return;
-    }
-
-    const emailsArray = data.to.split(",")
-        .map(email => email.trim());
-
-
-    const transporter = nodemailer.createTransport({
-        pool: true,
-        host: settings.smtpHost ?? "",
-        port: parseInt(settings.smtpPort ?? "587"),
-        secure: true,
-        auth: {
-            user: settings.smtpUser ?? "",
-            pass: settings.smtpPassword ?? "",
-        },
-    });
-
-    return await transporter.sendMail({
-        ...data,
-        to: emailsArray,
-        from: settings.smtpFrom ?? undefined,
-    });
-};
-
-export const sendCustomEmail = async (data: EmailCustomProps) => {
-    const transporter = nodemailer.createTransport({
-        secure: true,
-        replyTo: data.server.user,
-        host: data.server.host,
-        port: data.server.port,
-        auth: {
-            user: data.server.user,
-            pass: data.server.pass,
-        },
-    });
-
-    return await transporter.sendMail({
-        ...data.data,
-    });
-};
-
-export const sendMassEmail = async (data: EmailMassProps) => {
-    for (const server of data.servers) {
-        const transporter = nodemailer.createTransport({
-            secure: true,
-            host: server.host,
-            port: server.port,
-            auth: {
-                user: server.user,
-                pass: server.pass,
-            },
-        });
-
-        return await transporter.sendMail({
-            ...data.data,
-        });
-    }
-};

src/lib/email/helpers.ts

@@ -0,0 +1,15 @@
+import nodemailer from "nodemailer";
+
+export const createTransporter = (server: Server) => {
+    const portNumber = Number(server.port);
+    return nodemailer.createTransport({
+        pool: true,
+        host: server.host,
+        port: portNumber,
+        secure: server.secure ?? portNumber === 465,
+        auth: {
+            user: server.user,
+            pass: server.pass,
+        },
+    });
+};

src/lib/email/index.ts

@@ -0,0 +1,41 @@
+"use server"
+import {db} from "@/db";
+import {eq} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {createTransporter} from "@/lib/email/helpers";
+
+export const sendEmail = async (data: Payload) => {
+    const settings = await db
+        .select()
+        .from(drizzleDb.schemas.setting)
+        .where(eq(drizzleDb.schemas.setting.name, "system"))
+        .then((res) => res[0]);
+
+    if (!settings) {
+        throw new Error("SMTP system settings not found.");
+    }
+
+    if (!settings.smtpHost || !settings.smtpPort || !settings.smtpUser || !settings.smtpPassword || !settings.smtpFrom) {
+        console.warn("Incomplete SMTP settings. Email not sent.");
+        return;
+    }
+
+    const emailsArray = data.to.split(",")
+        .map(email => email.trim());
+
+    const transporter = createTransporter({
+        host: settings.smtpHost,
+        port: Number(settings.smtpPort),
+        user: settings.smtpUser,
+        pass: settings.smtpPassword,
+        from: settings.smtpFrom,
+        secure: settings.smtpSecure ?? false,
+    });
+    await transporter.verify();
+
+    return await transporter.sendMail({
+        ...data,
+        to: emailsArray,
+        from: settings.smtpFrom ?? undefined,
+    });
+};

src/lib/email/types.ts

@@ -0,0 +1,19 @@
+"use server";
+
+
+type Payload = {
+    to: string;
+    from?: string;
+    subject: string;
+    html: any;
+};
+
+type Server = {
+    host: string;
+    port: number;
+    user: string;
+    pass: string;
+    from: string;
+    secure: boolean;
+};
+