maquinaweb-shared-auth 0.1.5__tar.gz → 0.1.8__tar.gz

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/PKG-INFO

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

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/maquinaweb_shared_auth.egg-info/PKG-INFO

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

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/pyproject.toml

@@ -4,14 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maquinaweb-shared-auth"
-version = "0.1.5"
+version = "0.1.8"
 description = "Models read-only para autenticação compartilhada entre projetos Django."
 readme = "README.md"
 requires-python = ">=3.13"
-license = {text = "MIT"}
-authors = [
-  { name="Seu Nome", email="seuemail@dominio.com" },
-]
+license = { text = "MIT" }
+authors = [{ name = "Seu Nome", email = "seuemail@dominio.com" }]
 keywords = ["django", "auth", "models", "shared"]
 classifiers = [
   "Framework :: Django",
@@ -20,11 +18,7 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 
-dependencies = [
-    "django>=5",
-    "djangorestframework>=3",
-    "setuptools>=70",
-]
+dependencies = ["django>=5", "djangorestframework>=3", "setuptools>=70"]
 
 [project.urls]
 Homepage = "https://github.com/maquinaweb/maquinaweb-shared-auth"
@@ -33,4 +27,4 @@ Issues = "https://github.com/maquinaweb/maquinaweb-shared-auth/issues"
 
 [pypi]
 username = "_token_"
-password = "pypi-AgEIcHlwaS5vcmcCJGM4ZmEzMGRiLTM4YjEtNGI5MS1iYWIyLTZjMGQyMzg0MDMxYgACKlszLCJhMTJiZjkzYy1mNDFkLTRhZDYtYjRlZS04YTkyN2VkZjNmMWMiXQAABiD1CfDzVBuqdawZozNrZo1uBw7aHrZ-FIgGz9DacY8dGQ"
+password = "pypi-AgEIcHlwaS5vcmcCJGE5ZGRjMjJmLTgyMTMtNGExMC1iNzNhLTMwODZlOGNkMzRmMQACHlsxLFsibWFxdWluYXdlYi1zaGFyZWQtYXV0aCJdXQACLFsyLFsiZGEzMmMyMGUtYzQwMy00NTdmLThkMGItNjBhMmUyM2FmZTM1Il1dAAAGINvA-Vz3VzZFOSJ7XlOeJFMCSP7uv4dbA4HUCaxZaeoW"

maquinaweb_shared_auth-0.1.8/shared_auth/__init__.py

@@ -0,0 +1,6 @@
+"""
+Biblioteca compartilhada para acesso aos models de autenticação
+"""
+
+__version__ = '1.0.0'
+default_app_config = "shared_auth.app.SharedAuthConfig"

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/shared_auth/app.py

@@ -3,4 +3,7 @@ from django.apps import AppConfig
 
 class SharedAuthConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "shared_auth"
+    name = "shared_auth"
+
+    def ready(self):
+        from . import models, exceptions

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/shared_auth/decorators.py

@@ -3,8 +3,10 @@ Decorators para views funcionais
 """
 
 from functools import wraps
+
 from django.http import JsonResponse
-from .models import SharedToken, SharedUser, SharedOrganization
+
+from .models import SharedOrganization, SharedToken, SharedUser
 
 
 def require_auth(view_func):
@@ -52,16 +54,13 @@ def require_organization(view_func):
     @wraps(view_func)
     @require_auth
     def wrapped_view(request, *args, **kwargs):
-        if (
-            not hasattr(request.user, "logged_organization_id")
-            or not request.user.logged_organization_id
-        ):
+        if not hasattr(request, "organization_id") or not request.organization_id:
             return JsonResponse({"error": "Organização não definida"}, status=403)
 
         # Buscar organização
         try:
             org = SharedOrganization.objects.using("auth_db").get(
-                pk=request.user.logged_organization_id
+                pk=request.organization_id
             )
 
             if not org.is_active():
@@ -94,8 +93,6 @@ def require_same_organization(view_func):
 
         # Aqui você precisa buscar o objeto e verificar
         # Exemplo genérico - adapte conforme seu model
-        from django.apps import apps
-
         # Tentar identificar o model pelo path
         # Esta é uma implementação básica
         # Em produção, você pode passar o model como parâmetro

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/shared_auth/managers.py

@@ -3,6 +3,7 @@ Managers customizados para os models compartilhados
 """
 
 from django.db import models
+from django.contrib.auth.models import UserManager
 from .exceptions import OrganizationNotFoundError, UserNotFoundError
 
 
@@ -43,7 +44,7 @@ class SharedOrganizationManager(models.Manager):
         return self.filter(cnpj__contains=clean_cnpj).first()
 
 
-class SharedUserManager(models.Manager):
+class SharedUserManager(UserManager):
     """Manager para SharedUser"""
 
     def get_or_fail(self, user_id):

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/shared_auth/middleware.py

@@ -2,12 +2,11 @@
 Middlewares para autenticação compartilhada
 """
 
-from django.utils.deprecation import MiddlewareMixin
 from django.http import JsonResponse
+from django.utils.deprecation import MiddlewareMixin
 
-from . import SharedMember
 from .authentication import SharedTokenAuthentication
-from .models import SharedToken, SharedUser, SharedOrganization
+from .models import SharedMember, SharedOrganization, SharedToken, SharedUser
 
 
 class SharedAuthMiddleware(MiddlewareMixin):
@@ -46,7 +45,7 @@ class SharedAuthMiddleware(MiddlewareMixin):
         token = self._get_token_from_request(request)
 
         if not token:
-            request.user = None
+            # request.user = None
             request.auth = None
             return None
 
@@ -56,16 +55,16 @@ class SharedAuthMiddleware(MiddlewareMixin):
             user = SharedUser.objects.using("auth_db").get(pk=token_obj.user_id)
 
             if not user.is_active or user.deleted_at is not None:
-                request.user = None
+                # request.user = None
                 request.auth = None
                 return None
 
             # Adicionar ao request
-            request.user = user
+            # request.user = user
             request.auth = token_obj
 
         except (SharedToken.DoesNotExist, SharedUser.DoesNotExist):
-            request.user = None
+            # request.user = None
             request.auth = None
 
         return None
@@ -149,6 +148,9 @@ class OrganizationMiddleware(MiddlewareMixin):
         organization_id = self._determine_organization_id(request)
         user = self._authenticate_user(request)
 
+        if not organization_id and not user:
+            return
+
         if organization_id and user:
             organization_id = self._validate_organization_membership(
                 user, organization_id
@@ -157,7 +159,11 @@ class OrganizationMiddleware(MiddlewareMixin):
                 return
 
         request.organization_id = organization_id
-        request.organization = SharedOrganization.objects.get_or_fail(organization_id)
+        request.organization = (
+            SharedOrganization.objects.using("auth_db")
+            .filter(pk=organization_id)
+            .first()
+        )
 
     @staticmethod
     def _authenticate_user(request):
@@ -171,6 +177,7 @@ class OrganizationMiddleware(MiddlewareMixin):
             return org_id
 
         return self._get_organization_from_user(request)
+
     @staticmethod
     def _get_organization_from_header(request):
         if header_value := request.headers.get("X-Organization"):
@@ -179,22 +186,26 @@ class OrganizationMiddleware(MiddlewareMixin):
             except (ValueError, TypeError):
                 pass
         return None
+
     @staticmethod
     def _get_organization_from_user(request):
+        """
+        Retorna a primeira organização do usuário autenticado
+        """
         if not request.user.is_authenticated:
             return None
 
-        if (
-            hasattr(request.user, "logged_organization")
-            and request.user.logged_organization
-        ):
-            return request.user.logged_organization.id
+        # Buscar a primeira organização que o usuário pertence
+        member = (
+            SharedMember.objects.using("auth_db")
+            .filter(user_id=request.user.pk)
+            .first()
+        )
+
+        return member.organization_id if member else None
 
-        return None
     @staticmethod
-    def _validate_organization_membership(
-        user, organization_id
-    ):
+    def _validate_organization_membership(user, organization_id):
         try:
             member = get_member(user, organization_id)
             if not member and not user.is_superuser:
@@ -203,5 +214,8 @@ class OrganizationMiddleware(MiddlewareMixin):
         except Exception:
             return None
 
+
 def get_member(user, organization_id):
-    return SharedMember.objects.filter(user_id=user.pk, organization_id=organization_id).first()
+    return SharedMember.objects.filter(
+        user_id=user.pk, organization_id=organization_id
+    ).first()

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/shared_auth/models.py

@@ -3,12 +3,14 @@ Models READ-ONLY para acesso aos dados de autenticação
 ATENÇÃO: Estes models NÃO devem ser usados para criar migrations
 """
 
+from django.contrib.auth.models import AbstractUser
 from django.db import models
-from .conf import ORGANIZATION_TABLE, USER_TABLE, MEMBER_TABLE
+
+from .conf import MEMBER_TABLE, ORGANIZATION_TABLE, USER_TABLE
 from .managers import (
+    SharedMemberManager,
     SharedOrganizationManager,
     SharedUserManager,
-    SharedMemberManager,
 )
 
 
@@ -132,23 +134,15 @@ class SharedOrganization(models.Model):
         return self.deleted_at is None
 
 
-class SharedUser(models.Model):
+class SharedUser(AbstractUser):
     """
     Model READ-ONLY da tabela auth_user
     """
 
-    username = models.CharField(max_length=150)
-    first_name = models.CharField(max_length=150, blank=True)
-    last_name = models.CharField(max_length=150, blank=True)
-    email = models.EmailField()
-    is_staff = models.BooleanField(default=False)
-    is_active = models.BooleanField(default=True)
-    is_superuser = models.BooleanField(default=False)
     date_joined = models.DateTimeField()
     last_login = models.DateTimeField(null=True, blank=True)
 
     # Campos customizados
-    logged_organization_id = models.IntegerField(null=True, blank=True)
     createdat = models.DateTimeField()
     updatedat = models.DateTimeField()
     deleted_at = models.DateTimeField(null=True, blank=True)
@@ -160,51 +154,6 @@ class SharedUser(models.Model):
         db_table = USER_TABLE
         app_label = "shared_auth"
 
-    def __str__(self):
-        return self.get_full_name() or self.username
-
-    def get_full_name(self):
-        """Retorna nome completo"""
-        return f"{self.first_name} {self.last_name}".strip()
-
-    @property
-    def logged_organization(self):
-        """
-        Acessa organização logada (lazy loading)
-
-        Usage:
-            user = SharedUser.objects.get(pk=1)
-            org = user.logged_organization
-            print(org.name)
-        """
-        if self.logged_organization_id:
-            return SharedOrganization.objects.get_or_fail(self.logged_organization_id)
-        return None
-
-    @property
-    def organizations(self):
-        """
-        Retorna todas as organizações do usuário
-
-        Usage:
-            orgs = user.organizations
-        """
-        member_orgs = SharedMember.objects.for_user(self.pk)
-        org_ids = member_orgs.values_list("organization_id", flat=True)
-        return SharedOrganization.objects.filter(pk__in=org_ids)
-
-    @property
-    def memberships(self):
-        """
-        Retorna memberships do usuário
-
-        Usage:
-            memberships = user.memberships
-            for m in memberships:
-                print(m.organization.name)
-        """
-        return SharedMember.objects.for_user(self.pk)
-
 
 class SharedMember(models.Model):
     """

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/shared_auth/permissions.py

@@ -4,6 +4,8 @@ Permissões customizadas para DRF
 
 from rest_framework import permissions
 
+from shared_auth.middleware import get_member
+
 
 class IsAuthenticated(permissions.BasePermission):
     """
@@ -26,10 +28,10 @@ class HasActiveOrganization(permissions.BasePermission):
     message = "Organização ativa necessária."
 
     def has_permission(self, request, view):
-        if not request.user or not hasattr(request.user, "logged_organization_id"):
+        if not request.user or not hasattr(request, "organization_id"):
             return False
 
-        if not request.user.logged_organization_id:
+        if not request.organization_id:
             return False
 
         # Verificar se organização está ativa
@@ -37,7 +39,7 @@ class HasActiveOrganization(permissions.BasePermission):
 
         try:
             org = SharedOrganization.objects.using("auth_db").get(
-                pk=request.user.logged_organization_id
+                pk=request.organization_id
             )
             return org.is_active()
         except SharedOrganization.DoesNotExist:
@@ -54,13 +56,17 @@ class IsSameOrganization(permissions.BasePermission):
     message = "Você não tem permissão para acessar este recurso."
 
     def has_object_permission(self, request, view, obj):
-        if not hasattr(request.user, "logged_organization_id"):
+        if not hasattr(request, "organization_id"):
             return False
 
         if not hasattr(obj, "organization_id"):
             return True  # Se objeto não tem org, permite
 
-        return obj.organization_id == request.user.logged_organization_id
+        # Verifica se o usuário é membro da organização do objeto
+        if not get_member(request.user, obj.organization_id):
+            return False
+
+        return obj.organization_id == request.organization_id
 
 
 class IsOwnerOrSameOrganization(permissions.BasePermission):
@@ -78,9 +84,9 @@ class IsOwnerOrSameOrganization(permissions.BasePermission):
             return True
 
         # Verificar se é da mesma organização
-        if hasattr(obj, "organization_id") and hasattr(
-            request.user, "logged_organization_id"
-        ):
-            return obj.organization_id == request.user.logged_organization_id
+        if hasattr(obj, "organization_id") and hasattr(request, "organization_id"):
+            # Verifica se o usuário é membro da organização do objeto
+            if get_member(request.user, obj.organization_id):
+                return obj.organization_id == request.organization_id
 
         return False

{maquinaweb_shared_auth-0.1.5 → maquinaweb_shared_auth-0.1.8}/shared_auth/router.py

@@ -12,7 +12,7 @@ class SharedAuthRouter:
 
     def db_for_write(self, model, **hints):
         if model._meta.app_label in self.route_app_labels:
-            return None
+            return "auth_db"
         return None
 
     def allow_migrate(self, db, app_label, model_name=None, **hints):

maquinaweb_shared_auth-0.1.5/shared_auth/__init__.py

@@ -1,21 +0,0 @@
-"""
-Biblioteca compartilhada para acesso aos models de autenticação
-"""
-from .models import (
-    SharedOrganization,
-    SharedUser,
-    SharedMember,
-)
-from .exceptions import (
-    OrganizationNotFoundError,
-    UserNotFoundError,
-)
-
-__version__ = '1.0.0'
-__all__ = [
-    'SharedOrganization',
-    'SharedUser',
-    'SharedMember',
-    'OrganizationNotFoundError',
-    'UserNotFoundError',
-]