feat: Implement multi-tenancy support in middleware and security layers
- Enhanced TenantMiddleware to validate tenant information from JWT tokens. - Added LicenseValidationMiddleware to check tenant licenses before processing requests. - Updated security utilities to extract tenant information from tokens and validate company access. - Introduced CompanyStore to manage active company state and handle company switching in the frontend. - Modified API routes to include company_id in requests for better resource management. - Improved logging and error handling throughout the middleware and API layers. - Updated frontend components to reflect changes in company management and selection. - Added new API route for fetching user's companies with proper authentication handling.
This commit is contained in:
@@ -2,6 +2,7 @@ from pydantic import BaseModel, Field
|
||||
from pydantic import ConfigDict
|
||||
from typing import List
|
||||
|
||||
|
||||
class RegimenPedimentoDTO(BaseModel):
|
||||
code: str = Field(..., min_length=1, max_length=3)
|
||||
description: str
|
||||
|
||||
@@ -6,22 +6,25 @@ from core.database import Base
|
||||
if TYPE_CHECKING:
|
||||
from ..code_pedimento_regimens.models import CodePedimentoRegimen
|
||||
|
||||
|
||||
class RegimenPedimento(Base):
|
||||
__tablename__ = "pedimento_regimens" #GRegimenPed
|
||||
__tablename__ = "pedimento_regimens" # GRegimenPed
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint("code", name="pedimento_regimens_pkey"),
|
||||
{"schema": "public"}
|
||||
{"schema": "public"},
|
||||
)
|
||||
|
||||
code: Mapped[str] = mapped_column(String(3), nullable=False) # código tipo "01", "31"
|
||||
description: Mapped[str] = mapped_column(String(100), nullable=False) # nombre legal en español
|
||||
code: Mapped[str] = mapped_column(
|
||||
String(3), nullable=False
|
||||
) # código tipo "01", "31"
|
||||
description: Mapped[str] = mapped_column(
|
||||
String(100), nullable=False
|
||||
) # nombre legal en español
|
||||
|
||||
# Relación con Claves de Pedimento
|
||||
#GClavePedRegimen
|
||||
claves_pedimento: Mapped[List['CodePedimentoRegimen']] = relationship(
|
||||
"CodePedimentoRegimen",
|
||||
uselist=True,
|
||||
back_populates="regimen"
|
||||
# GClavePedRegimen
|
||||
claves_pedimento: Mapped[List["CodePedimentoRegimen"]] = relationship(
|
||||
"CodePedimentoRegimen", uselist=True, back_populates="regimen"
|
||||
)
|
||||
|
||||
def __repr__(self):
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlalchemy.orm import Session
|
||||
from core.database import get_core_db
|
||||
@@ -16,7 +15,7 @@ def list_pedimento_regimens(
|
||||
page: int = Query(1, ge=1, description="Número de página"),
|
||||
page_size: int = Query(50, ge=1, le=100, description="Tamaño de página"),
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user)
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
skip = (page - 1) * page_size
|
||||
query = db.query(RegimenPedimento)
|
||||
@@ -26,21 +25,27 @@ def list_pedimento_regimens(
|
||||
"items": [RegimenPedimentoDTO.model_validate(obj) for obj in items],
|
||||
"total": total,
|
||||
"page": page,
|
||||
"page_size": page_size
|
||||
"page_size": page_size,
|
||||
}
|
||||
|
||||
|
||||
@router.get("/{key}", response_model=RegimenPedimentoDTO)
|
||||
def get_pedimento_regimen(key: str, db: Session = Depends(get_core_db), current_user: dict = Depends(get_current_user)):
|
||||
def get_pedimento_regimen(
|
||||
key: str,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
obj = db.query(RegimenPedimento).filter(RegimenPedimento.code == key).first()
|
||||
if not obj:
|
||||
raise HTTPException(status_code=404, detail="Not found")
|
||||
return RegimenPedimentoDTO.model_validate(obj)
|
||||
|
||||
|
||||
@router.post("/", response_model=RegimenPedimentoDTO, status_code=201)
|
||||
def create_pedimento_regimen(
|
||||
data: RegimenPedimentoDTO,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(has_role("admin"))
|
||||
current_user: dict = Depends(has_role("admin")),
|
||||
):
|
||||
obj = RegimenPedimento(**data.model_dump())
|
||||
db.add(obj)
|
||||
@@ -48,12 +53,13 @@ def create_pedimento_regimen(
|
||||
db.refresh(obj)
|
||||
return RegimenPedimentoDTO.model_validate(obj)
|
||||
|
||||
|
||||
@router.put("/{key}", response_model=RegimenPedimentoDTO)
|
||||
def update_pedimento_regimen(
|
||||
key: str,
|
||||
data: RegimenPedimentoDTO,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(has_role("admin"))
|
||||
current_user: dict = Depends(has_role("admin")),
|
||||
):
|
||||
obj = db.query(RegimenPedimento).filter(RegimenPedimento.code == key).first()
|
||||
if not obj:
|
||||
@@ -64,11 +70,12 @@ def update_pedimento_regimen(
|
||||
db.refresh(obj)
|
||||
return RegimenPedimentoDTO.model_validate(obj)
|
||||
|
||||
|
||||
@router.delete("/{key}", status_code=204)
|
||||
def delete_pedimento_regimen(
|
||||
key: str,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(has_role("admin"))
|
||||
current_user: dict = Depends(has_role("admin")),
|
||||
):
|
||||
obj = db.query(RegimenPedimento).filter(RegimenPedimento.code == key).first()
|
||||
if not obj:
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
seed = [
|
||||
("DFI", "DEPOSITO FISCAL."),
|
||||
("ETE", "TEMPORALES DE EXPORTACION PARA ELABORACION, TRANSFORMACION O REPARACION."),
|
||||
("ETR", "TEMPORALES DE EXPORTACION PARA RETORNAR AL PAIS EN EL MISMO ESTADO."),
|
||||
("EXD", "DEFINITIVO DE EXPORTACIÓN."),
|
||||
("IMD", "DEFINITIVO DE IMPORTACIÓN."),
|
||||
("ITE", "TEMPORALES DE IMPORTACION PARA ELABORACION, TRANSFORMACION O REPARACION PARA EMPRESAS CON PROGRAMA I"),
|
||||
("ITR", "TEMPORALES DE IMPORTACION PARA RETORNAR AL EXTRANJERO EN EL MISMO ESTADO."),
|
||||
("RFE", "ELABORACION, TRANSFORMACION O REPARACION EN RECINTO FISCALIZADO."),
|
||||
("RFS", "RECINTO FISCALIZADO ESTRATEGICO."),
|
||||
("TRA", "TRANSITOS.")
|
||||
]
|
||||
("DFI", "DEPOSITO FISCAL."),
|
||||
("ETE", "TEMPORALES DE EXPORTACION PARA ELABORACION, TRANSFORMACION O REPARACION."),
|
||||
("ETR", "TEMPORALES DE EXPORTACION PARA RETORNAR AL PAIS EN EL MISMO ESTADO."),
|
||||
("EXD", "DEFINITIVO DE EXPORTACIÓN."),
|
||||
("IMD", "DEFINITIVO DE IMPORTACIÓN."),
|
||||
(
|
||||
"ITE",
|
||||
"TEMPORALES DE IMPORTACION PARA ELABORACION, TRANSFORMACION O REPARACION PARA EMPRESAS CON PROGRAMA I",
|
||||
),
|
||||
(
|
||||
"ITR",
|
||||
"TEMPORALES DE IMPORTACION PARA RETORNAR AL EXTRANJERO EN EL MISMO ESTADO.",
|
||||
),
|
||||
("RFE", "ELABORACION, TRANSFORMACION O REPARACION EN RECINTO FISCALIZADO."),
|
||||
("RFS", "RECINTO FISCALIZADO ESTRATEGICO."),
|
||||
("TRA", "TRANSITOS."),
|
||||
]
|
||||
|
||||
@@ -7,6 +7,7 @@ app = FastAPI()
|
||||
app.include_router(router)
|
||||
client = TestClient(app)
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("client", "access_token")
|
||||
def test_list_pedimento_regimens(client, access_token):
|
||||
headers = {"Authorization": f"Bearer {access_token}"}
|
||||
@@ -16,20 +17,28 @@ def test_list_pedimento_regimens(client, access_token):
|
||||
assert "page" in response.json()
|
||||
assert "page_size" in response.json()
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("client", "access_token")
|
||||
def test_get_pedimento_regimen_not_found(client, access_token):
|
||||
headers = {"Authorization": f"Bearer {access_token}"}
|
||||
response = client.get("/pedimento-regimens/invalid_key", headers=headers)
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_create_pedimento_regimen_forbidden():
|
||||
response = client.post("/pedimento-regimens/", json={"code": "TST", "description": "Test"})
|
||||
response = client.post(
|
||||
"/pedimento-regimens/", json={"code": "TST", "description": "Test"}
|
||||
)
|
||||
assert response.status_code in (403, 405, 404)
|
||||
|
||||
|
||||
def test_update_pedimento_regimen_forbidden():
|
||||
response = client.put("/pedimento-regimens/TST", json={"code": "TST", "description": "Test"})
|
||||
response = client.put(
|
||||
"/pedimento-regimens/TST", json={"code": "TST", "description": "Test"}
|
||||
)
|
||||
assert response.status_code in (403, 405, 404)
|
||||
|
||||
|
||||
def test_delete_pedimento_regimen_forbidden():
|
||||
response = client.delete("/pedimento-regimens/TST")
|
||||
assert response.status_code in (403, 405, 404)
|
||||
|
||||
Reference in New Issue
Block a user