files-server-fastapi 0.1.45__tar.gz → 0.1.46__tar.gz

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: files-server-fastapi
-Version: 0.1.45
+Version: 0.1.46
 Summary: Este repositorio es un paquete python desarrollado con FastAPI, gestiona la comunicación con un servidor Samba y utiliza PostgreSQL para administrar rutas de archivos y el control de acceso basado en roles (RBAC) de los usuarios.
 Project-URL: Homepage, https://github.com/AldoBP/files-server-fastapi
 Project-URL: Repository, https://github.com/AldoBP/files-server-fastapi

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "files-server-fastapi"
-version = "0.1.45"
+version = "0.1.46"
 description = "Este repositorio es un paquete python desarrollado con FastAPI, gestiona la comunicación con un servidor Samba y utiliza PostgreSQL para administrar rutas de archivos y el control de acceso basado en roles (RBAC) de los usuarios."
 readme = "README.md"
 license = { file = "LICENSE" }

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/acls_router.py

@@ -7,7 +7,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, delete, or_
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 from files_server_fastapi.files.path_utils import normalize_subpath, build_logical_path
 from files_server_fastapi.models.permisos_model import User_Ruta_Access, Permisos
 from files_server_fastapi.models.rutas_model import Rutas
@@ -90,7 +91,7 @@ class AclCreate(BaseModel):
 @router.post("/acls", summary="Asignar acceso a una carpeta específica (ACL)")
 async def create_acl(
     req: AclCreate,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session)
 ):
     """
@@ -212,7 +213,7 @@ async def create_acl(
 
 @router.get("/acls", summary="Obtener las carpetas compartidas del usuario")
 async def get_user_acls(
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session)
 ):
     """
