maquinaweb-shared-auth 0.2.39__tar.gz → 0.2.41__tar.gz

{maquinaweb_shared_auth-0.2.39 → maquinaweb_shared_auth-0.2.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maquinaweb-shared-auth
-Version: 0.2.39
+Version: 0.2.41
 Summary: Models read-only para autenticação compartilhada entre projetos Django.
 Author-email: Seu Nome <seuemail@dominio.com>
 License: MIT

{maquinaweb_shared_auth-0.2.39 → maquinaweb_shared_auth-0.2.41}/maquinaweb_shared_auth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maquinaweb-shared-auth
-Version: 0.2.39
+Version: 0.2.41
 Summary: Models read-only para autenticação compartilhada entre projetos Django.
 Author-email: Seu Nome <seuemail@dominio.com>
 License: MIT

{maquinaweb_shared_auth-0.2.39 → maquinaweb_shared_auth-0.2.41}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maquinaweb-shared-auth"
-version = "0.2.39"
+version = "0.2.41"
 description = "Models read-only para autenticação compartilhada entre projetos Django."
 readme = "README.md"
 requires-python = ">=3.13"

{maquinaweb_shared_auth-0.2.39 → maquinaweb_shared_auth-0.2.41}/shared_auth/middleware.py

@@ -166,7 +166,10 @@ class OrganizationMiddleware(MiddlewareMixin):
             if not organization_id:
                 return
 
+        organization_ids = self._determine_organization_ids(request)
+
         request.organization_id = organization_id
+        request.organization_ids = organization_ids
         Organization = get_organization_model()
         request.organization = Organization.objects.filter(pk=organization_id).first()
 
@@ -183,6 +186,9 @@ class OrganizationMiddleware(MiddlewareMixin):
 
         return self._get_organization_from_user(request)
 
+    def _determine_organization_ids(self, request):
+        return self._get_organization_ids_from_user(request)
+
     @staticmethod
     def _get_organization_from_header(request):
         if header_value := request.headers.get("X-Organization"):
@@ -206,6 +212,16 @@ class OrganizationMiddleware(MiddlewareMixin):
 
         return member.organization_id if member else None
 
+    @staticmethod
+    def _get_organization_ids_from_user(request):
+        if not request.user.is_authenticated:
+            return None
+
+        Member = get_member_model()
+        member = Member.objects.filter(user_id=request.user.pk)
+
+        return member.values_list("organization_id", flat=True) if member else None
+
     @staticmethod
     def _validate_organization_membership(user, organization_id):
         try:

{maquinaweb_shared_auth-0.2.39 → maquinaweb_shared_auth-0.2.41}/shared_auth/mixins.py

@@ -39,14 +39,15 @@ class OrganizationMixin(models.Model):
         ]
 
     @classmethod
-    def prefetch_organizations(cls, queryset, request):
+    def prefetch_organizations(cls, queryset, request, org_ids=None):
         if not hasattr(request, "_orgs_dict"):
             from shared_auth.utils import get_organization_model
 
             Organization = get_organization_model()
-            org_ids = list(
-                queryset.values_list("organization_id", flat=True).distinct()
-            )
+            if org_ids is None:
+                org_ids = list(
+                    queryset.values_list("organization_id", flat=True).distinct()
+                )
             if not org_ids:
                 request._orgs_dict = {}
                 return queryset
@@ -218,6 +219,10 @@ class LoggedOrganizationMixin(viewsets.ModelViewSet):
         """Obtém o ID da organização logada via maquinaweb-shared-auth"""
         return self.request.organization_id
 
+    def get_organization_ids(self):
+        """Obtém os IDs das organizações permitidas via maquinaweb-shared-auth"""
+        return self.request.organization_ids
+
     def get_user(self):
         """Obtém o usuário atual autenticado"""
         return self.request.user

{maquinaweb_shared_auth-0.2.39 → maquinaweb_shared_auth-0.2.41}/shared_auth/serializers.py

@@ -81,7 +81,9 @@ class OrganizationSerializerMixin(serializers.ModelSerializer):
     def get_organization(self, obj):
         req = self.context.get("request")
         org = getattr(req, "_orgs_dict", {}).get(obj.organization_id) if req else None
-        return self._serialize_org(org) if org else None
+        if org:
+            return self._serialize_org(org)
+        return self._serialize_org(obj.organization)
 
     def _serialize_org(self, org):
         return {