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.
55 lines
1.8 KiB
Python
55 lines
1.8 KiB
Python
from sqlalchemy import (
|
|
Integer,
|
|
String,
|
|
ForeignKey,
|
|
PrimaryKeyConstraint,
|
|
ForeignKeyConstraint,
|
|
UniqueConstraint,
|
|
)
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
from core.database import Base
|
|
|
|
|
|
class CountryRuleOct(Base):
|
|
__tablename__ = "country_rule_oct"
|
|
__table_args__ = (
|
|
PrimaryKeyConstraint("id", name="country_rule_oct_pkey"),
|
|
ForeignKeyConstraint(
|
|
["tenant_id"], ["a76.tenants.id"], name="fk_country_rule_oct_tenant"
|
|
),
|
|
ForeignKeyConstraint(
|
|
["company_id"], ["a76.company.id"], name="fk_country_rule_oct_company"
|
|
),
|
|
ForeignKeyConstraint(
|
|
["tenant_id", "company_id", "permission", "line", "fraction"],
|
|
[
|
|
"a76.fraction_rule_octave.tenant_id",
|
|
"a76.fraction_rule_octave.company_id",
|
|
"a76.fraction_rule_octave.permission",
|
|
"a76.fraction_rule_octave.line",
|
|
"a76.fraction_rule_octave.fraction",
|
|
],
|
|
ondelete="CASCADE",
|
|
name="fk_country_rule_oct_frac_octava",
|
|
),
|
|
UniqueConstraint(
|
|
"tenant_id",
|
|
"company_id",
|
|
"permission",
|
|
"line",
|
|
"fraction",
|
|
"country_code",
|
|
name="uq_country_rule_oct_permission_line_fraction_country",
|
|
),
|
|
{"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)
|
|
|
|
permission: Mapped[str] = mapped_column(String(20))
|
|
line: Mapped[int] = mapped_column()
|
|
fraction: Mapped[str] = mapped_column(String(10))
|
|
country_code: Mapped[str] = mapped_column(String(3))
|