chore: Get rid of serde_qs entirely

Author: RemiBardon

Cargo.lock

@@ -45,7 +45,6 @@ sea-orm-migration = { version = "1", default-features = false }
 secrecy = { version = "0.8", default-features = false }
 serde = { version = "1", default-features = false }
 serde_json = { version = "1", default-features = false }
-serde_qs = { version = "0.13", default-features = false }
 serde_with = { version = "3", default-features = false }
 service = { path = "crates/service" }
 strum = { version = "0.26", default-features = false }

Cargo.toml

@@ -22,7 +22,7 @@ axum = { workspace = true, features = [
     "tokio",
     "http2",
 ] }
-axum-extra = { workspace = true, features = ["cookie"] }
+axum-extra = { workspace = true, features = ["cookie", "query"] }
 base64 = { workspace = true }
 chrono = { workspace = true }
 form_urlencoded = { workspace = true }
@@ -35,7 +35,6 @@ lazy_static = { workspace = true }
 secrecy = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-serde_qs = { workspace = true }
 serde_with = { workspace = true }
 service = { workspace = true }
 strum = { workspace = true, features = ["derive"] }

crates/rest-api/Cargo.toml

@@ -13,6 +13,7 @@ use axum::{
     },
     Json,
 };
+use axum_extra::extract::Query;
 use futures::Stream;
 use serde::{Deserialize, Serialize};
 use service::{
@@ -25,7 +26,7 @@ use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 use tracing::trace;
 
-use crate::{error::Error, forms::QsQuery, AppState};
+use crate::{error::Error, AppState};
 
 use super::Member;
 
@@ -45,7 +46,7 @@ pub struct JIDs {
 
 pub async fn enrich_members_route(
     member_service: MemberService,
-    QsQuery(JIDs { jids }): QsQuery<JIDs>,
+    Query(JIDs { jids }): Query<JIDs>,
     app_config: AppConfig,
 ) -> Result<Json<HashMap<BareJid, EnrichedMember>>, Error> {
     let jids_count = jids.len();
@@ -70,7 +71,7 @@ pub async fn enrich_members_route(
 
 pub async fn enrich_members_stream_route(
     member_service: MemberService,
-    QsQuery(JIDs { jids }): QsQuery<JIDs>,
+    Query(JIDs { jids }): Query<JIDs>,
     State(AppState { app_config, .. }): State<AppState>,
 ) -> Result<Sse<impl Stream<Item = Result<Event, Infallible>>>, Error> {
     let member_service = Arc::new(member_service);

crates/rest-api/src/features/members/enrich_members.rs

@@ -3,7 +3,7 @@
 // Copyright: 2024–2025, Rémi Bardon <[email protected]>
 // License: Mozilla Public License v2.0 (MPL v2.0)
 
-use crate::{forms::qs_query::rename_repeated_query_param_names, AppState};
+use crate::{forms::multi_value_items::rename_bracketed_query_param_names, AppState};
 
 pub mod startup_actions;
 
@@ -36,5 +36,5 @@ pub(super) fn router(app_state: AppState) -> axum::Router {
         .merge(roles::router(app_state.clone()))
         .merge(server_config::router(app_state.clone()))
         .merge(workspace_details::router(app_state.clone()))
-        .layer(tower::ServiceBuilder::new().map_request(rename_repeated_query_param_names))
+        .layer(tower::ServiceBuilder::new().map_request(rename_bracketed_query_param_names))
 }

crates/rest-api/src/features/mod.rs

@@ -4,12 +4,10 @@
 // License: Mozilla Public License v2.0 (MPL v2.0)
 
 mod interval;
+pub mod multi_value_items;
 mod pagination;
-pub mod qs_query;
-mod strict_qs_query;
 mod timestamp;
 
 pub use interval::Interval;
 pub use pagination::Pagination;
-pub use qs_query::QsQuery;
 pub use timestamp::Timestamp;

crates/rest-api/src/forms/mod.rs

@@ -0,0 +1,26 @@
+// prose-pod-api
+//
+// Copyright: 2025, Rémi Bardon <[email protected]>
+// License: Mozilla Public License v2.0 (MPL v2.0)
+
+use axum::{extract::Request, http::uri};
+
+/// The Prose Pod API should support repeated query parameters using
+/// non-indexed brackets (e.g. `jids[][email protected]&jids[][email protected]`).
+/// Both [`axum::extract::Query`] and [`axum_extra::extract::Query`] don't support it,
+/// but by removing the brackets, we can leverage [`axum_extra::extract::Query`]'s
+/// support for multi-value items and achieve the desired behavior.
+pub fn rename_bracketed_query_param_names(req: Request) -> Request {
+    let (mut head, body) = req.into_parts();
+    let uri = head.uri.clone();
+
+    let query = uri.query().unwrap_or_default();
+    let new_query = query.replace("[]=", "=");
+
+    head.uri = uri::Builder::from(uri.clone())
+        .path_and_query(format!("{path}?{new_query}", path = uri.clone().path()))
+        .build()
+        .unwrap();
+
+    Request::from_parts(head, body)
+}