wip

src/web/api/v1/contexts/torrent/handlers.rs

@@ -23,6 +23,7 @@ use crate::services::torrent_file::generate_random_torrent;
 use crate::utils::parse_torrent;
 use crate::web::api::v1::auth::get_optional_logged_in_user;
 use crate::web::api::v1::extractors::bearer_token::Extract;
+use crate::web::api::v1::extractors::user_id::ExtractLoggedInUser;
 use crate::web::api::v1::responses::OkResponseData;
 use crate::web::api::v1::routes::API_VERSION_URL_PREFIX;
 
@@ -37,20 +38,19 @@ use crate::web::api::v1::routes::API_VERSION_URL_PREFIX;
 #[allow(clippy::unused_async)]
 pub async fn upload_torrent_handler(
     State(app_data): State<Arc<AppData>>,
-    Extract(maybe_bearer_token): Extract,
+    ExtractLoggedInUser(user_id): ExtractLoggedInUser,
     multipart: Multipart,
 ) -> Response {
-    let user_id = match app_data.auth.get_user_id_from_bearer_token(&maybe_bearer_token).await {
-        Ok(user_id) => user_id,
-        Err(error) => return error.into_response(),
-    };
-
     let add_torrent_form = match build_add_torrent_request_from_payload(multipart).await {
         Ok(torrent_request) => torrent_request,
         Err(error) => return error.into_response(),
     };
 
-    match app_data.torrent_service.add_torrent(add_torrent_form, user_id).await {
+    match app_data
+        .torrent_service
+        .add_torrent(add_torrent_form, user_id.)
+        .await
+    {
         Ok(response) => new_torrent_response(&response).into_response(),
         Err(error) => error.into_response(),
     }

src/web/api/v1/extractors/user_id.rs

@@ -1,17 +1,19 @@
+use std::default;
 use std::sync::Arc;
 
-use axum::async_trait;
 use axum::extract::FromRequestParts;
 use axum::http::request::Parts;
 use axum::response::{IntoResponse, Response};
+use axum::{async_trait, Error};
 use serde::Deserialize;
 use tokio::sync::RwLock;
 
 use super::bearer_token;
+use crate::errors::ServiceError;
 use crate::services;
 use crate::web::api::v1::auth::{self, Authentication};
 
-pub struct ExtractLoggedInUser(pub Option<UserId>);
+pub struct ExtractLoggedInUser(pub UserId);
 
 #[derive(Deserialize, Debug)]
 pub struct UserId(i64);
@@ -43,6 +45,11 @@ where
 
         let auth: Authentication = auth::Authentication::new(Arc::new(bearer_token));
 
+        let app_data = match axum::extract::State::from_request_parts(parts, state).await {
+            Ok(app_data) => Ok(app_data),
+            Err(_) => Err(ServiceError::Unauthorized),
+        };
+
         match auth.get_user_id_from_bearer_token(&maybe_bearer_token).await {
             Ok(user_id) => Ok(ExtractLoggedInUser(Some(UserId(user_id)))),
             Err(error) => return Err(error.into_response()),