@@ -257,7 +258,7 @@ async def get_user_acls(
 @router.get("/acls/user/{user_id}", summary="Obtener los ACLs de un usuario específico")
 async def get_specific_user_acls(
     user_id: int,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """
@@ -321,7 +322,7 @@ async def get_specific_user_acls(
 async def initialize_user_acl(
     user_id: int,
     grant_full_area: bool = False,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """
@@ -403,7 +404,7 @@ async def initialize_user_acl(
 )
 async def grant_full_area(
     user_id: int,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """
@@ -426,7 +427,7 @@ async def grant_full_area(
 )
 async def revoke_full_area(
     user_id: int,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """
@@ -487,7 +488,7 @@ async def revoke_full_area(
 async def delete_user_acl(
     user_id: int,
     ruta_id: int,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/create_file_router.py

@@ -4,7 +4,8 @@ from pydantic import BaseModel
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 from files_server_fastapi.files.constants import BASE_DIR
 from files_server_fastapi.files.dependencies import check_folder_access
 from files_server_fastapi.files.path_utils import normalize_subpath, build_logical_path
@@ -22,7 +23,7 @@ class FileCreate(BaseModel):
 @router.post("/create-file", summary="Crear un nuevo archivo en el servidor")
 async def create_file(
     req: FileCreate,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session)
 ):
     await check_folder_access(area=req.area, subpath=req.subpath, required_access="upload", current_user=current_user, db=db)

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/delete_router.py

@@ -6,7 +6,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, delete as sql_delete, or_
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 from files_server_fastapi.files.constants import BASE_DIR
 from files_server_fastapi.files.dependencies import check_folder_access
 from files_server_fastapi.models.rutas_model import Rutas
@@ -23,7 +24,7 @@ class DeleteRequest(BaseModel):
 @router.delete("/delete", summary="Eliminar un archivo o carpeta del servidor")
 async def delete_item(
     req: DeleteRequest,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/dependencies.py

@@ -3,7 +3,8 @@ from fastapi import HTTPException, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select, or_
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 from files_server_fastapi.models.permisos_model import User_Ruta_Access, Permisos, Permiso_rol
 from files_server_fastapi.models.rutas_model import Rutas
 from files_server_fastapi.models.users_extend_model import Users_extend
@@ -204,7 +205,7 @@ async def check_folder_access(
     area: str,
     subpath: str = "/",
     required_access: str = "view",
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ) -> str:
     """

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/folder_router.py

@@ -6,7 +6,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 from files_server_fastapi.files.constants import BASE_DIR
 from files_server_fastapi.files.dependencies import check_folder_access
 from files_server_fastapi.files.path_utils import normalize_subpath, build_logical_path
@@ -27,7 +28,7 @@ class FolderCreate(BaseModel):
 @router.post("/folder", summary="Crear una nueva carpeta en el servidor")
 async def create_folder(
     req: FolderCreate,
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session)
 ):
     logger.debug("folder_router INPUT area=%r subpath=%r folder_name=%r", req.area, req.subpath, req.folder_name)

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/list_router.py

@@ -5,7 +5,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select, or_
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 
 from files_server_fastapi.files.constants import BASE_DIR
 from files_server_fastapi.files.dependencies import (
@@ -23,7 +24,7 @@ router = APIRouter()
 async def list_directory(
     area: str,
     subpath: str = "/",
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/open_url_router.py

@@ -12,7 +12,8 @@ from files_server_fastapi.files.dependencies import (
     can_edit,
     can_upload,
 )
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 
 router = APIRouter()
 
@@ -27,7 +28,7 @@ async def get_open_url(
     filename: str,
     subpath: str = "/",
     access_type: str = Depends(check_folder_access),
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
 ):
     """
     Devuelve un array **`options`** con las maneras de abrir el archivo según el permiso del usuario.

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/search_router.py

@@ -12,7 +12,8 @@ from sqlalchemy import select, or_
 from sqlmodel import select as sm_select
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 
 from files_server_fastapi.files.constants import BASE_DIR
 from files_server_fastapi.files.dependencies import (
@@ -163,7 +164,7 @@ async def search_files(
     q: str = Query(..., min_length=1, description="Texto a buscar (nombre de archivo o carpeta)"),
     area: str = Query(None, description="Área donde buscar (ej: Ventas). Si se omite, busca en todas las áreas accesibles."),
     limit: int = Query(50, ge=1, le=200, description="Número máximo de resultados"),
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """
@@ -283,7 +284,7 @@ async def search_users(
     q: str = Query(..., min_length=1, description="Nombre o email del usuario a buscar"),
     area: str = Query(None, description="Filtrar por área (ej: Ventas). Si se omite, busca en todas las áreas (solo SUPER_ADMIN)."),
     limit: int = Query(20, ge=1, le=100, description="Número máximo de resultados"),
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session),
 ):
     """

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/files/upload_router.py

@@ -2,7 +2,8 @@ import os
 from fastapi import APIRouter, HTTPException, Depends, UploadFile, File, Form
 from sqlalchemy.ext.asyncio import AsyncSession
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
-from oauth2fast_fastapi import get_current_verified_user, User
+from oauth2fast_fastapi import User
+from files_server_fastapi.dependencies.user_dependencies import get_active_user
 from files_server_fastapi.files.constants import BASE_DIR
 from files_server_fastapi.files.dependencies import check_folder_access
 
@@ -14,7 +15,7 @@ async def upload_file(
     area: str = Form(...),
     subpath: str = Form(default="/"),
     file: UploadFile = File(...),
-    current_user: User = Depends(get_current_verified_user),
+    current_user: User = Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session)
 ):
     """

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/models/users_extend_model.py

@@ -1,5 +1,7 @@
 from typing import Optional
-from datetime import datetime
+from datetime import datetime, timezone
+from sqlalchemy import Column
+from sqlalchemy import DateTime as SADateTime
 from sqlmodel import Field
 from oauth2fast_fastapi import AuthModel
 
@@ -24,7 +26,10 @@ class Users_extend(AuthModel, table=True):
     # ── Soft Delete ───────────────────────────────────────────────────────────
     # NULL  → usuario activo
     # NOT NULL → usuario dado de baja (fecha/hora exacta de la baja)
-    deleted_at: Optional[datetime] = Field(default=None)
+    deleted_at: Optional[datetime] = Field(
+        default=None,
+        sa_column=Column(SADateTime(timezone=True), nullable=True)
+    )
 
     # ID del usuario (admin/sistemas) que ejecutó la baja. NULL si está activo.
     deleted_by: Optional[int] = Field(default=None, foreign_key="users.id")

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/routers/area_router.py

@@ -6,6 +6,7 @@ from pydantic import BaseModel
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
 from files_server_fastapi.models.area_model import Area
+from files_server_fastapi.dependencies.user_dependencies import get_active_user, require_superadmin
 
 router = APIRouter(prefix="/areas", tags=["Gestión de Áreas"])
 
@@ -24,7 +25,7 @@ class AreaUpdate(BaseModel):
 # POST /areas/ — Crear nueva área
 # ==========================================
 @router.post("/", response_model=Area, status_code=status.HTTP_201_CREATED, summary="Crear una nueva Área")
-async def create_area(area_data: AreaCreate, db: AsyncSession = Depends(get_db_session)):
+async def create_area(area_data: AreaCreate, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     """
     Crea y guarda una nueva área en la base de datos.
     Solo accesible por superusuarios desde el panel de administración.
@@ -49,7 +50,7 @@ async def create_area(area_data: AreaCreate, db: AsyncSession = Depends(get_db_s
 # GET /areas/ — Listar todas las áreas
 # ==========================================
 @router.get("/", response_model=list[Area], summary="Obtener todas las Áreas")
-async def get_areas(db: AsyncSession = Depends(get_db_session)):
+async def get_areas(auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     """
     Devuelve la lista de todas las áreas registradas.
     """
@@ -61,7 +62,7 @@ async def get_areas(db: AsyncSession = Depends(get_db_session)):
 # GET /areas/{area_id} — Obtener área por ID
 # ==========================================
 @router.get("/{area_id}", response_model=Area, summary="Obtener un Área por ID")
-async def get_area(area_id: int, db: AsyncSession = Depends(get_db_session)):
+async def get_area(area_id: int, auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     """
     Devuelve los datos de un área específica por su ID.
     """
@@ -79,7 +80,7 @@ async def get_area(area_id: int, db: AsyncSession = Depends(get_db_session)):
 # PATCH /areas/{area_id} — Actualizar área
 # ==========================================
 @router.patch("/{area_id}", response_model=Area, summary="Actualizar un Área")
-async def update_area(area_id: int, area_update: AreaUpdate, db: AsyncSession = Depends(get_db_session)):
+async def update_area(area_id: int, area_update: AreaUpdate, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     """
     Actualiza parcialmente los datos de un área existente.
     """
@@ -114,7 +115,7 @@ async def update_area(area_id: int, area_update: AreaUpdate, db: AsyncSession =
 # DELETE /areas/{area_id} — Eliminar área
 # ==========================================
 @router.delete("/{area_id}", status_code=status.HTTP_204_NO_CONTENT, summary="Eliminar un Área")
-async def delete_area(area_id: int, db: AsyncSession = Depends(get_db_session)):
+async def delete_area(area_id: int, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     """
     Elimina un área por su ID.
     ADVERTENCIA: Solo eliminar si no hay usuarios asociados a esta área.

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/routers/permisos_router.py

@@ -4,24 +4,25 @@ from sqlalchemy import select
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
 from files_server_fastapi.models.permisos_model import Permisos, User_Ruta_Access, Permiso_rol
+from files_server_fastapi.dependencies.user_dependencies import get_active_user, require_superadmin
 
 router = APIRouter(prefix="/permisos", tags=["Gestión de Permisos"])
 
 # --- Catálogo Maestro ---
 @router.post("/", response_model=Permisos, summary="Crear Permiso Maestro")
-async def create_permiso(permiso: Permisos, db: AsyncSession = Depends(get_db_session)):
+async def create_permiso(permiso: Permisos, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     db.add(permiso)
     await db.commit()
     await db.refresh(permiso)
     return permiso
 
 @router.get("/", response_model=list[Permisos], summary="Ver Permisos Maestros")
-async def get_permisos(db: AsyncSession = Depends(get_db_session)):
+async def get_permisos(auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Permisos))
     return result.scalars().all()
 
 @router.put("/{permiso_id}", response_model=Permisos, summary="Editar Permiso Maestro")
-async def update_permiso(permiso_id: int, permiso_data: Permisos, db: AsyncSession = Depends(get_db_session)):
+async def update_permiso(permiso_id: int, permiso_data: Permisos, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Permisos).where(Permisos.id == permiso_id))
     db_permiso = result.scalars().first()
     if not db_permiso:
@@ -35,7 +36,7 @@ async def update_permiso(permiso_id: int, permiso_data: Permisos, db: AsyncSessi
     return db_permiso
 
 @router.delete("/{permiso_id}", summary="Eliminar Permiso Maestro")
-async def delete_permiso(permiso_id: int, db: AsyncSession = Depends(get_db_session)):
+async def delete_permiso(permiso_id: int, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Permisos).where(Permisos.id == permiso_id))
     db_permiso = result.scalars().first()
     if not db_permiso:
@@ -47,26 +48,26 @@ async def delete_permiso(permiso_id: int, db: AsyncSession = Depends(get_db_sess
 
 # --- Asignaciones Intermedias ---
 @router.post("/asignar-acl", response_model=User_Ruta_Access, summary="Asignar o Denegar acceso a ruta (ACL)")
-async def assign_acl(acl: User_Ruta_Access, db: AsyncSession = Depends(get_db_session)):
+async def assign_acl(acl: User_Ruta_Access, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     db.add(acl)
     await db.commit()
     await db.refresh(acl)
     return acl
 
 @router.post("/asignar-rol", response_model=Permiso_rol, summary="Asignar permiso a un Rol")
-async def assign_rol(permiso: Permiso_rol, db: AsyncSession = Depends(get_db_session)):
+async def assign_rol(permiso: Permiso_rol, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     db.add(permiso)
     await db.commit()
     await db.refresh(permiso)
     return permiso
 
 @router.get("/asignaciones-rol", summary="Ver todas las asignaciones de Permisos a Roles")
-async def get_asignaciones_rol(db: AsyncSession = Depends(get_db_session)):
+async def get_asignaciones_rol(auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Permiso_rol))
     return result.scalars().all()
 
 @router.delete("/asignar-rol/{asignacion_id}", summary="Revocar permiso a un Rol")
-async def revoke_rol_permission(asignacion_id: int, db: AsyncSession = Depends(get_db_session)):
+async def revoke_rol_permission(asignacion_id: int, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Permiso_rol).where(Permiso_rol.id == asignacion_id))
     db_asig = result.scalars().first()
     if not db_asig:

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/routers/rol_router.py

@@ -4,7 +4,8 @@ from sqlalchemy import select
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
 from files_server_fastapi.models.rol_model import Rol
-from files_server_fastapi.dependencies.user_dependencies import require_superadmin
+from files_server_fastapi.models.rol_model import Rol
+from files_server_fastapi.dependencies.user_dependencies import get_active_user, require_superadmin
 
 router = APIRouter(prefix="/roles", tags=["Gestión de Roles"])
 
@@ -30,11 +31,11 @@ async def create_rol(
 
 @router.get("/", response_model=list[Rol], summary="Obtener todos los Roles")
 async def get_roles(
+    auth=Depends(get_active_user),
     db: AsyncSession = Depends(get_db_session)
 ):
     """
     Obtiene la lista de todos los roles.
-    Público para lectura (necesario para formularios de registro/edición).
     """
     result = await db.execute(select(Rol))
     return result.scalars().all()

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/routers/rutas_router.py

@@ -4,17 +4,18 @@ from sqlalchemy import select
 
 from pgsqlasync2fast_fastapi.dependencies import get_db_session
 from files_server_fastapi.models.rutas_model import Rutas
+from files_server_fastapi.dependencies.user_dependencies import get_active_user, require_superadmin
 
 router = APIRouter(prefix="/rutas", tags=["Gestión de Rutas"])
 
 @router.post("/", response_model=Rutas, summary="Registrar una Ruta")
-async def create_ruta(ruta: Rutas, db: AsyncSession = Depends(get_db_session)):
+async def create_ruta(ruta: Rutas, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     db.add(ruta)
     await db.commit()
     await db.refresh(ruta)
     return ruta
 
 @router.get("/", response_model=list[Rutas], summary="Obtener todas las Rutas")
-async def get_rutas(db: AsyncSession = Depends(get_db_session)):
+async def get_rutas(auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Rutas))
     return result.scalars().all()

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/src/files_server_fastapi/routers/users_extend_router.py

@@ -84,7 +84,7 @@ async def _validate_area_and_rol(area_id: Optional[int], rol_id: Optional[int],
 # POST /users-extend/ — Vincular usuario
 # ==========================================
 @router.post("/", response_model=Users_extend, status_code=status.HTTP_201_CREATED, summary="Vincular Usuario con Área y Rol")
-async def create_user_extend(user_ext: UserExtendCreate, db: AsyncSession = Depends(get_db_session)):
+async def create_user_extend(user_ext: UserExtendCreate, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     """
     Vincula un usuario con un área y rol. Valida que el área y rol existan antes de insertar.
     """
@@ -110,7 +110,7 @@ async def create_user_extend(user_ext: UserExtendCreate, db: AsyncSession = Depe
 # GET /users-extend/ — Listar todos
 # ==========================================
 @router.get("/", response_model=list[UserExtendResponse], summary="Ver vínculos de usuarios")
-async def get_users_extend(db: AsyncSession = Depends(get_db_session)):
+async def get_users_extend(auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Users_extend))
     users = result.scalars().all()
     # Construimos la respuesta manual inyectando role_id
@@ -126,7 +126,7 @@ async def get_users_extend(db: AsyncSession = Depends(get_db_session)):
 # GET /users-extend/by-area/{area_id}
 # ==========================================
 @router.get("/by-area/{area_id}", response_model=list[UserExtendResponse], summary="Obtener usuarios de un área")
-async def get_users_by_area(area_id: int, db: AsyncSession = Depends(get_db_session)):
+async def get_users_by_area(area_id: int, auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Users_extend).where(Users_extend.area_id == area_id))
     users = result.scalars().all()
     response = []
@@ -141,7 +141,7 @@ async def get_users_by_area(area_id: int, db: AsyncSession = Depends(get_db_sess
 # GET /users-extend/by-user/{user_id}
 # ==========================================
 @router.get("/by-user/{user_id}", summary="Obtener Área y Rol de un Usuario específico")
-async def get_user_permissions(user_id: int, db: AsyncSession = Depends(get_db_session)):
+async def get_user_permissions(user_id: int, auth=Depends(get_active_user), db: AsyncSession = Depends(get_db_session)):
     result = await db.execute(select(Users_extend).where(Users_extend.user_id == user_id))
     user_ext = result.scalars().first()
 
@@ -155,7 +155,7 @@ async def get_user_permissions(user_id: int, db: AsyncSession = Depends(get_db_s
 # PATCH /users-extend/{user_id} — Actualizar
 # ==========================================
 @router.patch("/{user_id}", response_model=UserExtendResponse, summary="Actualizar datos de extensión de usuario")
-async def update_user_extend(user_id: int, user_ext_update: UserExtendUpdate, db: AsyncSession = Depends(get_db_session)):
+async def update_user_extend(user_id: int, user_ext_update: UserExtendUpdate, auth: tuple = Depends(require_superadmin), db: AsyncSession = Depends(get_db_session)):
     from sqlmodel import or_
     
     # Buscamos por user_id (lo ideal) o por el ID interno del registro (si el frontend se confunde)
@@ -329,16 +329,16 @@ async def deactivate_user(
 @router.post(
     "/{user_id}/reactivate",
     status_code=status.HTTP_200_OK,
-    summary="Reactivar un usuario dado de baja (solo Sistemas/Superadmin)",
+    summary="Reactivar un usuario dado de baja",
 )
 async def reactivate_user(
     user_id: int,
-    auth: tuple = Depends(require_superadmin),
+    auth: tuple = Depends(require_area_admin_or_superadmin),
     db: AsyncSession = Depends(get_db_session),
 ):
     """
     Reactiva a un usuario previamente dado de baja.
-    Solo Sistemas/Superadmin puede ejecutar esta acción.
+    Admin de Área solo puede reactivar usuarios de su área. Superadmin a todos.
 
     El trigger PostgreSQL automáticamente restaura is_verified = TRUE
     en la tabla users, permitiendo que el usuario vuelva a hacer login.
@@ -354,6 +354,28 @@ async def reactivate_user(
             detail=f"Usuario con ID {user_id} no encontrado.",
         )
 
+    current_user, executor_ext, is_superadmin = auth
+
+    if not is_superadmin:
+        # Admin de área: solo puede reactivar a usuarios de su misma área
+        if target_ext.area_id != executor_ext.area_id:
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail="Solo puedes reactivar a usuarios de tu propia área.",
+            )
+
+        # Admin de área: no puede reactivar a otros admins de área ni superadmins
+        from files_server_fastapi.dependencies.user_dependencies import (
+            _get_privilege_level,
+            PRIVILEGE_AREA_ADMIN,
+        )
+        target_level = await _get_privilege_level(target_ext.rol_id, db)
+        if target_level >= PRIVILEGE_AREA_ADMIN:
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail="No puedes reactivar a un Admin de Área o Superadmin. Contacta a Sistemas.",
+            )
+
     if target_ext.deleted_at is None:
         raise HTTPException(
             status_code=status.HTTP_409_CONFLICT,
@@ -377,19 +399,24 @@ async def reactivate_user(
 @router.get(
     "/inactive",
     status_code=status.HTTP_200_OK,
-    summary="Listar usuarios dados de baja (Auditoría — solo Sistemas/Superadmin)",
+    summary="Listar usuarios dados de baja",
 )
 async def list_inactive_users(
-    auth: tuple = Depends(require_superadmin),
+    auth: tuple = Depends(require_area_admin_or_superadmin),
     db: AsyncSession = Depends(get_db_session),
 ):
     """
-    Retorna todos los usuarios dados de baja con su fecha y responsable de baja.
-    Solo accesible por Sistemas/Superadmin. Útil para auditoría y trazabilidad.
+    Retorna los usuarios dados de baja.
+    Admin de Área solo ve los de su área. Superadmin ve todos. Útil para auditoría.
     """
-    result = await db.execute(
-        select(Users_extend).where(Users_extend.deleted_at.is_not(None))
-    )
+    current_user, executor_ext, is_superadmin = auth
+
+    query = select(Users_extend).where(Users_extend.deleted_at.is_not(None))
+    
+    if not is_superadmin:
+        query = query.where(Users_extend.area_id == executor_ext.area_id)
+
+    result = await db.execute(query)
     inactive_users = result.scalars().all()
 
     return [

{files_server_fastapi-0.1.45 → files_server_fastapi-0.1.46}/uv.lock

@@ -637,7 +637,7 @@ wheels = [
 
 [[package]]
 name = "files-server-fastapi"
-version = "0.1.44"
+version = "0.1.45"
 source = { editable = "." }
 dependencies = [
     { name = "oauth2fast-fastapi" },