fix(api): add mail from header

Jozwiaczek · Mar 29, 2021 · 1874353 · 1874353
1 parent 1105002
commit 1874353
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/packages/api/src/modules/config/config-loader.ts b/packages/api/src/modules/config/config-loader.ts
@@ -74,8 +74,9 @@ export class ConfigLoader {
           user: this.envConfigService.get('ETHEREAL_USER'),
           pass: this.envConfigService.get('ETHEREAL_PASSWORD'),
         },
-        sender: this.envConfigService.get('SENDER'),
-        replyTo: this.envConfigService.get('REPLY_TO', isProd),
+        sender: this.envConfigService.get('SENDER', false) || defaultValues.mailer.sender,
+        replyTo: this.envConfigService.get('REPLY_TO', false) || defaultValues.mailer.replyTo,
+        from: this.envConfigService.get('FROM', false) || defaultValues.mailer.from,
       },
       sentry: {
         debug: this.envConfigService.get('SENTRY_DEBUG', false, convertToBoolean),

diff --git a/packages/api/src/modules/config/config.ts b/packages/api/src/modules/config/config.ts
@@ -60,8 +60,9 @@ export class Config {
       user: string | undefined;
       pass: string | undefined;
     };
-    sender: string | undefined;
-    replyTo: string | undefined;
+    sender: string;
+    replyTo: string;
+    from: string;
   };
 
   passwordReset: {

diff --git a/packages/api/src/modules/config/defaultValues.ts b/packages/api/src/modules/config/defaultValues.ts
@@ -12,6 +12,12 @@ const defaultValues = {
       expirationTimeWithoutKeepMeLoggedIn: '12h',
     },
   },
+
+  mailer: {
+    from: 'no-reply@sg.com',
+    sender: 'Smart Gate',
+    replyTo: 'sg@gmail.com',
+  },
 };
 
 export default defaultValues;
diff --git a/packages/api/src/modules/mailer/config/mailer-config.service.ts b/packages/api/src/modules/mailer/config/mailer-config.service.ts
@@ -18,6 +18,7 @@ interface MailerConfig<T = MailerAuthConfig> {
 
 interface SendEmailConfig {
   sender: string;
+  from: string;
   replyTo: string;
 }
 
@@ -60,8 +61,9 @@ export class MailerConfigService {
 
   public getSendEmailConfig(): SendEmailConfig {
     return {
-      sender: this.config.mailer.sender || 'Smart Gate',
-      replyTo: this.config.mailer.replyTo || 'sg@gmail.com',
+      from: this.config.mailer.from,
+      sender: this.config.mailer.sender,
+      replyTo: this.config.mailer.replyTo,
     };
   }