maquinaweb-shared-auth 0.2.25__py3-none-any.whl → 0.2.27__py3-none-any.whl

{maquinaweb_shared_auth-0.2.25.dist-info → maquinaweb_shared_auth-0.2.27.dist-info}/RECORD

@@ -8,14 +8,14 @@ shared_auth/fields.py,sha256=RAcmFh1D_nkbai_7t_OrPZhfhAipesy5kKnEj4LUvvM,1254
 shared_auth/managers.py,sha256=xRj8d5r2Q5pBi36dQAOasS7EPvUUehb0eFbA-sAuzxY,6727
 shared_auth/middleware.py,sha256=72GF8kGijbhw98v2Q-1sXBXk-7Bamfyvypm9h8xLX_I,6112
 shared_auth/mixins.py,sha256=BSYNTWYjLRGuxfy7x-uAaNZmrTMsm67ogAQzjrU2DoQ,7388
-shared_auth/models.py,sha256=5AmjW-NJnqYn3MawGYY3VFo1Eow3BXgJbUCHQtdqslA,6562
+shared_auth/models.py,sha256=vCyssDwKfWRE3ofl6LK_CB1-y5O-_6uvJyGZGoCnb44,6574
 shared_auth/permissions.py,sha256=FNIp12ePOUlXVp26zNMAyEtzX9kwyP7RuNIgaaCXtPA,2671
 shared_auth/router.py,sha256=zYidJ7j40lQLrhkCtAQAp-rQLhua_UF0X7SDzYRcV5w,668
-shared_auth/serializers.py,sha256=zTsmx534Z4Ms1-ZRsFeu4QK0ksHZgpyOz9GMXAlaF34,4949
+shared_auth/serializers.py,sha256=h50UhgOJ6Z6HNtxWjv6OK-Z9F_DOuV-PcCAg6FCzBtU,5125
 shared_auth/storage_backend.py,sha256=Eqkjz8aF5UrOpRwYl-J0Td95IObfxnJ8eLQDJVFM3Io,184
 shared_auth/urls.py,sha256=591wWEWJPaHEGkcOZ8yvfgxddRyOcZLgOc0vNtF7XRI,289
 shared_auth/views.py,sha256=2hyLnYSWUscfq-jVcskt-ukzDt4vg6IXeKjRDRu9RXk,1519
-maquinaweb_shared_auth-0.2.25.dist-info/METADATA,sha256=qmccZn3g0nVSNxTQM_214989rHkfogY5Stwt95T5vt4,27190
-maquinaweb_shared_auth-0.2.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maquinaweb_shared_auth-0.2.25.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
-maquinaweb_shared_auth-0.2.25.dist-info/RECORD,,
+maquinaweb_shared_auth-0.2.27.dist-info/METADATA,sha256=5xy3iG2RNHGZFu4eC_86xna6tzPpXfefwQLRk0inRJw,26331
+maquinaweb_shared_auth-0.2.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maquinaweb_shared_auth-0.2.27.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
+maquinaweb_shared_auth-0.2.27.dist-info/RECORD,,

shared_auth/models.py

@@ -3,16 +3,15 @@ Models READ-ONLY para acesso aos dados de autenticação
 ATENÇÃO: Estes models NÃO devem ser usados para criar migrations
 """
 
+import os
+
 from django.contrib.auth.models import AbstractUser
 from django.db import models
+
+from .conf import MEMBER_TABLE, ORGANIZATION_TABLE, TOKEN_TABLE, USER_TABLE
 from .exceptions import OrganizationNotFoundError
-from .conf import MEMBER_TABLE, ORGANIZATION_TABLE, USER_TABLE, TOKEN_TABLE
+from .managers import SharedMemberManager, SharedOrganizationManager, SharedUserManager
 from .storage_backend import Storage
-from .managers import (
-    SharedMemberManager,
-    SharedOrganizationManager,
-    SharedUserManager,
-)
 
 
 class SharedToken(models.Model):
@@ -46,6 +45,7 @@ class SharedToken(models.Model):
         # Implementar lógica de expiração se necessário
         return True
 
+
 def organization_image_path(instance, filename):
     return os.path.join(
         "organization",
@@ -54,6 +54,7 @@ def organization_image_path(instance, filename):
         filename,
     )
 
+
 class SharedOrganization(models.Model):
     """
     Model READ-ONLY da tabela organization
@@ -67,7 +68,9 @@ class SharedOrganization(models.Model):
     telephone = models.CharField(max_length=50, blank=True, null=True)
     cellphone = models.CharField(max_length=50, blank=True, null=True)
     email = models.EmailField(blank=True, null=True)
-    image_organization = models.ImageField(storage=Storage,upload_to=organization_image_path, null=True)
+    image_organization = models.ImageField(
+        storage=Storage, upload_to=organization_image_path, null=True
+    )
 
     # Relacionamentos
     main_organization_id = models.IntegerField(null=True, blank=True)
@@ -146,7 +149,7 @@ class User(AbstractUser):
 
     date_joined = models.DateTimeField()
     last_login = models.DateTimeField(null=True, blank=True)
-    avatar = models.ImageField(storage=Storage,blank=True, null=True)
+    avatar = models.ImageField(storage=Storage, blank=True, null=True)
     # Campos customizados
     createdat = models.DateTimeField()
     updatedat = models.DateTimeField()
@@ -188,7 +191,6 @@ class User(AbstractUser):
         return organization
 
 
-
 class SharedMember(models.Model):
     """
     Model READ-ONLY da tabela organization_member

shared_auth/serializers.py

@@ -38,6 +38,7 @@ class OrganizationSerializerMixin(serializers.ModelSerializer):
                 "id": org.pk,
                 "name": org.name,
                 "fantasy_name": org.fantasy_name,
+                "image_organization": org.image_organization.url if org.image_organization else None,
                 "cnpj": org.cnpj,
                 "email": org.email,
                 "telephone": org.telephone,
@@ -99,11 +100,12 @@ class UserSerializerMixin(serializers.ModelSerializer):
     def get_user(self, obj):
         """Retorna dados do usuário como objeto"""
         try:
-            user = obj.user
+            user: User = obj.user
             return {
                 "id": user.pk,
                 "username": user.username,
                 "email": user.email,
+                "avatar": user.avatar.url if user.avatar else None,
                 "first_name": user.first_name,
                 "last_name": user.last_name,
                 "full_name": user.get_full_name(),