Update axum

Author: coolreader18

Cargo.lock

@@ -129,8 +129,8 @@ anymap = "0.12"
 arrayvec = "0.7.2"
 async-stream = "0.3.6"
 async-trait = "0.1.68"
-axum = { version = "0.7", features = ["tracing"] }
-axum-extra = { version = "0.9", features = ["typed-header"] }
+axum = { version = "0.8.4", features = ["tracing", "ws"] }
+axum-extra = { version = "0.10", features = ["typed-header"] }
 backtrace = "0.3.66"
 base64 = "0.21.2"
 bigdecimal = "0.4.7"

Cargo.toml

@@ -41,7 +41,6 @@ futures = "0.3"
 bytes = "1"
 tracing.workspace = true
 bytestring = "1"
-tokio-tungstenite.workspace = true
 itoa.workspace = true
 derive_more = "0.99.17"
 uuid.workspace = true

crates/client-api/Cargo.toml

@@ -264,7 +264,6 @@ pub struct SpacetimeAuthHeader {
     auth: Option<SpacetimeAuth>,
 }
 
-#[async_trait::async_trait]
 impl<S: NodeDelegate + Send + Sync> axum::extract::FromRequestParts<S> for SpacetimeAuthHeader {
     type Rejection = AuthorizationRejection;
     async fn from_request_parts(parts: &mut request::Parts, state: &S) -> Result<Self, Self::Rejection> {
@@ -341,7 +340,6 @@ impl SpacetimeAuthHeader {
 
 pub struct SpacetimeAuthRequired(pub SpacetimeAuth);
 
-#[async_trait::async_trait]
 impl<S: NodeDelegate + Send + Sync> axum::extract::FromRequestParts<S> for SpacetimeAuthRequired {
     type Rejection = AuthorizationRejection;
     async fn from_request_parts(parts: &mut request::Parts, state: &S) -> Result<Self, Self::Rejection> {

crates/client-api/src/auth.rs

@@ -778,14 +778,14 @@ where
             .route("/names", self.names_put)
             .route("/identity", self.identity_get)
             .route("/subscribe", self.subscribe_get)
-            .route("/call/:reducer", self.call_reducer_post)
+            .route("/call/{reducer}", self.call_reducer_post)
             .route("/schema", self.schema_get)
             .route("/logs", self.logs_get)
             .route("/sql", self.sql_post);
 
         axum::Router::new()
             .route("/", self.root_post)
-            .nest("/:name_or_identity", db_router)
+            .nest("/{name_or_identity}", db_router)
             .route_layer(axum::middleware::from_fn_with_state(ctx, anon_auth_middleware::<S>))
     }
 }

crates/client-api/src/routes/database.rs

@@ -125,7 +125,7 @@ where
 {
     use axum::routing::get;
     axum::Router::new().route(
-        "/:identity",
+        "/{identity}",
         get(get_energy_balance::<S>)
             .put(set_energy_balance::<S>)
             .post(add_energy::<S>),

crates/client-api/src/routes/energy.rs

@@ -144,6 +144,6 @@ where
         .route("/", post(create_identity::<S>))
         .route("/public-key", get(get_public_key::<S>))
         .route("/websocket-token", post(create_websocket_token::<S>))
-        .route("/:identity/verify", get(validate_token))
-        .route("/:identity/databases", get(get_databases::<S>))
+        .route("/{identity}/verify", get(validate_token))
+        .route("/{identity}/databases", get(get_databases::<S>))
 }