Upgrade axum to 0.5

crates/axum-utils/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 async-trait = "0.1.52"
-axum = { version = "0.4.8", features = ["headers"] }
+axum = { version = "0.5.1", features = ["headers"] }
 bincode = "1.3.3"
 chrono = "0.4.19"
 cookie = { version = "0.16.0", features = ["signed", "private", "percent-encode"] }

crates/axum-utils/src/client_authorization.rs

@@ -223,9 +223,7 @@ where
                 // If it's missing it is fine
                 TypedHeaderRejectionReason::Missing => None,
                 // If the header could not be parsed, return the error
-                TypedHeaderRejectionReason::Error(_) => {
-                    return Err(ClientAuthorizationError::InvalidHeader)
-                }
+                _ => return Err(ClientAuthorizationError::InvalidHeader),
             },
         };
 

crates/axum-utils/src/cookies.rs

@@ -14,10 +14,13 @@
 
 //! Private (encrypted) cookie jar, based on axum-extra's cookie jar
 
-use std::marker::PhantomData;
+use std::{convert::Infallible, marker::PhantomData};
 
 use async_trait::async_trait;
-use axum::extract::{Extension, FromRequest, RequestParts};
+use axum::{
+    extract::{Extension, FromRequest, RequestParts},
+    response::IntoResponseParts,
+};
 pub use cookie::Cookie;
 use data_encoding::BASE64URL_NOPAD;
 use headers::HeaderMap;
@@ -68,12 +71,6 @@ impl<K> PrivateCookieJar<K> {
             }
         }
     }
-
-    pub fn headers(self) -> HeaderMap {
-        let mut headers = HeaderMap::new();
-        self.set_cookies(&mut headers);
-        headers
-    }
 }
 
 #[async_trait]
@@ -91,13 +88,8 @@ where
         let mut jar = cookie::CookieJar::new();
         let mut private_jar = jar.private_mut(&key);
 
-        // TODO: remove this when axum 0.5 gets released
-        // https://github.com/tokio-rs/axum/pull/698
-        let empty_headers = HeaderMap::new();
-
         let cookies = req
             .headers()
-            .unwrap_or(&empty_headers)
             .get_all(COOKIE)
             .into_iter()
             .filter_map(|value| value.to_str().ok())
@@ -118,6 +110,17 @@ where
     }
 }
 
+impl<K> IntoResponseParts for PrivateCookieJar<K> {
+    type Error = Infallible;
+    fn into_response_parts(
+        self,
+        mut res: axum::response::ResponseParts,
+    ) -> Result<axum::response::ResponseParts, Self::Error> {
+        self.set_cookies(res.headers_mut());
+        Ok(res)
+    }
+}
+
 #[derive(Debug, Error)]
 #[error("could not decode cookie")]
 pub enum CookieDecodeError {

crates/axum-utils/src/user_authorization.rs

@@ -287,9 +287,7 @@ where
                 // If it's missing it is fine
                 TypedHeaderRejectionReason::Missing => None,
                 // If the header could not be parsed, return the error
-                TypedHeaderRejectionReason::Error(_) => {
-                    return Err(UserAuthorizationError::InvalidHeader)
-                }
+                _ => return Err(UserAuthorizationError::InvalidHeader),
             },
         };