Merge #447: #445 mandatory user id extractor

59b1cce  refactor: [#445] new more descriptive error message (Mario)
2f288c6 refactor: [#445] new custom error message (Mario)
1cecc59 feat: [#445] new custom error and minor refactor to extractor (Mario)
b5da547 refactor: [#445] new return error type for user id extractor (Mario)
adec821 feat: [#445] new user id extractor (Mario)

Pull request description:

  Resolves #445

ACKs for top commit:
  josecelano:
    ACK 59b1cce

Tree-SHA512: 87858403b5c3e60c9df500a078d48f1a04d5a57c4985b7343dd139f539b6cc18dbf4ec3300fc7b0e344caf09aa1f58bb95c5532060872be8486b4624c98d6229

Author: josecelano

src/errors.rs

@@ -148,6 +148,9 @@ pub enum ServiceError {
     #[display(fmt = "Database error.")]
     DatabaseError,
 
+    #[display(fmt = "Authentication error, please sign in")]
+    LoggedInUserNotFound,
+
     // Begin tracker errors
     #[display(fmt = "Sorry, we have an error with our tracker connection.")]
     TrackerOffline,
@@ -311,6 +314,7 @@ pub fn http_status_code_for_service_error(error: &ServiceError) -> StatusCode {
         ServiceError::TrackerUnknownResponse => StatusCode::INTERNAL_SERVER_ERROR,
         ServiceError::TorrentNotFoundInTracker => StatusCode::NOT_FOUND,
         ServiceError::InvalidTrackerToken => StatusCode::INTERNAL_SERVER_ERROR,
+        ServiceError::LoggedInUserNotFound => StatusCode::UNAUTHORIZED,
     }
 }
 

src/web/api/server/v1/extractors/mod.rs

@@ -1 +1,2 @@
 pub mod bearer_token;
+pub mod user_id;

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

@@ -0,0 +1,37 @@
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use axum::extract::{FromRef, FromRequestParts};
+use axum::http::request::Parts;
+use axum::response::{IntoResponse, Response};
+
+use super::bearer_token;
+use crate::common::AppData;
+use crate::errors::ServiceError;
+use crate::models::user::UserId;
+
+pub struct ExtractLoggedInUser(pub UserId);
+
+#[async_trait]
+impl<S> FromRequestParts<S> for ExtractLoggedInUser
+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()),
+        };
+
+        //Extracts the app state
+        let app_data = Arc::from_ref(state);
+
+        match app_data.auth.get_user_id_from_bearer_token(&maybe_bearer_token).await {
+            Ok(user_id) => Ok(ExtractLoggedInUser(user_id)),
+            Err(_) => Err(ServiceError::LoggedInUserNotFound.into_response()),
+        }
+    }
+}