saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-12 03:25:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update some function calls to use ?

Browse Source
This commit is contained in:
Daniel García
2019-01-15 21:47:16 +01:00
parent c259a0e3e2
commit d420992f8c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/core/two_factor.rs
View File

@@ -94,7 +94,7 @@ fn recover(data: JsonUpcase<RecoverTwoFactor>, conn: DbConn) -> JsonResult {
// Remove all twofactors from the user
for twofactor in TwoFactor::find_by_user(&user.uuid, &conn) {
twofactor.delete(&conn).expect("Error deleting twofactor");
twofactor.delete(&conn)?;
}
// Remove the recovery code, not needed without twofactors
@@ -123,7 +123,7 @@ fn disable_twofactor(data: JsonUpcase<DisableTwoFactorData>, headers: Headers, c
let type_ = data.Type.into_i32().expect("Invalid type");
if let Some(twofactor) = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn) {
twofactor.delete(&conn).expect("Error deleting twofactor");
twofactor.delete(&conn)?;
}
Ok(Json(json!({
@@ -205,7 +205,7 @@ fn activate_authenticator(data: JsonUpcase<EnableAuthenticatorData>, headers: He
}
_generate_recover_code(&mut user, &conn);
twofactor.save(&conn).expect("Error saving twofactor");
twofactor.save(&conn)?;
Ok(Json(json!({
"Enabled": true,