From 6e7a32cb516e813b441e0fe2f7766a9ce270a488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20Poyatos?= Date: Tue, 3 Jun 2025 16:38:00 +0200 Subject: [PATCH] revert(views): calling order to initial view method (#7921) --- api/src/backend/api/base_views.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/src/backend/api/base_views.py b/api/src/backend/api/base_views.py index 60940733c2..54b020597f 100644 --- a/api/src/backend/api/base_views.py +++ b/api/src/backend/api/base_views.py @@ -47,6 +47,8 @@ class BaseViewSet(ModelViewSet): class BaseRLSViewSet(BaseViewSet): def initial(self, request, *args, **kwargs): + super().initial(request, *args, **kwargs) + # Ideally, this logic would be in the `.setup()` method but DRF view sets don't call it # https://docs.djangoproject.com/en/5.1/ref/class-based-views/base/#django.views.generic.base.View.setup if request.auth is None: @@ -61,8 +63,6 @@ class BaseRLSViewSet(BaseViewSet): self._rls_cm = rls_transaction(tenant_id) self._rls_cm.__enter__() - super().initial(request, *args, **kwargs) - def finalize_response(self, request, response, *args, **kwargs): response = super().finalize_response(request, response, *args, **kwargs) @@ -115,6 +115,8 @@ class BaseTenantViewset(BaseViewSet): pass # Tenant might not exist, handle gracefully def initial(self, request, *args, **kwargs): + super().initial(request, *args, **kwargs) + if request.auth is None: raise NotAuthenticated @@ -127,8 +129,6 @@ class BaseTenantViewset(BaseViewSet): self._rls_cm = rls_transaction(value=user_id, parameter=POSTGRES_USER_VAR) self._rls_cm.__enter__() - super().initial(request, *args, **kwargs) - def finalize_response(self, request, response, *args, **kwargs): response = super().finalize_response(request, response, *args, **kwargs) @@ -141,9 +141,11 @@ class BaseTenantViewset(BaseViewSet): class BaseUserViewset(BaseViewSet): def initial(self, request, *args, **kwargs): + super().initial(request, *args, **kwargs) + # TODO refactor after improving RLS on users if request.stream is not None and request.stream.method == "POST": - return super().initial(request, *args, **kwargs) + return if request.auth is None: raise NotAuthenticated @@ -156,8 +158,6 @@ class BaseUserViewset(BaseViewSet): self._rls_cm = rls_transaction(tenant_id) self._rls_cm.__enter__() - super().initial(request, *args, **kwargs) - def finalize_response(self, request, response, *args, **kwargs): response = super().finalize_response(request, response, *args, **kwargs)