acazares
52b8fcd434
- 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.
70 lines
2.1 KiB
Python
70 lines
2.1 KiB
Python
"""
|
|
Modelo de relación entre usuarios (Keycloak) y tenants
|
|
"""
|
|
|
|
from sqlalchemy import (
|
|
Integer,
|
|
String,
|
|
DateTime,
|
|
Boolean,
|
|
UniqueConstraint,
|
|
ForeignKeyConstraint,
|
|
)
|
|
from sqlalchemy.sql import func
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
from datetime import datetime
|
|
from typing import Optional, TYPE_CHECKING
|
|
from core.database import Base
|
|
|
|
if TYPE_CHECKING:
|
|
from api.v1.modules.a76.tenants.models import Tenant
|
|
|
|
|
|
class UserTenant(Base):
|
|
"""
|
|
Relación muchos-a-muchos entre usuarios de Keycloak y tenants
|
|
|
|
Un usuario puede pertenecer a múltiples tenants
|
|
Un tenant puede tener múltiples usuarios
|
|
"""
|
|
|
|
__tablename__ = "user_tenants"
|
|
__table_args__ = (
|
|
ForeignKeyConstraint(["company_id"], ["a76.company.id"]),
|
|
ForeignKeyConstraint(["tenant_id"], ["a76.tenants.id"]),
|
|
UniqueConstraint(
|
|
"keycloak_user_id", "tenant_id", "company_id", name="uq_user_tenant"
|
|
),
|
|
{"schema": "a76"},
|
|
)
|
|
|
|
# Primary Key
|
|
id: Mapped[int] = mapped_column(primary_key=True, index=True)
|
|
|
|
# ID del usuario en Keycloak (UUID string)
|
|
keycloak_user_id: Mapped[str] = mapped_column(
|
|
String(255), nullable=False, index=True
|
|
)
|
|
|
|
# ID del tenant
|
|
tenant_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
|
company_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
|
|
|
# Estado de la relación
|
|
is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
|
|
|
|
# Información adicional - Rol del usuario en este tenant (opcional)
|
|
role: Mapped[Optional[str]] = mapped_column(String(50), nullable=True)
|
|
|
|
# Timestamps
|
|
created_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.now()
|
|
)
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime, nullable=False, server_default=func.now(), onupdate=func.now()
|
|
)
|
|
deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True)
|
|
|
|
# Relación con Tenant
|
|
tenant: Mapped["Tenant"] = relationship("Tenant", back_populates="user_relations")
|