Implemented HA config parameters for mail functionality

glenndehaan · Aug 17, 2024 · c5cc756 · c5cc756
1 parent 46dd565
commit c5cc756
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/modules/mail.js b/modules/mail.js
@@ -8,25 +8,26 @@ const nodemailer = require('nodemailer');
 /**
  * Import own modules
  */
+const config = require('./config');
 const log = require('./log');
 
 /**
  * Define global variables
  */
-const smtpFrom = process.env.SMTP_FROM || '';
-const smtpHost = process.env.SMTP_HOST || '';
-const smtpPort = process.env.SMTP_PORT || 25;
-const smtpSecure = process.env.SMTP_SECURE || false;
-const smtpUsername = process.env.SMTP_USERNAME || '';
-const smtpPassword = process.env.SMTP_PASSWORD || '';
+const smtpFrom = config('smtp_from') || process.env.SMTP_FROM || '';
+const smtpHost = config('smtp_host') || process.env.SMTP_HOST || '';
+const smtpPort = config('smtp_port') || process.env.SMTP_PORT || 25;
+const smtpSecure = config('smtp_secure') || process.env.SMTP_SECURE || false;
+const smtpUsername = config('smtp_username') || process.env.SMTP_USERNAME || '';
+const smtpPassword = config('smtp_password') || process.env.SMTP_PASSWORD || '';
 
 /**
  * Create nodemailer transport
  */
 const transport = nodemailer.createTransport({
     host: smtpHost,
     port: parseInt(smtpPort),
-    secure: (smtpSecure === 'true'),
+    secure: (smtpSecure === 'true' || smtpSecure === true),
     auth: {
         user: smtpUsername,
         pass: smtpPassword

diff --git a/server.js b/server.js
@@ -46,9 +46,9 @@ const voucherCustom = config('voucher_custom') !== null ? config('voucher_custom
 const webService = process.env.SERVICE_WEB ? process.env.SERVICE_WEB !== 'false' : true;
 const apiService = config('service_api') || (process.env.SERVICE_API === 'true') || false;
 const authDisabled = (process.env.DISABLE_AUTH === 'true') || false;
-const smtpFrom = process.env.SMTP_FROM || '';
-const smtpHost = process.env.SMTP_HOST || '';
-const smtpPort = process.env.SMTP_PORT || 25;
+const smtpFrom = config('smtp_from') || process.env.SMTP_FROM || '';
+const smtpHost = config('smtp_host') || process.env.SMTP_HOST || '';
+const smtpPort = config('smtp_port') || process.env.SMTP_PORT || 25;
 
 /**
  * Output logo