Merge pull request #5802 from Turbo87/axum-path-params

Turbo87 · web-flow · commit ac3856a3f534 · 2023-01-03T21:52:42.000+01:00
RequestParamExt: Use `axum` path parameters if available
diff --git a/conduit-axum/src/fallback.rs b/conduit-axum/src/fallback.rs
@@ -3,13 +3,14 @@ use crate::error::ServiceError;
 use crate::file_stream::FileStream;
 use crate::{spawn_blocking, AxumResponse, ConduitResponse};
 
+use std::collections::BTreeMap;
 use std::error::Error;
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 
 use axum::body::{Body, HttpBody};
-use axum::extract::Extension;
+use axum::extract::{rejection::PathRejection, Extension, FromRequestParts, Path};
 use axum::handler::Handler as AxumHandler;
 use axum::response::IntoResponse;
 use conduit::{Handler, RequestExt};
@@ -57,18 +58,29 @@ where
 {
     type Future = Pin<Box<dyn Future<Output = AxumResponse> + Send>>;
 
-    fn call(self, request: Request<Body>, _state: S) -> Self::Future {
+    fn call(self, request: Request<Body>, state: S) -> Self::Future {
         Box::pin(async move {
             if let Err(response) = check_content_length(&request) {
                 return response.into_response();
             }
 
-            let (parts, body) = request.into_parts();
+            let (mut parts, body) = request.into_parts();
+
+            // Make `axum::Router` path params available to `conduit` compat
+            // handlers. (see [RequestParamsExt] below)
+            match Params::from_request_parts(&mut parts, &state).await {
+                Ok(path) => {
+                    parts.extensions.insert(path);
+                }
+                Err(PathRejection::MissingPathParams(_)) => {}
+                Err(err) => return err.into_response(),
+            };
 
             let full_body = match hyper::body::to_bytes(body).await {
                 Ok(body) => body,
                 Err(err) => return server_error_response(&err),
             };
+
             let request = Request::from_parts(parts, full_body);
 
             let Self(handler) = self;
@@ -174,3 +186,15 @@ fn check_content_length(request: &Request<Body>) -> Result<(), AxumResponse> {
 
     Ok(())
 }
+
+pub type Params = Path<BTreeMap<String, String>>;
+
+pub trait RequestParamsExt<'a> {
+    fn axum_params(self) -> Option<&'a Params>;
+}
+
+impl<'a> RequestParamsExt<'a> for &'a (dyn RequestExt + 'a) {
+    fn axum_params(self) -> Option<&'a Params> {
+        self.extensions().get::<Params>()
+    }
+}
diff --git a/conduit-axum/src/lib.rs b/conduit-axum/src/lib.rs
@@ -56,6 +56,7 @@ mod tokio_utils;
 pub use error::ServiceError;
 pub use fallback::{
     conduit_into_axum, CauseField, ConduitAxumHandler, ConduitFallback, ErrorField,
+    RequestParamsExt,
 };
 pub use server::Server;
 pub use tokio_utils::spawn_blocking;
diff --git a/src/controllers/util.rs b/src/controllers/util.rs
@@ -1,5 +1,6 @@
 use super::prelude::*;
 use crate::util::errors::{forbidden, internal, AppError, AppResult};
+use conduit_axum::RequestParamsExt;
 use conduit_router::RequestParams;
 
 /// The Origin header (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin)
@@ -30,6 +31,10 @@ pub trait RequestParamExt<'a> {
 
 impl<'a> RequestParamExt<'a> for &'a (dyn RequestExt + 'a) {
     fn param(self, key: &str) -> Option<&'a str> {
-        self.params().find(key)
+        return if let Some(params) = self.axum_params() {
+            params.0.get(key).map(|s| &s[..])
+        } else {
+            self.params().find(key)
+        };
     }
 }
