From 227ac30d5ed4b56a83c0ccc35694d46459871600 Mon Sep 17 00:00:00 2001
From: olivierIllogika <olivier.martin@illogika.com>
Date: Fri, 19 Jul 2024 07:54:55 -0400
Subject: [PATCH] add STMP_SECURE and changed auth config (#81)

* add STMP_SECURE and changed auth config
* relocated logic to mail.provider.ts
---
 .../integrations/environment/environment.service.ts |  7 +++++++
 .../integrations/mail/providers/mail.provider.ts    | 13 +++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/server/src/integrations/environment/environment.service.ts b/apps/server/src/integrations/environment/environment.service.ts
index 1dc71547..3d3a7dbb 100644
--- a/apps/server/src/integrations/environment/environment.service.ts
+++ b/apps/server/src/integrations/environment/environment.service.ts
@@ -87,6 +87,13 @@ export class EnvironmentService {
     return parseInt(this.configService.get<string>('SMTP_PORT'));
   }
 
+  getSmtpSecure(): boolean {
+    const secure = this.configService
+      .get<string>('SMTP_SECURE', 'false')
+      .toLowerCase();
+    return secure === 'true';
+  }
+
   getSmtpUsername(): string {
     return this.configService.get<string>('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 c7081894..d57470a2 100644
--- a/apps/server/src/integrations/mail/providers/mail.provider.ts
+++ b/apps/server/src/integrations/mail/providers/mail.provider.ts
@@ -26,16 +26,21 @@ export const mailDriverConfigProvider = {
 
     switch (driver) {
       case MailOption.SMTP:
+        let auth = undefined;
+        if (environmentService.getSmtpUsername() && environmentService.getSmtpPassword()) {
+          auth = {
+              user: environmentService.getSmtpUsername(),
+              pass: environmentService.getSmtpPassword(),
+            };
+        }
         return {
           driver,
           config: {
             host: environmentService.getSmtpHost(),
             port: environmentService.getSmtpPort(),
             connectionTimeout: 30 * 1000, // 30 seconds
-            auth: {
-              user: environmentService.getSmtpUsername(),
-              pass: environmentService.getSmtpPassword(),
-            },
+            auth,
+            secure: environmentService.getSmtpSecure(),
           } as SMTPTransport.Options,
         };