vw_small

commit 978ef2bc8b812cf98ba4fdf4f996607d588058f5
parent 1fe9f101bec4956e6f30c5435031a559a0177fc1
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Sun, 22 Aug 2021 22:12:52 +0200

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

Diffstat:
M
src/api/core/two_factor/email.rs
 | 
12
+++++++-----

1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/api/core/two_factor/email.rs b/src/api/core/two_factor/email.rs
@@ -80,14 +80,16 @@ fn get_email(data: JsonUpcase<PasswordData>, headers: Headers, conn: DbConn) -> 
         err!("Invalid password");
     }
 
-    let type_ = TwoFactorType::Email as i32;
-    let enabled = match TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn) {
-        Some(x) => x.enabled,
-        _ => false,
+    let (enabled, mfa_email) = match TwoFactor::find_by_user_and_type(&user.uuid, TwoFactorType::Email as i32, &conn) {
+        Some(x) => {
+            let twofactor_data = EmailTokenData::from_json(&x.data)?;
+            (true, json!(twofactor_data.email))
+        }
+        _ => (false, json!(null)),
     };
 
     Ok(Json(json!({
-        "Email": user.email,
+        "Email": mfa_email,
         "Enabled": enabled,
         "Object": "twoFactorEmail"
     })))