fix

2026-02-07 04:02:38 +01:00
parent dad185a8d5
commit b9d10c7b5c
8 changed files with 128 additions and 67 deletions
@@ -1,10 +1,9 @@
 use std::sync::Arc;
 use axum::{
-    extract::{State, Request},
-    http::{StatusCode, HeaderMap, header},
+    extract::{State, Request, FromRequestParts},
+    http::{StatusCode, HeaderMap, header, request::Parts},
    middleware::Next,
    response::{Response, IntoResponse},
-    body::Body,
 };

 use crate::common::di::AppState;
@@ -19,6 +18,51 @@ pub struct AuthUser {
    pub username: String,
 }

+/// Extractor reutilizable que obtiene el user_id del usuario autenticado.
+/// Se extrae automáticamente del `CurrentUser` insertado por el auth middleware.
+///
+/// Uso en handlers:
+/// ```rust
+/// async fn my_handler(CurrentUserId(user_id): CurrentUserId) -> impl IntoResponse { ... }
+/// ```
+#[derive(Clone, Debug)]
+pub struct CurrentUserId(pub String);
+
+// Implementar FromRequestParts para AuthUser — permite usar `auth_user: AuthUser` en handlers
+impl<S> FromRequestParts<S> for AuthUser
+where
+    S: Send + Sync,
+{
+    type Rejection = AuthError;
+
+    async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
+        parts
+            .extensions
+            .get::<CurrentUser>()
+            .map(|cu| AuthUser {
+                id: cu.id.clone(),
+                username: cu.username.clone(),
+            })
+            .ok_or(AuthError::UserNotFound)
+    }
+}
+
+// Implementar FromRequestParts para CurrentUserId — extractor ligero solo para el user_id
+impl<S> FromRequestParts<S> for CurrentUserId
+where
+    S: Send + Sync,
+{
+    type Rejection = AuthError;
+
+    async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
+        parts
+            .extensions
+            .get::<CurrentUser>()
+            .map(|cu| CurrentUserId(cu.id.clone()))
+            .ok_or(AuthError::UserNotFound)
+    }
+}
+
 // Error para las operaciones de autenticación
 #[derive(Debug, thiserror::Error)]
 pub enum AuthError {
@@ -56,22 +100,6 @@ impl IntoResponse for AuthError {
    }
 }

-// Implementamos el extractor para AuthUser
-// Use a function instead of an extractor for now
-// We'll use this directly in handlers until we solve the extractor lifetime issues
-pub async fn get_auth_user(req: &Request<Body>) -> Result<AuthUser, AuthError> {
-    // Get the current user from extensions
-    if let Some(current_user) = req.extensions().get::<CurrentUser>() {
-        return Ok(AuthUser {
-            id: current_user.id.clone(),
-            username: current_user.username.clone(),
-        });
-    }
-
-    // Return error if user not found
-    Err(AuthError::UserNotFound)
-}
-
 // Middleware de autenticación simplificado - solo valida si existe un token
 pub async fn auth_middleware(
    State(state): State<Arc<AppState>>,