From 0e4a746eeb18bd9e4c634f37c1b61697e22f4e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
 <dani-garcia@users.noreply.github.com>
Date: Sun, 13 Jan 2019 15:24:46 +0100
Subject: [PATCH] Added SMTP_FROM_NAME

---
 .env.template | 1 +
 src/mail.rs   | 2 +-
 src/main.rs   | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.env.template b/.env.template
index 421cb0c2..bb269638 100644
--- a/.env.template
+++ b/.env.template
@@ -86,6 +86,7 @@
 ## Note: if SMTP_USERNAME is specified, SMTP_PASSWORD is mandatory
 # SMTP_HOST=smtp.domain.tld
 # SMTP_FROM=bitwarden-rs@domain.tld
+# SMTP_FROM_NAME=Bitwarden_RS
 # SMTP_PORT=587
 # SMTP_SSL=true
 # SMTP_USERNAME=username
diff --git a/src/mail.rs b/src/mail.rs
index e41ec858..5e245b4b 100644
--- a/src/mail.rs
+++ b/src/mail.rs
@@ -125,7 +125,7 @@ pub fn send_invite_confirmed(address: &str, org_name: &str, config: &MailConfig)
 fn send_email(address: &str, subject: &str, body: &str, config: &MailConfig) -> EmptyResult {
     let email = EmailBuilder::new()
         .to(address)
-        .from((config.smtp_from.clone(), "Bitwarden-rs"))
+        .from((config.smtp_from.clone(), config.smtp_from_name.clone()))
         .subject(subject)
         .header(("Content-Type", "text/html"))
         .body(body)
diff --git a/src/main.rs b/src/main.rs
index a1c5a2b2..c440ef49 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -244,6 +244,7 @@ pub struct MailConfig {
     smtp_port: u16,
     smtp_ssl: bool,
     smtp_from: String,
+    smtp_from_name: String,
     smtp_username: Option<String>,
     smtp_password: Option<String>,
 }
@@ -263,6 +264,8 @@ impl MailConfig {
             exit(1);
         });
 
+        let smtp_from_name = get_env_or("SMTP_FROM_NAME", "Bitwarden_RS".into());
+
         let smtp_ssl = get_env_or("SMTP_SSL", true);
         let smtp_port = get_env("SMTP_PORT").unwrap_or_else(|| if smtp_ssl { 587u16 } else { 25u16 });
 
@@ -281,6 +284,7 @@ impl MailConfig {
             smtp_port,
             smtp_ssl,
             smtp_from,
+            smtp_from_name,
             smtp_username,
             smtp_password,
         })