vividboarder/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs.git synced 2024-06-26 13:18:38 +00:00
Code Issues Releases Wiki Activity

Added SMTP_FROM_NAME

Browse Source
This commit is contained in:
Daniel García 2019-01-13 15:24:46 +01:00
parent 2fe919cc5e
commit 0e4a746eeb
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.template
View File

@ -86,6 +86,7 @@
## Note: if SMTP_USERNAME is specified, SMTP_PASSWORD is mandatory ## Note: if SMTP_USERNAME is specified, SMTP_PASSWORD is mandatory
# SMTP_HOST=smtp.domain.tld # SMTP_HOST=smtp.domain.tld
# SMTP_FROM=bitwarden-rs@domain.tld # SMTP_FROM=bitwarden-rs@domain.tld
# SMTP_FROM_NAME=Bitwarden_RS
# SMTP_PORT=587 # SMTP_PORT=587
# SMTP_SSL=true # SMTP_SSL=true
# SMTP_USERNAME=username # SMTP_USERNAME=username

2
src/mail.rs
View File

@ -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 { fn send_email(address: &str, subject: &str, body: &str, config: &MailConfig) -> EmptyResult {
let email = EmailBuilder::new() let email = EmailBuilder::new()
.to(address) .to(address)
.from((config.smtp_from.clone(), "Bitwarden-rs")) .from((config.smtp_from.clone(), config.smtp_from_name.clone()))
.subject(subject) .subject(subject)
.header(("Content-Type", "text/html")) .header(("Content-Type", "text/html"))
.body(body) .body(body)

4
src/main.rs
View File

@ -244,6 +244,7 @@ pub struct MailConfig {
smtp_port: u16, smtp_port: u16,
smtp_ssl: bool, smtp_ssl: bool,
smtp_from: String, smtp_from: String,
smtp_from_name: String,
smtp_username: Option<String>, smtp_username: Option<String>,
smtp_password: Option<String>, smtp_password: Option<String>,
} }
@ -263,6 +264,8 @@ impl MailConfig {
exit(1); 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_ssl = get_env_or("SMTP_SSL", true);
let smtp_port = get_env("SMTP_PORT").unwrap_or_else(|| if smtp_ssl { 587u16 } else { 25u16 }); 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_port,
smtp_ssl, smtp_ssl,
smtp_from, smtp_from,
smtp_from_name,
smtp_username, smtp_username,
smtp_password, smtp_password,
}) })