chore: rerun axum samples

Author: AlexandreCassagne

samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION

@@ -1 +1 @@
-7.12.0-SNAPSHOT
+7.14.0-SNAPSHOT

samples/server/petstore/rust-axum/output/apikey-auths/README.md

@@ -12,7 +12,7 @@ server, you can easily generate a server stub.
 To see how to make this your own, look here: [README]((https://openapi-generator.tech))
 
 - API version: 1.0.0
-- Generator version: 7.12.0-SNAPSHOT
+- Generator version: 7.14.0-SNAPSHOT
 
 
 

samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs

@@ -26,6 +26,28 @@ pub trait CookieAuthentication {
     ) -> Option<Self::Claims>;
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum BasicAuthKind {
+    Basic,
+    Bearer,
+}
+
+/// API Key Authentication - Authentication Header.
+/// For `Basic token` and `Bearer token`
+#[async_trait::async_trait]
+pub trait ApiAuthBasic {
+    type Claims;
+
+    /// Extracting Claims from Header. Return None if the Claims are invalid.
+    async fn extract_claims_from_auth_header(
+        &self,
+        kind: BasicAuthKind,
+        headers: &axum::http::header::HeaderMap,
+        key: &str,
+    ) -> Option<Self::Claims>;
+}
+
 // Error handler for unhandled errors.
 #[async_trait::async_trait]
 pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {

samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs

@@ -51,6 +51,7 @@ pub trait Payments<E: std::fmt::Debug + Send + Sync + 'static = ()>:
         method: &Method,
         host: &Host,
         cookies: &CookieJar,
+        claims: &Self::Claims,
         path_params: &models::GetPaymentMethodByIdPathParams,
     ) -> Result<GetPaymentMethodByIdResponse, E>;
 
@@ -62,6 +63,7 @@ pub trait Payments<E: std::fmt::Debug + Send + Sync + 'static = ()>:
         method: &Method,
         host: &Host,
         cookies: &CookieJar,
+        claims: &Self::Claims,
     ) -> Result<GetPaymentMethodsResponse, E>;
 
     /// Make a payment.

samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs

@@ -34,7 +34,7 @@ where
             get(get_payment_methods::<I, A, E, C>),
         )
         .route(
-            "/v71/paymentMethods/:id",
+            "/v71/paymentMethods/{id}",
             get(get_payment_method_by_id::<I, A, E, C>),
         )
         .route("/v71/payments", post(post_make_payment::<I, A, E, C>))
@@ -55,14 +55,28 @@ async fn get_payment_method_by_id<I, A, E, C>(
     method: Method,
     host: Host,
     cookies: CookieJar,
+    headers: HeaderMap,
     Path(path_params): Path<models::GetPaymentMethodByIdPathParams>,
     State(api_impl): State<I>,
 ) -> Result<Response, StatusCode>
 where
     I: AsRef<A> + Send + Sync,
-    A: apis::payments::Payments<E, Claims = C> + Send + Sync,
+    A: apis::payments::Payments<E, Claims = C> + apis::ApiAuthBasic<Claims = C> + Send + Sync,
     E: std::fmt::Debug + Send + Sync + 'static,
 {
+    // Authentication
+    let claims_in_auth_header = api_impl
+        .as_ref()
+        .extract_claims_from_auth_header(apis::BasicAuthKind::Bearer, &headers, "authorization")
+        .await;
+    let claims = None.or(claims_in_auth_header);
+    let Some(claims) = claims else {
+        return Response::builder()
+            .status(StatusCode::UNAUTHORIZED)
+            .body(Body::empty())
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR);
+    };
+
     #[allow(clippy::redundant_closure)]
     let validation =
         tokio::task::spawn_blocking(move || get_payment_method_by_id_validation(path_params))
@@ -78,7 +92,7 @@ where
 
     let result = api_impl
         .as_ref()
-        .get_payment_method_by_id(&method, &host, &cookies, &path_params)
+        .get_payment_method_by_id(&method, &host, &cookies, &claims, &path_params)
         .await;
 
     let mut response = Response::builder();
@@ -158,13 +172,27 @@ async fn get_payment_methods<I, A, E, C>(
     method: Method,
     host: Host,
     cookies: CookieJar,
+    headers: HeaderMap,
     State(api_impl): State<I>,
 ) -> Result<Response, StatusCode>
 where
     I: AsRef<A> + Send + Sync,
