From 87c7b3295c8f541dcf80925d468a9f9b191e58f1 Mon Sep 17 00:00:00 2001 From: stringsplit <77242831+nbitzz@users.noreply.github.com> Date: Thu, 23 May 2024 18:23:13 +0000 Subject: [PATCH] disable mail when not available --- src/server/lib/mail.ts | 4 +++- src/server/routes/api/v1/account/index.ts | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/lib/mail.ts b/src/server/lib/mail.ts index dff530f..22c5f8d 100644 --- a/src/server/lib/mail.ts +++ b/src/server/lib/mail.ts @@ -20,7 +20,9 @@ const transport = createTransport({ * @param content Email content * @returns Promise which resolves to the output from nodemailer.transport.sendMail */ -export function sendMail(to: string, subject: string, content: string) { +export async function sendMail(to: string, subject: string, content: string) { + if (!config.mail.enabled) return false + return transport.sendMail({ to, subject, diff --git a/src/server/routes/api/v1/account/index.ts b/src/server/routes/api/v1/account/index.ts index 109b7f8..9908087 100644 --- a/src/server/routes/api/v1/account/index.ts +++ b/src/server/routes/api/v1/account/index.ts @@ -93,6 +93,8 @@ const validators: { requireProofOfIdentity: true, validator: (actor, target, params, ctx) => { + if (!Configuration.mail.enabled) return [501, "email not enabled on instance"] + if (!params.email) { if (target.email) { sendMail(