Merge factors type for authentication

src/controllers/settings_controller.rs

@@ -1,10 +1,10 @@
 use actix::Addr;
-use actix_web::{HttpResponse, Responder, web};
+use actix_web::{web, HttpResponse, Responder};
 use askama::Template;
 
-use crate::actors::{bruteforce_actor, users_actor};
 use crate::actors::bruteforce_actor::BruteForceActor;
 use crate::actors::users_actor::UsersActor;
+use crate::actors::{bruteforce_actor, users_actor};
 use crate::constants::{APP_NAME, MAX_FAILED_LOGIN_ATTEMPTS, MIN_PASS_LEN};
 use crate::data::current_user::CurrentUser;
 use crate::data::remote_ip::RemoteIP;
@@ -21,8 +21,12 @@ pub(crate) struct BaseSettingsPage {
 }
 
 impl BaseSettingsPage {
-    pub fn get(page_title: &'static str, user: &User,
-               danger_message: Option<String>, success_message: Option<String>) -> BaseSettingsPage {
+    pub fn get(
+        page_title: &'static str,
+        user: &User,
+        danger_message: Option<String>,
+        success_message: Option<String>,
+    ) -> BaseSettingsPage {
         Self {
             danger_message,
             success_message,
@@ -52,11 +56,14 @@ struct ChangePasswordPage {
 /// Account details page
 pub async fn account_settings_details_route(user: CurrentUser) -> impl Responder {
     let user = user.into();
-    HttpResponse::Ok()
-        .body(AccountDetailsPage {
+    HttpResponse::Ok().body(
+        AccountDetailsPage {
             _p: BaseSettingsPage::get("Account details", &user, None, None),
             u: user,
-        }.render().unwrap())
+        }
+        .render()
+        .unwrap(),
+    )
 }
 
 #[derive(serde::Deserialize)]
@@ -66,53 +73,71 @@ pub struct PassChangeRequest {
 }
 
 /// Change password route
-pub async fn change_password_route(user: CurrentUser,
-                                   users: web::Data<Addr<UsersActor>>,
-                                   req: Option<web::Form<PassChangeRequest>>,
-                                   bruteforce: web::Data<Addr<BruteForceActor>>,
-                                   remote_ip: RemoteIP) -> impl Responder {
+pub async fn change_password_route(
+    user: CurrentUser,
+    users: web::Data<Addr<UsersActor>>,
+    req: Option<web::Form<PassChangeRequest>>,
+    bruteforce: web::Data<Addr<BruteForceActor>>,
+    remote_ip: RemoteIP,
+) -> impl Responder {
     let mut danger = None;
     let mut success = None;
 
     let user: User = user.into();
 
-    let failed_attempts = bruteforce.send(bruteforce_actor::CountFailedAttempt { ip: remote_ip.into() }).await.unwrap();
+    let failed_attempts = bruteforce
+        .send(bruteforce_actor::CountFailedAttempt {
+            ip: remote_ip.into(),
+        })
+        .await
+        .unwrap();
     if failed_attempts > MAX_FAILED_LOGIN_ATTEMPTS {
-        danger = Some("Too many invalid password attempts. Please try to change your password later.".to_string());
+        danger = Some(
+            "Too many invalid password attempts. Please try to change your password later."
+                .to_string(),
+        );
     } else if let Some(req) = req {
-
         // Invalid password
         if !user.verify_password(&req.old_pass) {
             danger = Some("Old password is invalid!".to_string());
-            bruteforce.send(bruteforce_actor::RecordFailedAttempt { ip: remote_ip.into() }).await.unwrap();
+            bruteforce
+                .send(bruteforce_actor::RecordFailedAttempt {
+                    ip: remote_ip.into(),
+                })
+                .await
+                .unwrap();
         }
-
         // Password too short
         else if req.new_pass.len() < MIN_PASS_LEN {
             danger = Some("New password is too short!".to_string());
         }
-
         // Change password
         else {
-            let res = users.send(
-                users_actor::ChangePasswordRequest {
+            let res = users
+                .send(users_actor::ChangePasswordRequest {
                     user_id: user.uid.clone(),
                     new_password: req.new_pass.to_string(),
                     temporary: false,
-                }
-            ).await.unwrap().0;
+                })
+                .await
+                .unwrap()
+                .0;
 
             if !res {
-                danger = Some("An error occurred while trying to change your password!".to_string());
+                danger =
+                    Some("An error occurred while trying to change your password!".to_string());
             } else {
                 success = Some("Your password was successfully changed!".to_string());
             }
         }
     }
 
-    HttpResponse::Ok()
-        .body(ChangePasswordPage {
+    HttpResponse::Ok().body(
+        ChangePasswordPage {
             _p: BaseSettingsPage::get("Change password", &user, danger, success),
             min_pwd_len: MIN_PASS_LEN,
-        }.render().unwrap())
+        }
+        .render()
+        .unwrap(),
+    )
 }