-    A: apis::payments::Payments<E, Claims = C> + Send + Sync,
+    A: apis::payments::Payments<E, Claims = C> + apis::ApiAuthBasic<Claims = C> + Send + Sync,
     E: std::fmt::Debug + Send + Sync + 'static,
 {
+    // Authentication
+    let claims_in_auth_header = api_impl
+        .as_ref()
+        .extract_claims_from_auth_header(apis::BasicAuthKind::Bearer, &headers, "authorization")
+        .await;
+    let claims = None.or(claims_in_auth_header);
+    let Some(claims) = claims else {
+        return Response::builder()
+            .status(StatusCode::UNAUTHORIZED)
+            .body(Body::empty())
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR);
+    };
+
     #[allow(clippy::redundant_closure)]
     let validation = tokio::task::spawn_blocking(move || get_payment_methods_validation())
         .await
@@ -179,7 +207,7 @@ where
 
     let result = api_impl
         .as_ref()
-        .get_payment_methods(&method, &host, &cookies)
+        .get_payment_methods(&method, &host, &cookies, &claims)
         .await;
 
     let mut response = Response::builder();
@@ -250,13 +278,15 @@ async fn post_make_payment<I, A, E, C>(
     method: Method,
     host: Host,
     cookies: CookieJar,
+    headers: HeaderMap,
     State(api_impl): State<I>,
     Json(body): Json<Option<models::Payment>>,
 ) -> Result<Response, StatusCode>
 where
     I: AsRef<A> + Send + Sync,
     A: apis::payments::Payments<E, Claims = C>
         + apis::CookieAuthentication<Claims = C>
+        + apis::ApiAuthBasic<Claims = C>
         + Send
         + Sync,
     E: std::fmt::Debug + Send + Sync + 'static,
@@ -266,7 +296,11 @@ where
         .as_ref()
         .extract_claims_from_cookie(&cookies, "X-API-Key")
         .await;
-    let claims = None.or(claims_in_cookie);
+    let claims_in_auth_header = api_impl
+        .as_ref()
+        .extract_claims_from_auth_header(apis::BasicAuthKind::Bearer, &headers, "authorization")
+        .await;
+    let claims = None.or(claims_in_cookie).or(claims_in_auth_header);
     let Some(claims) = claims else {
         return Response::builder()
             .status(StatusCode::UNAUTHORIZED)

samples/server/petstore/rust-axum/output/multipart-v3/.openapi-generator/VERSION

@@ -1 +1 @@
-7.12.0-SNAPSHOT
+7.14.0-SNAPSHOT

samples/server/petstore/rust-axum/output/multipart-v3/README.md

@@ -12,7 +12,7 @@ server, you can easily generate a server stub.
 To see how to make this your own, look here: [README]((https://openapi-generator.tech))
 
 - API version: 1.0.7
-- Generator version: 7.12.0-SNAPSHOT
+- Generator version: 7.14.0-SNAPSHOT
 
 
 

samples/server/petstore/rust-axum/output/multipart-v3/src/server/mod.rs

@@ -69,7 +69,7 @@ where
 
     let result = api_impl
         .as_ref()
-        .multipart_related_request_post(&method, &host, &cookies, &body)
+        .multipart_related_request_post(&method, &host, &cookies, body)
         .await;
 
     let mut response = Response::builder();
@@ -129,7 +129,7 @@ where
 
     let result = api_impl
         .as_ref()
-        .multipart_request_post(&method, &host, &cookies, &body)
+        .multipart_request_post(&method, &host, &cookies, body)
         .await;
 
     let mut response = Response::builder();
@@ -190,7 +190,7 @@ where
 
     let result = api_impl
         .as_ref()
-        .multiple_identical_mime_types_post(&method, &host, &cookies, &body)
+        .multiple_identical_mime_types_post(&method, &host, &cookies, body)
         .await;
 
     let mut response = Response::builder();

samples/server/petstore/rust-axum/output/openapi-v3/.openapi-generator/VERSION

@@ -1 +1 @@
-7.12.0-SNAPSHOT
+7.14.0-SNAPSHOT

samples/server/petstore/rust-axum/output/openapi-v3/README.md

@@ -12,7 +12,7 @@ server, you can easily generate a server stub.
 To see how to make this your own, look here: [README]((https://openapi-generator.tech))
 
 - API version: 1.0.7
-- Generator version: 7.12.0-SNAPSHOT
+- Generator version: 7.14.0-SNAPSHOT