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 Optional
|
||||
|
||||
|
||||
class StateDTO(BaseModel):
|
||||
m3_key: str = Field(..., min_length=1, max_length=3)
|
||||
description: str
|
||||
@@ -9,4 +10,3 @@ class StateDTO(BaseModel):
|
||||
ame_key: Optional[str] = None
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
@@ -3,15 +3,18 @@ from sqlalchemy import String, PrimaryKeyConstraint
|
||||
from sqlalchemy.orm import mapped_column, Mapped
|
||||
from core.database import Base
|
||||
|
||||
|
||||
class State(Base):
|
||||
__tablename__ = "states" #GEstados
|
||||
__tablename__ = "states" # GEstados
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint('m3_key', 'description', name='states_pkey'),
|
||||
{"schema": "public"}
|
||||
PrimaryKeyConstraint("m3_key", "description", name="states_pkey"),
|
||||
{"schema": "public"},
|
||||
)
|
||||
|
||||
m3_key: Mapped[str] = mapped_column(String(3), nullable=False)
|
||||
description: Mapped[str] = mapped_column(String(50), nullable=False) # valor legal en español
|
||||
description: Mapped[str] = mapped_column(
|
||||
String(50), nullable=False
|
||||
) # valor legal en español
|
||||
mex_key: Mapped[Optional[str]] = mapped_column(String(3))
|
||||
ame_key: Mapped[Optional[str]] = mapped_column(String(2))
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlalchemy.orm import Session
|
||||
from core.database import get_core_db
|
||||
@@ -11,13 +10,12 @@ from typing import Any, Dict
|
||||
router = APIRouter(prefix="/states")
|
||||
|
||||
|
||||
|
||||
@router.get("/", response_model=Dict[str, Any])
|
||||
async def list_states(
|
||||
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(State)
|
||||
@@ -27,23 +25,27 @@ async def list_states(
|
||||
"items": [StateDTO.model_validate(obj) for obj in items],
|
||||
"total": total,
|
||||
"page": page,
|
||||
"page_size": page_size
|
||||
"page_size": page_size,
|
||||
}
|
||||
|
||||
|
||||
|
||||
@router.get("/{m3_key}", response_model=StateDTO)
|
||||
async def get_state(m3_key: str, db: Session = Depends(get_core_db), current_user: dict = Depends(get_current_user)):
|
||||
async def get_state(
|
||||
m3_key: str,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
obj = db.query(State).filter(State.m3_key == m3_key).first()
|
||||
if not obj:
|
||||
raise HTTPException(status_code=404, detail="Not found")
|
||||
return obj
|
||||
|
||||
|
||||
|
||||
@router.post("/", response_model=StateDTO, status_code=201)
|
||||
async def create_state(
|
||||
data: StateDTO,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(has_role("admin"))
|
||||
current_user: dict = Depends(has_role("admin")),
|
||||
):
|
||||
|
||||
obj = State(**data.dict())
|
||||
@@ -52,13 +54,13 @@ async def create_state(
|
||||
db.refresh(obj)
|
||||
return obj
|
||||
|
||||
|
||||
|
||||
@router.put("/{m3_key}", response_model=StateDTO)
|
||||
async def update_state(
|
||||
m3_key: str,
|
||||
data: StateDTO,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(has_role("admin"))
|
||||
current_user: dict = Depends(has_role("admin")),
|
||||
):
|
||||
|
||||
obj = db.query(State).filter(State.m3_key == m3_key).first()
|
||||
@@ -70,12 +72,12 @@ async def update_state(
|
||||
db.refresh(obj)
|
||||
return obj
|
||||
|
||||
|
||||
|
||||
@router.delete("/{m3_key}", status_code=204)
|
||||
async def delete_state(
|
||||
m3_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(State).filter(State.m3_key == m3_key).first()
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
seed = [
|
||||
|
||||
]
|
||||
seed = []
|
||||
|
||||
@@ -7,6 +7,7 @@ app = FastAPI()
|
||||
app.include_router(router)
|
||||
client = TestClient(app)
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("client", "access_token")
|
||||
def test_list_states(client, access_token):
|
||||
headers = {"Authorization": f"Bearer {access_token}"}
|
||||
@@ -16,20 +17,24 @@ def test_list_states(client, access_token):
|
||||
assert "page" in response.json()
|
||||
assert "page_size" in response.json()
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("client", "access_token")
|
||||
def test_get_state_not_found(client, access_token):
|
||||
headers = {"Authorization": f"Bearer {access_token}"}
|
||||
response = client.get("/states/invalid_key", headers=headers)
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_create_state_forbidden():
|
||||
response = client.post("/states/", json={"key": "TST", "description": "Test"})
|
||||
assert response.status_code in (403, 405, 404)
|
||||
|
||||
|
||||
def test_update_state_forbidden():
|
||||
response = client.put("/states/TST", json={"key": "TST", "description": "Test"})
|
||||
assert response.status_code in (403, 405, 404)
|
||||
|
||||
|
||||
def test_delete_state_forbidden():
|
||||
response = client.delete("/states/TST")
|
||||
assert response.status_code in (403, 405, 404)
|
||||
|
||||
Reference in New Issue
Block a user