Migrate axum to latest version

server/src/controllers/users.rs

@@ -120,7 +120,7 @@ impl UsersController {
         if request.username.is_some() || request.password.is_some() {
             Self::validate_user_input(
                 &username,
-                &request.password.as_deref().unwrap_or("validpassword"),
+                request.password.as_deref().unwrap_or("validpassword"),
             )?;
         }
 

server/src/main.rs

@@ -24,12 +24,12 @@ async fn main() -> Result<()> {
         
         .route("/admin/users", get(admin::get_users))
         .route("/admin/users", post(admin::create_user_handler))
-        .route("/admin/users/:id", put(admin::update_user_handler))
-        .route("/admin/users/:id", delete(admin::delete_user_handler))
+        .route("/admin/users/{id}", put(admin::update_user_handler))
+        .route("/admin/users/{id}", delete(admin::delete_user_handler))
         
         .route("/machines/register", post(machines::register_machine))
         .route("/machines", get(machines::get_machines))
-        .route("/machines/:id", delete(machines::delete_machine))
+        .route("/machines/{id}", delete(machines::delete_machine))
         
         .layer(CorsLayer::permissive())
         

server/src/utils/auth.rs

@@ -1,7 +1,6 @@
 use crate::controllers::auth::AuthController;
 use crate::utils::{models::*, DbPool};
 use axum::{
-    async_trait,
     extract::FromRequestParts,
     http::{header::AUTHORIZATION, request::Parts, StatusCode},
 };
@@ -11,7 +10,6 @@ pub struct AuthUser {
     pub user: User,
 }
 
-#[async_trait]
 impl<S> FromRequestParts<S> for AuthUser
 where
     S: Send + Sync,
@@ -49,7 +47,6 @@ pub struct AdminUser {
     pub user: User,
 }
 
-#[async_trait]
 impl<S> FromRequestParts<S> for AdminUser
 where
     S: Send + Sync,