From eae8b9b7a40c3f2a52f319e695b280a41618fdd8 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Fri, 23 Dec 2022 07:17:55 -0500 Subject: Update axum to 0.6 --- server/src/auth.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'server/src/auth.rs') 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 FromRequest for AuthenticatedSession +impl FromRequestParts for AuthenticatedSession where - B: Send, + B: Send + Sync, { type Rejection = Response; - async fn from_request( - req: &mut axum::extract::RequestParts, + async fn from_request_parts( + parts: &mut Parts, state: &B ) -> Result { - 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") { -- cgit v1.2.3