Refactor users_service

geneit_backend/src/controllers/auth_controller.rs

@@ -147,7 +147,7 @@ pub async fn reset_password(remote_ip: RemoteIP, req: web::Json<ResetPasswordBod
         return Ok(HttpResponse::TooManyRequests().finish());
     }
 
-    let user = match users_service::get_by_pwd_reset_token(&req.token).await {
+    let mut user = match users_service::get_by_pwd_reset_token(&req.token).await {
         Ok(t) => t,
         Err(e) => {
             rate_limiter_service::record_action(
@@ -168,10 +168,10 @@ pub async fn reset_password(remote_ip: RemoteIP, req: web::Json<ResetPasswordBod
     }
 
     // Validate account, if required
-    users_service::validate_account(&user).await?;
+    users_service::validate_account(&mut user).await?;
 
     // Change user password
-    users_service::change_password(&user, &req.password).await?;
+    users_service::change_password(&mut user, &req.password).await?;
 
     Ok(HttpResponse::Accepted().finish())
 }
@@ -298,10 +298,10 @@ pub async fn finish_openid_login(
         users_service::create_account(&name, &mail).await?;
     }
 
-    let user = users_service::get_by_mail(&mail).await?;
+    let mut user = users_service::get_by_mail(&mail).await?;
 
     // OpenID auth is enough to validate accounts
-    users_service::validate_account(&user).await?;
+    users_service::validate_account(&mut user).await?;
 
     finish_login(&user).await
 }

geneit_backend/src/controllers/user_controller.rs

@@ -49,7 +49,7 @@ pub async fn update_profile(token: LoginToken, profile: Json<ProfileUpdateQuery>
 
     let mut user = users_service::get_by_id(token.user_id).await?;
     user.name = profile.0.name;
-    users_service::update_account(user).await?;
+    users_service::update_account(&user).await?;
 
     Ok(HttpResponse::Accepted().finish())
 }
@@ -83,7 +83,7 @@ pub async fn replace_password(
         return Ok(HttpResponse::BadRequest().json("Nouveau mot de passe invalide!"));
     }
 
-    let user = users_service::get_by_id(token.user_id).await?;
+    let mut user = users_service::get_by_id(token.user_id).await?;
     if !user.check_password(&q.old_password) {
         rate_limiter_service::record_action(
             remote_ip.0,
@@ -93,7 +93,7 @@ pub async fn replace_password(
         return Ok(HttpResponse::BadRequest().json("Ancien mot de passe invalide !"));
     }
 
-    users_service::change_password(&user, &q.new_password).await?;
+    users_service::change_password(&mut user, &q.new_password).await?;
 
     Ok(HttpResponse::Accepted().finish())
 }