From 2f5bdc23f667c4c601c3533eeda72524b7f0d576 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Sat, 5 Jan 2019 13:36:08 -0500 Subject: [PATCH] Fix formatting and add vault link to notification emails --- src/mail.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mail.rs b/src/mail.rs index a5591f2a..93de0320 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -89,8 +89,8 @@ pub fn send_invite_accepted( ("Invitation accepted", format!( " -

Your invitation to {} to join {} was accepted. Please log in to the bitwarden_rs server and confirm them from the organization management page.

- ", new_user_email, org_name)) +

Your invitation for {} to join {} was accepted. Please log in to the bitwarden_rs server and confirm them from the organization management page.

+ ", new_user_email, org_name, CONFIG.domain)) }; send_email(&address, &subject, &body, &config) @@ -105,8 +105,8 @@ pub fn send_invite_confirmed( (format!("Invitation to {} confirmed", org_name), format!( " -

Your invitation to join {} was accepted. It will now appear under the Organizations the next time you log into the web vault.

- ", org_name)) +

Your invitation to join {} was confirmed. It will now appear under the Organizations the next time you log in to the web vault.

+ ", org_name, CONFIG.domain)) }; send_email(&address, &subject, &body, &config) @@ -122,8 +122,8 @@ fn send_email(address: &str, subject: &str, body: &str, config: &MailConfig) -> .build() .map_err(|e| Error::new("Error building email", e.to_string()))?; -mailer(config) - .send(email.into()) - .map_err(|e| Error::new("Error sending email", e.to_string())) - .and(Ok(())) + mailer(config) + .send(email.into()) + .map_err(|e| Error::new("Error sending email", e.to_string())) + .and(Ok(())) } \ No newline at end of file