vw_small

commit 2edecf34fff71ec1c89c05b5f6c5b6121eed715d
parent 18bc8331f9a27421b3913af4a8f070255cf3caba
Author: vpl <vpl@vpl.me>
Date:   Tue, 15 Oct 2019 21:19:27 +0200

Use user_uuid instead of mut twofactor

Diffstat:
M
src/api/core/two_factor/email.rs
 | 
11
++++++-----
M
src/api/identity.rs
 | 
4
++--

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/api/core/two_factor/email.rs b/src/api/core/two_factor/email.rs
@@ -55,17 +55,18 @@ fn send_email_login(data: JsonUpcase<SendEmailLoginData>, conn: DbConn) -> Empty
         err!("Email 2FA is disabled")
     }
 
-    let type_ = TwoFactorType::Email as i32;
-    let mut twofactor = TwoFactor::find_by_user_and_type(&user.uuid, type_, &conn)?;
-
-    prepare_send_token(&mut twofactor, &conn)?;
+    send_token(&user.uuid, &conn)?;
 
     Ok(())
 }
 
 /// Generate the token, save the data for later verification and send email to user
-pub fn prepare_send_token(twofactor: &mut TwoFactor, conn: &DbConn) -> EmptyResult {
+pub fn send_token(user_uuid: &str, conn: &DbConn) -> EmptyResult {
+    let type_ = TwoFactorType::Email as i32;
+    let mut twofactor = TwoFactor::find_by_user_and_type(user_uuid, type_, &conn)?;
+
     let generated_token = generate_token(CONFIG.email_token_size())?;
+
     let mut twofactor_data = EmailTokenData::from_json(&twofactor.data)?;
     twofactor_data.set_token(generated_token);
     twofactor.data = twofactor_data.to_json();
diff --git a/src/api/identity.rs b/src/api/identity.rs
@@ -295,14 +295,14 @@ fn _json_err_twofactor(providers: &[i32], user_uuid: &str, conn: &DbConn) -> Api
             Some(tf_type @ TwoFactorType::Email) => {
                 use crate::api::core::two_factor as _tf;
 
-                let mut twofactor = match TwoFactor::find_by_user_and_type(user_uuid, tf_type as i32, &conn) {
+                let twofactor = match TwoFactor::find_by_user_and_type(user_uuid, tf_type as i32, &conn) {
                     Some(tf) => tf,
                     None => err!("No twofactor email registered"),
                 };
 
                 // Send email immediately if email is the only 2FA option
                 if providers.len() == 1 {
-                    _tf::email::prepare_send_token(&mut twofactor, &conn)?
+                    _tf::email::send_token(&user_uuid, &conn)?
                 }
 
                 let email_data = EmailTokenData::from_json(&twofactor.data)?;