saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-18 01:23:56 +00:00
Code Activity

Merge pull request #1460 from jjlin/invitation-org-name

Browse source 
Fix custom org name in invitation confirmation email
This commit is contained in:
Mathijs van Veluw 2021-03-04 08:15:34 +01:00 • committed by GitHub
commit ce99fc8f95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -655,7 +655,7 @@ fn accept_invite(_org_id: String, _org_user_id: String, data: JsonUpcase<AcceptD
} }
if CONFIG.mail_enabled() { if CONFIG.mail_enabled() {
let mut org_name = String::from("bitwarden_rs"); let mut org_name = CONFIG.invitation_org_name();
if let Some(org_id) = &claims.org_id { if let Some(org_id) = &claims.org_id {
org_name = match Organization::find_by_uuid(&org_id, &conn) { org_name = match Organization::find_by_uuid(&org_id, &conn) {
Some(org) => org.name, Some(org) => org.name,