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:
@@ -1,9 +1,18 @@
|
||||
"""
|
||||
Modelos ORM para gestión de clientes y proveedores
|
||||
"""
|
||||
|
||||
from typing import Optional
|
||||
from decimal import Decimal
|
||||
from sqlalchemy import Integer, String, SmallInteger, Numeric, ForeignKey, PrimaryKeyConstraint, ForeignKeyConstraint
|
||||
from sqlalchemy import (
|
||||
Integer,
|
||||
String,
|
||||
SmallInteger,
|
||||
Numeric,
|
||||
ForeignKey,
|
||||
PrimaryKeyConstraint,
|
||||
ForeignKeyConstraint,
|
||||
)
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from core.database import Base
|
||||
|
||||
@@ -12,21 +21,28 @@ class ClientProvider(Base):
|
||||
"""
|
||||
Modelo para la tabla GClientesPro - Información de clientes y proveedores
|
||||
"""
|
||||
|
||||
__tablename__ = "client_provider"
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint('id', name='client_provider_pkey'),
|
||||
ForeignKeyConstraint(['tenant_id'], ['a76.tenants.id'], name='fk_client_provider_tenant'),
|
||||
ForeignKeyConstraint(['company_id'], ['a76.company.id'], name='fk_client_provider_company'),
|
||||
{"schema": "a76"}
|
||||
PrimaryKeyConstraint("id", name="client_provider_pkey"),
|
||||
ForeignKeyConstraint(
|
||||
["tenant_id"], ["a76.tenants.id"], name="fk_client_provider_tenant"
|
||||
),
|
||||
ForeignKeyConstraint(
|
||||
["company_id"], ["a76.company.id"], name="fk_client_provider_company"
|
||||
),
|
||||
{"schema": "a76"},
|
||||
)
|
||||
|
||||
|
||||
# Primary key
|
||||
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)
|
||||
|
||||
|
||||
# Basic information
|
||||
type_nat_foreign: Mapped[Optional[str]] = mapped_column(String(1)) # TIPO NACIONAL/EXTRANJERO
|
||||
type_nat_foreign: Mapped[Optional[str]] = mapped_column(
|
||||
String(1)
|
||||
) # TIPO NACIONAL/EXTRANJERO
|
||||
name: Mapped[Optional[str]] = mapped_column(String(256))
|
||||
short_name: Mapped[Optional[str]] = mapped_column(String(10))
|
||||
rfc: Mapped[Optional[str]] = mapped_column(String(30))
|
||||
@@ -40,31 +56,45 @@ class ClientProvider(Base):
|
||||
position: Mapped[Optional[str]] = mapped_column(String(30))
|
||||
incoterm: Mapped[Optional[str]] = mapped_column(String(19))
|
||||
is_national_provider: Mapped[Optional[str]] = mapped_column(String(2))
|
||||
enabled_disabled: Mapped[Optional[int]] = mapped_column(SmallInteger)
|
||||
|
||||
enabled_disabled: Mapped[Optional[int]] = mapped_column(SmallInteger)
|
||||
|
||||
# Relationships
|
||||
address: Mapped[Optional["ClientProviderAddress"]] = relationship(back_populates="client_provider", uselist=False, cascade="all, delete-orphan")
|
||||
programs: Mapped[Optional["ClientProviderPrograms"]] = relationship(back_populates="client_provider", uselist=False, cascade="all, delete-orphan")
|
||||
address: Mapped[Optional["ClientProviderAddress"]] = relationship(
|
||||
back_populates="client_provider", uselist=False, cascade="all, delete-orphan"
|
||||
)
|
||||
programs: Mapped[Optional["ClientProviderPrograms"]] = relationship(
|
||||
back_populates="client_provider", uselist=False, cascade="all, delete-orphan"
|
||||
)
|
||||
|
||||
|
||||
class ClientProviderAddress(Base):
|
||||
"""
|
||||
Modelo para la tabla GClientesPro_Direccion - Dirección de clientes y proveedores
|
||||
"""
|
||||
|
||||
__tablename__ = "client_provider_address"
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint('id', name='client_provider_address_pkey'),
|
||||
ForeignKeyConstraint(['tenant_id'], ['a76.tenants.id'], name='fk_client_provider_address_tenant'),
|
||||
ForeignKeyConstraint(['client_id'], ['a76.client_provider.id'], ondelete='CASCADE', name='fk_client_provider_address_client'),
|
||||
{"schema": "a76"}
|
||||
PrimaryKeyConstraint("id", name="client_provider_address_pkey"),
|
||||
ForeignKeyConstraint(
|
||||
["tenant_id"], ["a76.tenants.id"], name="fk_client_provider_address_tenant"
|
||||
),
|
||||
ForeignKeyConstraint(
|
||||
["client_id"],
|
||||
["a76.client_provider.id"],
|
||||
ondelete="CASCADE",
|
||||
name="fk_client_provider_address_client",
|
||||
),
|
||||
{"schema": "a76"},
|
||||
)
|
||||
|
||||
|
||||
# Primary key (foreign key)
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
client_id: Mapped[int] = mapped_column(Integer, ForeignKey('a76.client_provider.id', ondelete='CASCADE'))
|
||||
|
||||
client_id: Mapped[int] = mapped_column(
|
||||
Integer, ForeignKey("a76.client_provider.id", ondelete="CASCADE")
|
||||
)
|
||||
|
||||
tenant_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
||||
|
||||
|
||||
# Address information
|
||||
municipality: Mapped[Optional[str]] = mapped_column(String(150))
|
||||
streets: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
@@ -80,7 +110,7 @@ class ClientProviderAddress(Base):
|
||||
email: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
contact: Mapped[Optional[str]] = mapped_column(String(50))
|
||||
reference: Mapped[Optional[str]] = mapped_column(String(250))
|
||||
|
||||
|
||||
# Relationship
|
||||
client_provider: Mapped["ClientProvider"] = relationship(back_populates="address")
|
||||
|
||||
@@ -89,20 +119,30 @@ class ClientProviderPrograms(Base):
|
||||
"""
|
||||
Modelo para la tabla GClientesPro_Programas - Programas de clientes y proveedores
|
||||
"""
|
||||
|
||||
__tablename__ = "client_provider_programs"
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint('id', name='client_provider_programs_pkey'),
|
||||
ForeignKeyConstraint(['tenant_id'], ['a76.tenants.id'], name='fk_client_provider_programs_tenant'),
|
||||
ForeignKeyConstraint(['client_id'], ['a76.client_provider.id'], ondelete='CASCADE', name='fk_client_provider_programs_client'),
|
||||
{"schema": "a76"}
|
||||
PrimaryKeyConstraint("id", name="client_provider_programs_pkey"),
|
||||
ForeignKeyConstraint(
|
||||
["tenant_id"], ["a76.tenants.id"], name="fk_client_provider_programs_tenant"
|
||||
),
|
||||
ForeignKeyConstraint(
|
||||
["client_id"],
|
||||
["a76.client_provider.id"],
|
||||
ondelete="CASCADE",
|
||||
name="fk_client_provider_programs_client",
|
||||
),
|
||||
{"schema": "a76"},
|
||||
)
|
||||
|
||||
|
||||
# Primary key (foreign key)
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
client_id: Mapped[int] = mapped_column(Integer, ForeignKey('a76.client_provider.id', ondelete='CASCADE'))
|
||||
|
||||
client_id: Mapped[int] = mapped_column(
|
||||
Integer, ForeignKey("a76.client_provider.id", ondelete="CASCADE")
|
||||
)
|
||||
|
||||
tenant_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
||||
|
||||
|
||||
# Program information
|
||||
program: Mapped[Optional[str]] = mapped_column(String(7))
|
||||
program_number: Mapped[Optional[str]] = mapped_column(String(40))
|
||||
@@ -124,8 +164,6 @@ class ClientProviderPrograms(Base):
|
||||
subassembly_service: Mapped[Optional[int]] = mapped_column(SmallInteger)
|
||||
autse_dates: Mapped[Optional[int]] = mapped_column()
|
||||
autse_number: Mapped[Optional[str]] = mapped_column(String(300))
|
||||
|
||||
|
||||
# Relationship
|
||||
client_provider: Mapped["ClientProvider"] = relationship(back_populates="programs")
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user