maquinaweb-shared-auth 0.2.40__py3-none-any.whl → 0.2.42__py3-none-any.whl

{maquinaweb_shared_auth-0.2.40.dist-info → maquinaweb_shared_auth-0.2.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maquinaweb-shared-auth
-Version: 0.2.40
+Version: 0.2.42
 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.40.dist-info → maquinaweb_shared_auth-0.2.42.dist-info}/RECORD

@@ -7,8 +7,8 @@ shared_auth/decorators.py,sha256=-2RHRzvPJzN0c8Q-cB1_hf5tk386jcHZ9-GixKSe0ds,334
 shared_auth/exceptions.py,sha256=VKamHjBl2yjXG2RsMrLrXru1_Q9IJXmy4xmDcXlpWsU,627
 shared_auth/fields.py,sha256=RAcmFh1D_nkbai_7t_OrPZhfhAipesy5kKnEj4LUvvM,1254
 shared_auth/managers.py,sha256=OQd76OeAkeyRoFnifQ0zZdp45h27QVwBpR0BgiiTFbQ,6968
-shared_auth/middleware.py,sha256=A8yc8Ld4EslEcPCdekfCrU7eAXgql_AntYjy1xMchu8,6335
-shared_auth/mixins.py,sha256=gaoJcAt2xmGR_2FWJ85rKJohBhvIaS7_U7EhwvBrd28,8379
+shared_auth/middleware.py,sha256=f8KbWI0HowPrxPgHRVd7ByFcMSGjhpR40s34E61W_uU,6954
+shared_auth/mixins.py,sha256=PKu055ey-HsHxc14VbSt1IzYxA-OEtqACxRaJ4_ViuQ,8646
 shared_auth/models.py,sha256=HCVIog61J0xeygYIs_amSA-MsSRhxIlGTSkegA9b51c,1444
 shared_auth/permissions.py,sha256=l48n9qCUMrhQOTa5_Cv1vynv-bb3i5T05yLoyKvKmOM,2713
 shared_auth/router.py,sha256=JhlDjosViMBmuvYm08vJzKyvrg5P5ECtrU4tKAGsuoU,684
@@ -17,7 +17,7 @@ shared_auth/storage_backend.py,sha256=Eqkjz8aF5UrOpRwYl-J0Td95IObfxnJ8eLQDJVFM3I
 shared_auth/urls.py,sha256=591wWEWJPaHEGkcOZ8yvfgxddRyOcZLgOc0vNtF7XRI,289
 shared_auth/utils.py,sha256=E3Ox5FA1D6OHfesZV8Z5D-T4h-zhpHbiHQYfdmRDH8U,4119
 shared_auth/views.py,sha256=2hyLnYSWUscfq-jVcskt-ukzDt4vg6IXeKjRDRu9RXk,1519
-maquinaweb_shared_auth-0.2.40.dist-info/METADATA,sha256=ShSEN-12F39dplOh5DDy9dw7OaJwmhiHSWcFCmtywBk,26325
-maquinaweb_shared_auth-0.2.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maquinaweb_shared_auth-0.2.40.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
-maquinaweb_shared_auth-0.2.40.dist-info/RECORD,,
+maquinaweb_shared_auth-0.2.42.dist-info/METADATA,sha256=OI7q3qHFt2nbcdg0Ajbs6h_eshZYavN7TamsiTHwK2I,26325
+maquinaweb_shared_auth-0.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maquinaweb_shared_auth-0.2.42.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
+maquinaweb_shared_auth-0.2.42.dist-info/RECORD,,

shared_auth/middleware.py

@@ -155,6 +155,7 @@ class OrganizationMiddleware(MiddlewareMixin):
 
         organization_id = self._determine_organization_id(request)
         user = self._authenticate_user(request)
+        request.user = user
 
         if not organization_id and not user:
             return
@@ -166,7 +167,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 +187,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 +213,18 @@ 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 (
+            list(member.values_list("organization_id", flat=True)) if member else None
+        )
+
     @staticmethod
     def _validate_organization_membership(user, organization_id):
         try:

shared_auth/mixins.py

@@ -28,7 +28,10 @@ class OrganizationMixin(models.Model):
     """
 
     organization_id = models.IntegerField(
-        db_index=True, help_text="ID da organização no sistema de autenticação"
+        db_index=True,
+        help_text="ID da organização no sistema de autenticação",
+        null=True,
+        default=None,
     )
     objects = BaseAuthManager()
 
@@ -109,7 +112,10 @@ class UserMixin(models.Model):
     """
 
     user_id = models.IntegerField(
-        db_index=True, help_text="ID do usuário no sistema de autenticação"
+        db_index=True,
+        help_text="ID do usuário no sistema de autenticação",
+        null=True,
+        default=None,
     )
     objects = BaseAuthManager()
 
@@ -219,6 +225,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