saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-29 04:51:18 +00:00
Code Activity

Allow email changes for existing accounts even when signups are disabled

Browse source
This commit is contained in:
Jeremy Lin 2020-05-24 14:00:26 -07:00
commit a314933557
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/core/accounts.rs
View file

@ -379,8 +379,8 @@ fn post_email_token(data: JsonUpcase<EmailTokenData>, headers: Headers, conn: Db
err!("Email already in use");
}
if !CONFIG.is_signup_allowed(&data.NewEmail) {
err!("Email cannot be changed to this address");
if !CONFIG.is_email_domain_allowed(&data.NewEmail) {
err!("Email domain not allowed");
}
let token = crypto::generate_token(6)?;

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

@ -488,7 +488,7 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade
err!(format!("User does not exist: {}", email))
}
if !CONFIG.signups_domains_whitelist().is_empty() && !CONFIG.is_email_domain_whitelisted(&email) {
if !CONFIG.is_email_domain_allowed(&email) {
err!("Email domain not eligible for invitations")
}