starred/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-12-28 01:11:35 +03:00
Code Issues 429 Packages Projects Releases 10 Wiki Activity

automatically use email address as 2fa provider (#4317)

Browse Source
This commit is contained in:
Stefan Melmuk
2024-03-17 22:35:02 +01:00
committed by GitHub
parent 7c3cad197c
commit 79ce5b49bc
7 changed files with 90 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/admin.rs
View File

@@ -510,7 +510,11 @@ async fn update_user_org_type(data: Json<UserOrgTypeData>, token: AdminToken, mu
match OrgPolicy::is_user_allowed(&user_to_edit.user_uuid, &user_to_edit.org_uuid, true, &mut conn).await {
Ok(_) => {}
Err(OrgPolicyErr::TwoFactorMissing) => {
err!("You cannot modify this user to this type because it has no two-step login method activated");
if CONFIG.email_2fa_auto_fallback() {
two_factor::email::find_and_activate_email_2fa(&user_to_edit.user_uuid, &mut conn).await?;
} else {
err!("You cannot modify this user to this type because they have not setup 2FA");
}
}
Err(OrgPolicyErr::SingleOrgEnforced) => {
err!("You cannot modify this user to this type because it is a member of an organization which forbids it");