chore: add from_name for sending emails

GaloyMoney · Feb 22, 2024 · 78e3473 · 78e3473
1 parent 1475778
commit 78e3473
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/core/notifications/notifications.yml b/core/notifications/notifications.yml
@@ -10,9 +10,11 @@ app:
     fcm:
       google_application_credentials_path: "./config/notifications/fake_service_account.json"
   # email_executor:
+  #   enabled: false
   #   smtp:
   #     username: ""
   #     from_email: ""
+  #     from_name: ""
   #     relay: ""
   #     port: 587
 # kratos_import:

diff --git a/core/notifications/src/email_executor/smtp/config.rs b/core/notifications/src/email_executor/smtp/config.rs
@@ -9,6 +9,8 @@ pub struct SmtpConfig {
     #[serde(default)]
     pub from_email: String,
     #[serde(default)]
+    pub from_name: String,
+    #[serde(default)]
     pub relay: String,
     #[serde(default = "default_smtp_port")]
     pub port: u16,

diff --git a/core/notifications/src/email_executor/smtp/mod.rs b/core/notifications/src/email_executor/smtp/mod.rs
@@ -16,6 +16,7 @@ use error::*;
 pub struct SmtpClient {
     client: AsyncSmtpTransport<Tokio1Executor>,
     from_email: String,
+    from_name: String,
 }
 
 impl SmtpClient {
@@ -29,6 +30,7 @@ impl SmtpClient {
         Ok(Self {
             client,
             from_email: config.from_email,
+            from_name: config.from_name,
         })
     }
 
@@ -38,7 +40,7 @@ impl SmtpClient {
         recipient_addr: GaloyEmailAddress,
     ) -> Result<(), SmtpError> {
         let email = Message::builder()
-            .from(Mailbox::new(None, self.from_email.parse()?))
+            .from(Mailbox::new(Some(self.from_name), self.from_email.parse()?))
             .to(Mailbox::new(None, recipient_addr.into_inner().parse()?))
             .subject(msg.subject)
             .header(ContentType::TEXT_HTML)