chore: Update axum to 0.8

Fixes #115.
prose-im · Jan 17, 2025 · 36458aa · 36458aa
1 parent ba066d4
commit 36458aa
Show file tree

Hide file tree

Showing 26 changed files with 30 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,9 +13,9 @@ repository = "https://github.com/prose-im/prose-pod-api.git"
 [workspace.dependencies]
 anyhow = { version = "1", default-features = false }
 async-trait = { version = "0.1", default-features = false }
-axum = { version = "0.7", default-features = false }
-axum-extra = { version = "0.9", default-features = false }
-axum-test = { version = "16", default-features = false }
+axum = { version = "0.8", default-features = false }
+axum-extra = { version = "0.10", default-features = false }
+axum-test = { version = "17", default-features = false }
 base64 = { version = "0.22", default-features = false }
 chrono = { version = "0.4", default-features = false }
 cucumber = { version = "0.21", default-features = false }

diff --git a/crates/rest-api/src/features/auth/guards/auth_service.rs b/crates/rest-api/src/features/auth/guards/auth_service.rs
@@ -5,7 +5,6 @@
 
 use crate::guards::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::auth::AuthService {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/features/auth/guards/auth_token.rs b/crates/rest-api/src/features/auth/guards/auth_token.rs
@@ -10,7 +10,6 @@ use crate::guards::prelude::*;
 
 const PREFIX: &'static str = "Bearer ";
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::auth::auth_service::AuthToken {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/features/auth/guards/authenticated.rs b/crates/rest-api/src/features/auth/guards/authenticated.rs
@@ -57,7 +57,6 @@ use crate::guards::prelude::*;
 /// [`MemberService`]: service::members::MemberService
 pub struct Authenticated;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for Authenticated {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/features/auth/guards/basic_auth.rs b/crates/rest-api/src/features/auth/guards/basic_auth.rs
@@ -17,7 +17,6 @@ pub struct BasicAuth {
     pub password: SecretString,
 }
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for BasicAuth {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/features/auth/guards/is_admin.rs b/crates/rest-api/src/features/auth/guards/is_admin.rs
@@ -13,7 +13,6 @@ use crate::guards::prelude::*;
 /// but it'll do for now.
 pub struct IsAdmin;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for IsAdmin {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/features/auth/guards/user_info.rs b/crates/rest-api/src/features/auth/guards/user_info.rs
@@ -7,7 +7,6 @@ use service::auth::auth_service::AuthToken;
 
 use crate::guards::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::auth::UserInfo {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/features/init/guards/init_service.rs b/crates/rest-api/src/features/init/guards/init_service.rs
@@ -5,7 +5,6 @@
 
 use crate::guards::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::init::InitService {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/features/invitations/guards/invitation_service.rs b/crates/rest-api/src/features/invitations/guards/invitation_service.rs
@@ -7,7 +7,6 @@ use service::members::UnauthenticatedMemberService;
 
 use crate::guards::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::invitations::InvitationService {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/features/invitations/mod.rs b/crates/rest-api/src/features/invitations/mod.rs
@@ -37,20 +37,20 @@ pub(super) fn router(app_state: AppState) -> axum::Router {
                         .get(get_invitations_route),
                 )
                 .route(
-                    "/:invitation_id",
+                    "/{invitation_id}",
                     MethodRouter::new()
                         .get(get_invitation_route)
                         .delete(invitation_cancel_route),
                 )
-                .route("/:invitation_id/resend", post(invitation_resend_route))
+                .route("/{invitation_id}/resend", post(invitation_resend_route))
                 .route_layer(from_extractor_with_state::<IsAdmin, _>(app_state.clone())),
         )
         .nest(
             "/v1/invitation-tokens",
             axum::Router::new()
-                .route("/:token/details", get(get_invitation_by_token_route))
-                .route("/:token/accept", put(invitation_accept_route))
-                .route("/:token/reject", put(invitation_reject_route)),
+                .route("/{token}/details", get(get_invitation_by_token_route))
+                .route("/{token}/accept", put(invitation_accept_route))
+                .route("/{token}/reject", put(invitation_reject_route)),
         )
         .with_state(app_state)
 }
diff --git a/crates/rest-api/src/features/members/guards/member_service.rs b/crates/rest-api/src/features/members/guards/member_service.rs
@@ -7,7 +7,6 @@ use service::{auth::UserInfo, members::MemberServiceContext, xmpp::XmppService};
 
 use crate::guards::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::members::MemberService {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/features/members/guards/unauthenticated_member_service.rs b/crates/rest-api/src/features/members/guards/unauthenticated_member_service.rs
@@ -5,7 +5,6 @@
 
 use crate::guards::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::members::UnauthenticatedMemberService {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/features/members/mod.rs b/crates/rest-api/src/features/members/mod.rs
@@ -28,7 +28,7 @@ pub use self::get_members::*;
 pub use self::model::*;
 
 pub(crate) const MEMBERS_ROUTE: &'static str = "/v1/members";
-pub(crate) const MEMBER_ROUTE: &'static str = "/v1/members/:jid";
+pub(crate) const MEMBER_ROUTE: &'static str = "/v1/members/{jid}";
 
 pub(super) fn router(app_state: AppState) -> axum::Router {
     axum::Router::new()
@@ -43,9 +43,9 @@ pub(super) fn router(app_state: AppState) -> axum::Router {
             MEMBERS_ROUTE,
             axum::Router::new()
                 .route("/", get(get_members_route))
-                .route("/:jid", get(get_member_route))
+                .route("/{jid}", get(get_member_route))
                 .route(
-                    "/:jid",
+                    "/{jid}",
                     delete(delete_member_route)
                         .route_layer(from_extractor_with_state::<IsAdmin, _>(app_state.clone())),
                 ),

diff --git a/crates/rest-api/src/features/network_checks/guards/network_checker.rs b/crates/rest-api/src/features/network_checks/guards/network_checker.rs
@@ -7,7 +7,6 @@ use service::network_checks::NetworkChecker;
 
 use crate::guards::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for NetworkChecker {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/features/workspace_details/guards/workspace_service.rs b/crates/rest-api/src/features/workspace_details/guards/workspace_service.rs
@@ -10,7 +10,6 @@ use service::{
 
 use crate::{error::prelude::*, guards::prelude::*};
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for WorkspaceService {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/guards/app_config.rs b/crates/rest-api/src/guards/app_config.rs
@@ -5,7 +5,6 @@
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::AppConfig {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/guards/notification_service.rs b/crates/rest-api/src/guards/notification_service.rs
@@ -5,7 +5,6 @@
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::notifications::NotificationService {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/guards/pod_network_config.rs b/crates/rest-api/src/guards/pod_network_config.rs
@@ -12,7 +12,6 @@ use crate::features::init::PodAddressNotInitialized;
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::network_checks::PodNetworkConfig {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/guards/secrets_store.rs b/crates/rest-api/src/guards/secrets_store.rs
@@ -5,7 +5,6 @@
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::secrets::SecretsStore {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/guards/server_config.rs b/crates/rest-api/src/guards/server_config.rs
@@ -9,7 +9,6 @@ use crate::features::init::ServerConfigNotInitialized;
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for server_config::Model {
     type Rejection = error::Error;
 
@@ -24,7 +23,6 @@ impl FromRequestParts<AppState> for server_config::Model {
     }
 }
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::server_config::ServerConfig {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/guards/server_ctl.rs b/crates/rest-api/src/guards/server_ctl.rs
@@ -5,7 +5,6 @@
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::xmpp::ServerCtl {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/guards/server_manager.rs b/crates/rest-api/src/guards/server_manager.rs
@@ -7,7 +7,6 @@ use service::server_config::entities::server_config;
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::xmpp::ServerManager {
     type Rejection = error::Error;
 

diff --git a/crates/rest-api/src/guards/uuid_generator.rs b/crates/rest-api/src/guards/uuid_generator.rs
@@ -5,7 +5,6 @@
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for service::dependencies::Uuid {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/guards/xmpp_service.rs b/crates/rest-api/src/guards/xmpp_service.rs
@@ -10,7 +10,6 @@ use service::{
 
 use super::prelude::*;
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for XmppService {
     type Rejection = error::Error;
 
@@ -29,7 +28,6 @@ impl FromRequestParts<AppState> for XmppService {
     }
 }
 
-#[async_trait::async_trait]
 impl FromRequestParts<AppState> for XmppServiceInner {
     type Rejection = Infallible;
 

diff --git a/crates/rest-api/src/util/content_type_or.rs b/crates/rest-api/src/util/content_type_or.rs
@@ -76,7 +76,6 @@ where
 
 pub struct WithContentType<C>(PhantomData<C>);
 
-#[async_trait::async_trait]
 impl<S, C> FromRequestParts<S> for WithContentType<C>
 where
     C: ContentType,