From 950be757e02504071d3841c09424c07e58feb629 Mon Sep 17 00:00:00 2001
From: Fabien Forestier <fforestier@MacBookAir.local>
Date: Mon, 31 Aug 2020 17:29:20 +0200
Subject: [PATCH] Removing auth from SMTP config if null
---
src/configuration/config.service.ts | 17 ++++++++++-------
src/configuration/config.ts | 4 ++++
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/configuration/config.service.ts b/src/configuration/config.service.ts
index aca5e80..d32d553 100644
--- a/src/configuration/config.service.ts
+++ b/src/configuration/config.service.ts
@@ -11,13 +11,8 @@ export class ConfigService {
this._config.smtpConfig.port = process.env.SMTP_PORT;
if (process.env.SMTP_USER && process.env.SMTP_PASSWORD) {
- this._config.smtpConfig = {
- ...this._config.smtpConfig,
- auth: {
- user: process.env.SMTP_USER,
- pass: process.env.SMTP_PASSWORD,
- },
- };
+ this._config.smtpConfig.auth.user = process.env.SMTP_USER;
+ this._config.smtpConfig.auth.pass = process.env.SMTP_PASSWORD;
}
this._config.mailSubjectPrefix = process.env.MAIL_SUBJECT_PREFIX;
this._config.userSupportMailbox = process.env.USER_SUPPORT_MAILBOX;
@@ -30,6 +25,14 @@ export class ConfigService {
}
get config() {
+ const filteredConf = { ...this._config };
+
+ if (
+ !this._config.smtpConfig.auth.user &&
+ !this._config.smtpConfig.auth.pass
+ ) {
+ delete this._config.smtpConfig.auth;
+ }
return this._config;
}
}
diff --git a/src/configuration/config.ts b/src/configuration/config.ts
index 756ec28..661a923 100644
--- a/src/configuration/config.ts
+++ b/src/configuration/config.ts
@@ -7,6 +7,10 @@ export const config = {
// do not fail on invalid certs
rejectUnauthorized: false,
},
+ auth: {
+ user: null,
+ pass: null,
+ },
},
userSupportMailbox: '',
imageHost: '',
--
GitLab