diff --git a/authentik/root/settings.py b/authentik/root/settings.py index c7ddb0c0e1..932fe660cf 100644 --- a/authentik/root/settings.py +++ b/authentik/root/settings.py @@ -269,7 +269,6 @@ MIDDLEWARE_FIRST = [ "django_prometheus.middleware.PrometheusBeforeMiddleware", ] MIDDLEWARE = [ - "authentik.tenants.middleware.DefaultTenantMiddleware", "authentik.root.middleware.LoggingMiddleware", "authentik.root.middleware.ClientIPMiddleware", "authentik.stages.user_login.middleware.BoundSessionMiddleware", diff --git a/authentik/tenants/middleware.py b/authentik/tenants/middleware.py deleted file mode 100644 index 312621e610..0000000000 --- a/authentik/tenants/middleware.py +++ /dev/null @@ -1,23 +0,0 @@ -from django.db.models import Value -from django_tenants.middleware import TenantMainMiddleware -from django_tenants.utils import get_public_schema_name - -from authentik.tenants.models import Domain, Tenant - - -class DefaultTenantMiddleware(TenantMainMiddleware): - def get_tenant(self, domain_model: type[Domain], hostname: str) -> Tenant: - tenant = ( - Tenant.objects.filter(domains__domain=hostname) - .annotate(default=Value(100)) - .union( - Tenant.objects.filter(schema_name=get_public_schema_name()).annotate( - default=Value(10) - ) - ) - .order_by("-default") - .first() - ) - if tenant is None: - raise domain_model.DoesNotExist() - return tenant