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:
@@ -5,6 +5,7 @@ DTOs for GBultos.
|
||||
from pydantic import BaseModel
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class GBultoBaseDTO(BaseModel):
|
||||
CODE: str
|
||||
DESCRIPTION: Optional[str]
|
||||
@@ -15,9 +16,11 @@ class GBultoBaseDTO(BaseModel):
|
||||
CODE_ACE: Optional[str]
|
||||
CODE_AAMEX: Optional[str]
|
||||
|
||||
|
||||
class GBultoCreateDTO(GBultoBaseDTO):
|
||||
pass
|
||||
|
||||
|
||||
class GBultoUpdateDTO(BaseModel):
|
||||
DESCRIPTION: Optional[str]
|
||||
DESCRIPTIONI: Optional[str]
|
||||
@@ -27,9 +30,10 @@ class GBultoUpdateDTO(BaseModel):
|
||||
CODE_ACE: Optional[str]
|
||||
CODE_AAMEX: Optional[str]
|
||||
|
||||
|
||||
class GBultoResponseDTO(GBultoBaseDTO):
|
||||
CREATED_AT: Optional[str]
|
||||
UPDATED_AT: Optional[str]
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
from_attributes = True
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
from typing import Optional
|
||||
from datetime import datetime
|
||||
from decimal import Decimal
|
||||
from sqlalchemy import DateTime, Integer, String, DECIMAL, ForeignKey, PrimaryKeyConstraint, ForeignKeyConstraint, UniqueConstraint
|
||||
from sqlalchemy import (
|
||||
DateTime,
|
||||
Integer,
|
||||
String,
|
||||
DECIMAL,
|
||||
ForeignKey,
|
||||
PrimaryKeyConstraint,
|
||||
ForeignKeyConstraint,
|
||||
UniqueConstraint,
|
||||
)
|
||||
from sqlalchemy.sql import func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
from core.database import Base
|
||||
@@ -10,17 +19,21 @@ from core.database import Base
|
||||
class Package(Base):
|
||||
__tablename__ = "packages" # GBultos
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint('id', name='packages_pkey'),
|
||||
ForeignKeyConstraint(['tenant_id'], ['a76.tenants.id'], name='fk_packages_tenant'),
|
||||
ForeignKeyConstraint(['company_id'], ['a76.company.id'], name='fk_packages_company'),
|
||||
UniqueConstraint('tenant_id', 'company_id', 'key', name='packages_key_ukey'),
|
||||
{"schema": "a76"}
|
||||
PrimaryKeyConstraint("id", name="packages_pkey"),
|
||||
ForeignKeyConstraint(
|
||||
["tenant_id"], ["a76.tenants.id"], name="fk_packages_tenant"
|
||||
),
|
||||
ForeignKeyConstraint(
|
||||
["company_id"], ["a76.company.id"], name="fk_packages_company"
|
||||
),
|
||||
UniqueConstraint("tenant_id", "company_id", "key", name="packages_key_ukey"),
|
||||
{"schema": "a76"},
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
tenant_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
||||
company_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
||||
|
||||
|
||||
key: Mapped[str] = mapped_column(String(5))
|
||||
description_es: Mapped[Optional[str]] = mapped_column(String(40))
|
||||
description_en: Mapped[Optional[str]] = mapped_column(String(40))
|
||||
@@ -29,10 +42,12 @@ class Package(Base):
|
||||
plural_in: Mapped[Optional[str]] = mapped_column(String(4))
|
||||
code_ace: Mapped[Optional[str]] = mapped_column(String(4))
|
||||
code_aamex: Mapped[Optional[str]] = mapped_column(String(9))
|
||||
|
||||
# Timestamps
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=func.now())
|
||||
updated_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=func.now(), onupdate=func.now())
|
||||
deleted_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
|
||||
|
||||
# Timestamps
|
||||
created_at: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, default=func.now()
|
||||
)
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, default=func.now(), onupdate=func.now()
|
||||
)
|
||||
deleted_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
|
||||
@@ -16,7 +16,7 @@ async def list_bultos(
|
||||
skip: int = 0,
|
||||
limit: int = 100,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user)
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
"""
|
||||
List all GBultos with pagination.
|
||||
@@ -35,7 +35,7 @@ async def list_bultos(
|
||||
async def read_bulto(
|
||||
code: str,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user)
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
"""
|
||||
Get a specific Package by its CODE.
|
||||
@@ -57,7 +57,7 @@ async def read_bulto(
|
||||
async def create_gbulto(
|
||||
bulto_data: GBultoCreateDTO,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user)
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
"""
|
||||
Create a new Package.
|
||||
@@ -77,7 +77,7 @@ async def update_bulto(
|
||||
code: str,
|
||||
bulto_data: GBultoUpdateDTO,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user)
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
"""
|
||||
Update an existing Package.
|
||||
@@ -99,7 +99,7 @@ async def update_bulto(
|
||||
async def delete_bulto(
|
||||
code: str,
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: dict = Depends(get_current_user)
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
"""
|
||||
Delete a Package by its CODE.
|
||||
@@ -113,4 +113,4 @@ async def delete_bulto(
|
||||
|
||||
bulto = GBultoService.delete_bulto(db, code)
|
||||
if not bulto:
|
||||
raise HTTPException(status_code=404, detail="Package not found")
|
||||
raise HTTPException(status_code=404, detail="Package not found")
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
from sqlalchemy.orm import Session
|
||||
from . import models, dto
|
||||
|
||||
|
||||
class GBultoService:
|
||||
"""
|
||||
Service layer for GBultos.
|
||||
@@ -34,4 +35,4 @@ class GBultoService:
|
||||
if bulto:
|
||||
db.delete(bulto)
|
||||
db.commit()
|
||||
return bulto
|
||||
return bulto
|
||||
|
||||
Reference in New Issue
Block a user