feat(admin)!: remove request body for user deletion

Author: BobAnkh

netmito/src/api/admin.rs

@@ -22,7 +22,8 @@ use crate::{
 
 pub fn admin_router(st: InfraPool, cancel_token: CancellationToken) -> Router<InfraPool> {
     Router::new()
-        .route("/users", post(admin_create_user).delete(admin_delete_user))
+        .route("/users", post(admin_create_user))
+        .route("/users/{username}", delete(admin_delete_user))
         .route(
             "/users/{username}/password",
             post(admin_change_user_password),
@@ -83,16 +84,15 @@ pub async fn admin_create_user(
 pub async fn admin_delete_user(
     Extension(_): Extension<AuthAdminUser>,
     State(pool): State<InfraPool>,
-    Json(req): Json<DeleteUserReq>,
+    Path(username): Path<String>,
 ) -> ApiResult<Json<UserStateResp>> {
-    match service::user::change_user_state(&pool.db, req.username.clone(), UserState::Deleted).await
-    {
+    match service::user::change_user_state(&pool.db, username.clone(), UserState::Deleted).await {
         Ok(UserState::Deleted) => Ok(Json(UserStateResp {
             state: UserState::Deleted,
         })),
         Err(Error::DbError(DbErr::RecordNotUpdated)) => Err(ApiError::NotFound(format!(
             "User or group with name {}",
-            req.username
+            username
         ))),
         Err(e) => {
             tracing::error!("{}", e);

netmito/src/client/http.rs

@@ -218,13 +218,12 @@ impl MitoHttpClient {
         }
     }
 
-    pub async fn admin_delete_user(&mut self, req: DeleteUserReq) -> crate::error::Result<()> {
-        self.url.set_path("admin/users");
+    pub async fn admin_delete_user(&mut self, username: String) -> crate::error::Result<()> {
+        self.url.set_path(&format!("admin/users/{username}"));
         let resp = self
             .http_client
             .delete(self.url.as_str())
             .bearer_auth(&self.credential)
-            .json(&req)
             .send()
             .await
             .map_err(map_reqwest_err)?;

netmito/src/client/mod.rs

@@ -329,7 +329,7 @@ impl MitoClient {
         &mut self,
         args: AdminDeleteUserArgs,
     ) -> crate::error::Result<()> {
-        self.http_client.admin_delete_user(args.into()).await
+        self.http_client.admin_delete_user(args.username).await
     }
 
     pub async fn create_group(&mut self, args: CreateGroupArgs) -> crate::error::Result<()> {

netmito/src/config/client/admin.rs

@@ -1,8 +1,6 @@
 use clap::{Args, Subcommand};
 use serde::{Deserialize, Serialize};
 
-use crate::schema::DeleteUserReq;
-
 use super::{CancelWorkerArgs, DeleteArtifactArgs, DeleteAttachmentArgs};
 
 #[derive(Serialize, Debug, Deserialize, Args, derive_more::From, Clone)]
@@ -135,11 +133,3 @@ pub enum AdminWorkersCommands {
     /// Cancel a worker
     Cancel(CancelWorkerArgs),
 }
-
-impl From<AdminDeleteUserArgs> for DeleteUserReq {
-    fn from(args: AdminDeleteUserArgs) -> Self {
-        DeleteUserReq {
-            username: args.username,
-        }
-    }
-}

netmito/src/schema.rs

@@ -50,11 +50,6 @@ pub struct AdminChangePasswordReq {
     pub new_md5_password: [u8; 16],
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct DeleteUserReq {
-    pub username: String,
-}
-
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ChangeUserStateReq {
     pub state: UserState,