Skip to content

Commit

Permalink
feat: [#446] new optional user id extractor
Browse files Browse the repository at this point in the history
  • Loading branch information
mario-nt committed Feb 21, 2024
1 parent 1c16300 commit 8f7b8a6
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/web/api/server/v1/extractors/mod.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
pub mod bearer_token;
pub mod user_id;
pub mod optional_user_id;
41 changes: 41 additions & 0 deletions src/web/api/server/v1/extractors/optional_user_id.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
use std::sync::Arc;

use async_trait::async_trait;
use axum::extract::{FromRef, FromRequestParts};
use axum::http::request::Parts;
use axum::response::{ Response};

use crate::common::AppData;
use crate::models::user::UserId;
use crate::web::api::server::v1::extractors::bearer_token;

pub struct ExtractOptionalLoggedInUser(pub Option<UserId>);

#[async_trait]
impl<S> FromRequestParts<S> for ExtractOptionalLoggedInUser
where
Arc<AppData>: FromRef<S>,
S: Send + Sync,
{
type Rejection = Response;

async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
/* let maybe_bearer_token = match bearer_token::Extract::from_request_parts(parts, state).await {
Ok(maybe_bearer_token) => maybe_bearer_token.0,
Err(_) => return Err(ServiceError::TokenNotFound.into_response()),
}; */

let bearer_token = match bearer_token::Extract::from_request_parts(parts, state).await {
Ok(bearer_token) => bearer_token.0,
Err(_) => None
};

//Extracts the app state
let app_data = Arc::from_ref(state);

match app_data.auth.get_user_id_from_bearer_token(&bearer_token).await {
Ok(user_id) => Ok(ExtractOptionalLoggedInUser(Some(user_id))),
Err(_) => Ok(ExtractOptionalLoggedInUser(None)),
}
}
}

0 comments on commit 8f7b8a6

Please sign in to comment.