From 9390b39e35b2da52104d03419683cbd939621d38 Mon Sep 17 00:00:00 2001 From: Orion Date: Sat, 21 Sep 2024 02:57:50 +1000 Subject: [PATCH] Implement nodemailer ignore tls property (#299) --- .env.example | 1 + .../src/integrations/environment/environment.service.ts | 7 +++++++ .../src/integrations/mail/providers/mail.provider.ts | 1 + 3 files changed, 9 insertions(+) diff --git a/.env.example b/.env.example index 024104e..5bc884c 100644 --- a/.env.example +++ b/.env.example @@ -32,6 +32,7 @@ SMTP_PORT=587 SMTP_USERNAME= SMTP_PASSWORD= SMTP_SECURE=false +SMTP_IGNORETLS=false # Postmark driver config POSTMARK_TOKEN= diff --git a/apps/server/src/integrations/environment/environment.service.ts b/apps/server/src/integrations/environment/environment.service.ts index b6bd8cd..3385d0e 100644 --- a/apps/server/src/integrations/environment/environment.service.ts +++ b/apps/server/src/integrations/environment/environment.service.ts @@ -98,6 +98,13 @@ export class EnvironmentService { return secure === 'true'; } + getSmtpIgnoreTLS(): boolean { + const ignoretls = this.configService + .get('SMTP_IGNORETLS', 'false') + .toLowerCase(); + return ignoretls === 'true'; + } + getSmtpUsername(): string { return this.configService.get('SMTP_USERNAME'); } diff --git a/apps/server/src/integrations/mail/providers/mail.provider.ts b/apps/server/src/integrations/mail/providers/mail.provider.ts index 747bfd3..e960810 100644 --- a/apps/server/src/integrations/mail/providers/mail.provider.ts +++ b/apps/server/src/integrations/mail/providers/mail.provider.ts @@ -44,6 +44,7 @@ export const mailDriverConfigProvider = { connectionTimeout: 30 * 1000, // 30 seconds auth, secure: environmentService.getSmtpSecure(), + ignoreTLS: environmentService.getSmtpIgnoreTLS() } as SMTPTransport.Options, };