octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-23 11:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-1878' of https://github.com/BlackDex/vaultwarden into BlackDex-fix-1878

Browse Source
This commit is contained in:
Daniel García 2021-08-22 22:12:52 +02:00
commit 978ef2bc8b
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/core/two_factor/email.rs
View File

@ -80,14 +80,16 @@ fn get_email(data: JsonUpcase<PasswordData>, headers: Headers, conn: DbConn) ->
err!("Invalid password"); err!("Invalid password");
} }
let type_ = TwoFactorType::Email as i32; let (enabled, mfa_email) = match TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Email as i32, &conn) {
let enabled = match TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn) { Some(x) => {
Some(x) => x.enabled, let twofactor_data = EmailTokenData::from_json(&x.data)?;
_ => false, (true, json!(twofactor_data.email))
}
_ => (false, json!(null)),
}; };
Ok(Json(json!({ Ok(Json(json!({
"Email": user.email, "Email": mfa_email,
"Enabled": enabled, "Enabled": enabled,
"Object": "twoFactorEmail" "Object": "twoFactorEmail"
}))) })))