Add option to change invitation org name, fixes #825

Add option to allow additional iframe ancestors, fixes #843
Sort the rocket routes before printing them
This commit is contained in:
Daniel García
2020-02-04 22:14:50 +01:00
parent f5916ec396
commit 8867626de8
3 changed files with 14 additions and 5 deletions

View File

@@ -161,8 +161,7 @@ fn invite_user(data: Json<InviteData>, _token: AdminToken, conn: DbConn) -> Empt
user.save(&conn)?;
if CONFIG.mail_enabled() {
let org_name = "bitwarden_rs";
mail::send_invite(&user.email, &user.uuid, None, None, &org_name, None)
mail::send_invite(&user.email, &user.uuid, None, None, &CONFIG.invitation_org_name(), None)
} else {
let invitation = Invitation::new(data.email);
invitation.save(&conn)