summaryrefslogtreecommitdiff
path: root/server/src/auth.rs
diff options
context:
space:
mode:
authorKjetil Orbekk <kj@orbekk.com>2022-12-23 07:17:55 -0500
committerKjetil Orbekk <kj@orbekk.com>2022-12-23 07:17:55 -0500
commiteae8b9b7a40c3f2a52f319e695b280a41618fdd8 (patch)
treef509f4e902f1d9e10d9afe92592430c6a6f231c5 /server/src/auth.rs
parent4d4357430248ef62051ea204ef02f7e998277355 (diff)
Update axum to 0.6
Diffstat (limited to 'server/src/auth.rs')
-rw-r--r--server/src/auth.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/server/src/auth.rs b/server/src/auth.rs
index fc0de62..d0f6c38 100644
--- a/server/src/auth.rs
+++ b/server/src/auth.rs
@@ -9,8 +9,8 @@ use std::{
use crate::{error::BridgeError, server::ContextExtension};
use async_trait::async_trait;
use axum::{
- extract::FromRequest,
- response::{IntoResponse, Response},
+ extract::{FromRequest, FromRequestParts},
+ response::{IntoResponse, Response}, http::request::Parts,
};
use chrono::{DateTime, Utc};
use lru::LruCache;
@@ -368,19 +368,19 @@ pub async fn fetch_authenticated_session(
}
#[async_trait]
-impl<B> FromRequest<B> for AuthenticatedSession
+impl<B> FromRequestParts<B> for AuthenticatedSession
where
- B: Send,
+ B: Send + Sync,
{
type Rejection = Response;
- async fn from_request(
- req: &mut axum::extract::RequestParts<B>,
+ async fn from_request_parts(
+ parts: &mut Parts, state: &B
) -> Result<Self, Self::Rejection> {
- let cookies = Cookies::from_request(req)
+ let cookies = Cookies::from_request_parts(parts, state)
.await
.map_err(|e| e.into_response())?;
- let extension = ContextExtension::from_request(req)
+ let extension = ContextExtension::from_request_parts(parts, state)
.await
.map_err(|e| e.into_response())?;
let cookie = match cookies.get("user-id") {