Merge pull request #8 from Ptrskay3/update-axum-0.6.0

Cargo.toml

@@ -18,11 +18,11 @@ tower = "0.4.12"
 tracing = "0.1"
 
 [dependencies.axum]
-version = "0.5.7"
+version = "0.6.0"
 features = ["headers"]
 
 [dependencies.axum-extra]
-version = "0.3.4"
+version = "0.4.0"
 features = ["cookie-signed"]
 
 [dependencies.tokio]

README.md

@@ -73,7 +73,7 @@ async fn main() {
     async fn protected_handler(session: ReadableSession) -> &'static str {
         if session
             .get::<bool>("signed_in")
-            .map_or(false, |signed_in| signed_in)
+            .unwrap_or(false)
         {
             "Shh, it's secret!"
         } else {

examples/async-sqlx-session/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-axum = "0.5.13"
+axum = "0.6.0"
 axum-sessions = { path = "../../" }
 
 [dependencies.async-sqlx-session]

examples/regenerate/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-axum = "0.5.13"
+axum = "0.6.0"
 axum-sessions = { path = "../../" }
 
 [dependencies.rand]

examples/signin/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-axum = "0.5.13"
+axum = "0.6.0"
 axum-sessions = { path = "../../" }
 
 [dependencies.rand]

examples/signin/src/main.rs

@@ -29,10 +29,7 @@ async fn main() {
     }
 
     async fn protected_handler(session: ReadableSession) -> &'static str {
-        if session
-            .get::<bool>("signed_in")
-            .map_or(false, |signed_in| signed_in)
-        {
+        if session.get::<bool>("signed_in").unwrap_or(false) {
             "Shh, it's secret!"
         } else {
             "Nothing to see here."

src/extractors.rs

@@ -2,11 +2,7 @@
 
 use std::ops::{Deref, DerefMut};
 
-use axum::{
-    async_trait,
-    extract::{FromRequest, RequestParts},
-    Extension,
-};
+use axum::{async_trait, extract::FromRequestParts, http::request::Parts, Extension};
 use tokio::sync::{OwnedRwLockReadGuard, OwnedRwLockWriteGuard};
 
 use crate::SessionHandle;
@@ -27,16 +23,17 @@ impl Deref for ReadableSession {
 }
 
 #[async_trait]
-impl<B> FromRequest<B> for ReadableSession
+impl<S> FromRequestParts<S> for ReadableSession
 where
-    B: Send,
+    S: Send + Sync,
 {
     type Rejection = std::convert::Infallible;
 
-    async fn from_request(request: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        let Extension(session_handle): Extension<SessionHandle> = Extension::from_request(request)
-            .await
-            .expect("Session extension missing. Is the session layer installed?");
+    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
+        let Extension(session_handle): Extension<SessionHandle> =
+            Extension::from_request_parts(parts, state)
+                .await
+                .expect("Session extension missing. Is the session layer installed?");
         let session = session_handle.read_owned().await;
 
         Ok(Self { session })
@@ -65,16 +62,17 @@ impl DerefMut for WritableSession {
 }
 
 #[async_trait]
-impl<B> FromRequest<B> for WritableSession
+impl<S> FromRequestParts<S> for WritableSession
 where
-    B: Send,
+    S: Send + Sync,
 {
     type Rejection = std::convert::Infallible;
 
-    async fn from_request(request: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        let Extension(session_handle): Extension<SessionHandle> = Extension::from_request(request)
-            .await
-            .expect("Session extension missing. Is the session layer installed?");
+    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
+        let Extension(session_handle): Extension<SessionHandle> =
+            Extension::from_request_parts(parts, state)
+                .await
+                .expect("Session extension missing. Is the session layer installed?");
         let session = session_handle.write_owned().await;
 
         Ok(Self { session })