Invario/Inventarsystem
3
1
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases 216 Wiki Activity

fix: enhance tenant ID management in session for multi-tenant support

Browse Source
This commit is contained in:
AIIrondev
2026-05-20 20:12:01 +02:00
parent 17745c64e0
commit b29cc38a3d
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/app.py
+1
View File
@@ -4177,6 +4177,7 @@ def logout():
session.pop('is_admin', None) session.pop('is_admin', None)
session.pop('favorites', None) session.pop('favorites', None)
session.pop('favorites_owner', None) session.pop('favorites_owner', None)
session.pop('tenant_id', None)
return redirect(url_for('login')) return redirect(url_for('login'))
Web/tenant.py
+14 -1
View File
@@ -7,7 +7,7 @@ Supports subdomain-based tenant identification and per-tenant database namespaci
Each tenant can support up to 20+ users with isolated data and resource pools. Each tenant can support up to 20+ users with isolated data and resource pools.
""" """
from flask import request, g, has_request_context from flask import request, g, session, has_request_context
from functools import wraps from functools import wraps
import logging import logging
import os import os
@@ -209,6 +209,7 @@ class TenantContext:
if tenant_from_header: if tenant_from_header:
self.tenant_id = tenant_from_header self.tenant_id = tenant_from_header
self.config = get_tenant_config(tenant_from_header) self.config = get_tenant_config(tenant_from_header)
session['tenant_id'] = tenant_from_header
return self._get_db_name(tenant_from_header) return self._get_db_name(tenant_from_header)
# Priority 2: Port-based tenant mapping # Priority 2: Port-based tenant mapping
@@ -221,6 +222,7 @@ class TenantContext:
if tenant_from_port: if tenant_from_port:
self.tenant_id = tenant_from_port self.tenant_id = tenant_from_port
self.config = get_tenant_config(tenant_from_port) self.config = get_tenant_config(tenant_from_port)
session['tenant_id'] = tenant_from_port
logger.info( logger.info(
f"Tenant resolution by port: host={host} port={port} tenant={tenant_from_port} config={self.config}" f"Tenant resolution by port: host={host} port={port} tenant={tenant_from_port} config={self.config}"
) )
@@ -241,12 +243,23 @@ class TenantContext:
self.subdomain = potential_subdomain self.subdomain = potential_subdomain
self.tenant_id = potential_subdomain self.tenant_id = potential_subdomain
self.config = get_tenant_config(potential_subdomain) self.config = get_tenant_config(potential_subdomain)
session['tenant_id'] = potential_subdomain
logger.info( logger.info(
f"Tenant resolution by subdomain: host={host} tenant={potential_subdomain} config={self.config}" f"Tenant resolution by subdomain: host={host} tenant={potential_subdomain} config={self.config}"
) )
return self._get_db_name(potential_subdomain) return self._get_db_name(potential_subdomain)
logger.info(f"Tenant subdomain ignored: {potential_subdomain}") logger.info(f"Tenant subdomain ignored: {potential_subdomain}")
# Priority 4: sticky tenant from the authenticated session
session_tenant = session.get('tenant_id', '').strip() if session.get('tenant_id') else ''
if session_tenant:
self.tenant_id = session_tenant
self.config = get_tenant_config(session_tenant)
logger.info(
f"Tenant resolution by session: host={host} tenant={session_tenant} config={self.config}"
)
return self._get_db_name(session_tenant)
# Fallback to default tenant if no tenant identifier found. # Fallback to default tenant if no tenant identifier found.
# If no explicit 'default' tenant config exists, use configured MongoDB DB. # If no explicit 'default' tenant config exists, use configured MongoDB DB.
if 'default' in TENANT_REGISTRY: if 'default' in TENANT_REGISTRY: