Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-16 04:12:53 +01:00
Fix formatting and add vault link to notification emails
Dieser Commit ist enthalten in:
Ursprung
cec28a85ac
Commit
2f5bdc23f6
1 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
10
src/mail.rs
10
src/mail.rs
|
@ -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,7 +122,7 @@ 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(()))
|
||||||
|
|
Laden …
In neuem Issue referenzieren