diff --git a/src/actors/users_actor.rs b/src/actors/users_actor.rs index afa8326..be97d40 100644 --- a/src/actors/users_actor.rs +++ b/src/actors/users_actor.rs @@ -60,11 +60,8 @@ pub struct Clear2FALoginHistory(pub UserID); #[rtype(result = "bool")] pub struct UpdateUserRequest(pub User); -#[derive(Debug)] -pub struct DeleteUserResult(pub bool); - #[derive(Message)] -#[rtype(DeleteUserResult)] +#[rtype(result = "bool")] pub struct DeleteUserRequest(pub UserID); pub struct UsersActor { @@ -168,7 +165,7 @@ impl Handler for UsersActor { } impl Handler for UsersActor { - type Result = MessageResult; + type Result = ::Result; fn handle(&mut self, msg: DeleteUserRequest, _ctx: &mut Self::Context) -> Self::Result { let user = match self.manager.find_by_user_id(&msg.0) { @@ -177,17 +174,17 @@ impl Handler for UsersActor { "Could not delete account {:?} because it was not found!", msg.0 ); - return MessageResult(DeleteUserResult(false)); + return false; } Some(s) => s, }; - MessageResult(DeleteUserResult(match self.manager.remove(&user) { + match self.manager.remove(&user) { Ok(_) => true, Err(e) => { log::error!("Failed to update delete account! {:?}", e); false } - })) + } } } diff --git a/src/controllers/admin_api.rs b/src/controllers/admin_api.rs index 684665e..a32ebca 100644 --- a/src/controllers/admin_api.rs +++ b/src/controllers/admin_api.rs @@ -56,7 +56,7 @@ pub async fn delete_user( }; let res = users.send(DeleteUserRequest(req.0.user_id)).await.unwrap(); - if res.0 { + if res { action_logger.log(Action::AdminDeleteUser(&user)); HttpResponse::Ok().finish() } else {