MirrorHub/bitwarden_rs
0
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-12-15 01:53:43 +01:00
Code Issues Releases Wiki Activity

Send emails to inviters/invitees when invites are accepted/confirmed

Browse source
This commit is contained in:
Nick Fox 2019-01-02 22:20:39 -05:00
parent 43eb064351
commit 736c0e62f2
No known key found for this signature in database
GPG key ID: 82719985805A7CA8
2 changed files with 61 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/api/core/organizations.rs
View file

@ -513,9 +513,19 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade
user.email.clone(), user.email.clone(),
org_id.clone(), org_id.clone(),
Some(new_user.uuid.clone()), Some(new_user.uuid.clone()),
headers.user.email.clone(),
); );
let invite_token = encode_jwt(&claims); let invite_token = encode_jwt(&claims);
mail::send_invite(&email, &org_id, &new_user.uuid, &invite_token, &org_name, mail_config)?; let subject = format!("Join {}", &org_name);
let body = format!(
"<html>
<p>You have been invited to join the <b>{}</b> organization.<br><br>
<a href=\"{}/#/accept-organization/?organizationId={}&organizationUserId={}&email={}&organizationName={}&token={}\">Click here to join</a></p>
<p>If you do not wish to join this organization, you can safely ignore this email.</p>
</html>",
org_name, CONFIG.domain, org_id, &new_user.uuid, &user.email, org_name, invite_token
);
mail::send_email(&user.email, &subject, &body, mail_config)?;
} }
} }
@ -523,7 +533,7 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade
} }
#[post("/organizations/<org_id>/users/<user_org>/reinvite")] #[post("/organizations/<org_id>/users/<user_org>/reinvite")]
fn reinvite_user(org_id: String, user_org: String, _headers: AdminHeaders, conn: DbConn) -> EmptyResult { fn reinvite_user(org_id: String, user_org: String, headers: AdminHeaders, conn: DbConn) -> EmptyResult {
if !CONFIG.invitations_allowed { if !CONFIG.invitations_allowed {
err!("Invitations are not allowed.") err!("Invitations are not allowed.")
} }
@ -556,17 +566,20 @@ fn reinvite_user(org_id: String, user_org: String, _headers: AdminHeaders, conn:
user.email.clone(), user.email.clone(),
org_id.clone(), org_id.clone(),
Some(user_org.uuid.clone()), Some(user_org.uuid.clone()),
headers.user.email.clone(),
); );
let invite_token = encode_jwt(&claims); let invite_token = encode_jwt(&claims);
if let Some(ref mail_config) = CONFIG.mail { if let Some(ref mail_config) = CONFIG.mail {
mail::send_invite( let subject = format!("Join {}", &org_name);
&user.email, let body = format!(
&org_id, "<html>
&user_org.uuid, <p>You have been invited to join the <b>{}</b> organization.<br><br>
&invite_token, <a href=\"{}/#/accept-organization/?organizationId={}&organizationUserId={}&email={}&organizationName={}&token={}\">Click here to join</a></p>
&org_name, <p>If you do not wish to join this organization, you can safely ignore this email.</p>
mail_config, </html>",
)?; org_name, CONFIG.domain, org_id, user_org.uuid, &user.email, org_name, invite_token
);
mail::send_email(&user.email, &subject, &body, mail_config)?;
} }
Ok(()) Ok(())
@ -578,7 +591,12 @@ struct AcceptData {
Token: String, Token: String,
} }
fn generate_invite_claims(uuid: String, email: String, org_id: String, org_user_id: Option<String>) -> InviteJWTClaims { fn generate_invite_claims(uuid: String,
email: String,
org_id: String,
org_user_id: Option<String>,
inviter_email: String,
) -> InviteJWTClaims {
let time_now = Utc::now().naive_utc(); let time_now = Utc::now().naive_utc();
InviteJWTClaims { InviteJWTClaims {
nbf: time_now.timestamp(), nbf: time_now.timestamp(),
@ -588,6 +606,7 @@ fn generate_invite_claims(uuid: String, email: String, org_id: String, org_user_
email: email.clone(), email: email.clone(),
org_id: org_id.clone(), org_id: org_id.clone(),
user_org_id: org_user_id.clone(), user_org_id: org_user_id.clone(),
inviter_email: inviter_email.clone(),
} }
} }
@ -617,6 +636,19 @@ fn accept_invite(_org_id: String, _org_user_id: String, data: JsonUpcase<AcceptD
None => err!("Invited user not found"), None => err!("Invited user not found"),
} }
if let Some(ref mail_config) = CONFIG.mail {
let org_name = match Organization::find_by_uuid(&claims.org_id, &conn) {
Some(org) => org.name,
None => err!("Error looking up organization."),
};
let subject = "Invitation accepted";
let body = format!(
"<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>
</html>", claims.email, org_name);
mail::send_email(&claims.inviter_email, &subject, &body, mail_config)?;
}
Ok(()) Ok(())
} }
@ -649,6 +681,23 @@ fn confirm_invite(
None => err!("Invalid key provided"), None => err!("Invalid key provided"),
}; };
if let Some(ref mail_config) = CONFIG.mail {
let org_name = match Organization::find_by_uuid(&org_id, &conn) {
Some(org) => org.name,
None => err!("Error looking up organization."),
};
let address = match User::find_by_uuid(&user_to_confirm.user_uuid, &conn) {
Some(user) => user.email,
None => err!("Error looking up user."),
};
let subject = format!("Invitation to {} confirmed", org_name);
let body = format!(
"<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>
</html>", org_name);
mail::send_email(&address, &subject, &body, mail_config)?;
}
user_to_confirm.save(&conn) user_to_confirm.save(&conn)
} }

1
src/auth.rs
View file

@ -118,6 +118,7 @@ pub struct InviteJWTClaims {
pub email: String, pub email: String,
pub org_id: String, pub org_id: String,
pub user_org_id: Option<String>, pub user_org_id: Option<String>,
pub inviter_email: String,
} }
// //