nickslowinski/vaultwarden-test
1
0
Fork 0
geforkt von mirrored/vaultwarden
Code Pull-Requests Aktivität

Fix formatting and add vault link to notification emails

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nick Fox 2019-01-05 13:36:08 -05:00
Ursprung cec28a85ac
Commit 2f5bdc23f6
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 82719985805A7CA8
1 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

16
src/mail.rs
Datei anzeigen

@ -89,8 +89,8 @@ pub fn send_invite_accepted(
("Invitation accepted", ("Invitation accepted",
format!( format!(
"<html> "<html>
<p>Your invitation to <b>{}</b> to join <b>{}</b> was accepted. Please log in to the bitwarden_rs server and confirm them from the organization management page.</p> <p>Your invitation for <b>{}</b> to join <b>{}</b> was accepted. Please <a href=\"{}\">log in</a> to the bitwarden_rs server and confirm them from the organization management page.</p>
</html>", new_user_email, org_name)) </html>", new_user_email, org_name, CONFIG.domain))
}; };
send_email(&address, &subject, &body, &config) send_email(&address, &subject, &body, &config)
@ -105,8 +105,8 @@ pub fn send_invite_confirmed(
(format!("Invitation to {} confirmed", org_name), (format!("Invitation to {} confirmed", org_name),
format!( format!(
"<html> "<html>
<p>Your invitation to join <b>{}</b> was accepted. It will now appear under the Organizations the next time you log into the web vault.</p> <p>Your invitation to join <b>{}</b> was confirmed. It will now appear under the Organizations the next time you <a href=\"{}\">log in</a> to the web vault.</p>
</html>", org_name)) </html>", org_name, CONFIG.domain))
}; };
send_email(&address, &subject, &body, &config) send_email(&address, &subject, &body, &config)
@ -122,8 +122,8 @@ fn send_email(address: &str, subject: &str, body: &str, config: &MailConfig) ->
.build() .build()
.map_err(|e| Error::new("Error building email", e.to_string()))?; .map_err(|e| Error::new("Error building email", e.to_string()))?;
mailer(config) mailer(config)
.send(email.into()) .send(email.into())
.map_err(|e| Error::new("Error sending email", e.to_string())) .map_err(|e| Error::new("Error sending email", e.to_string()))
.and(Ok(())) .and(Ok(()))
} }