maquinaweb-shared-auth 0.2.24__py3-none-any.whl → 0.2.26__py3-none-any.whl

{maquinaweb_shared_auth-0.2.24.dist-info → maquinaweb_shared_auth-0.2.26.dist-info}/RECORD

@@ -1,21 +1,21 @@
 shared_auth/__init__.py,sha256=Ta8lIbyn22J6wU-TgWeSvdDHS4NBRf4Sv1Ag8VtY-bE,152
 shared_auth/app.py,sha256=EHoLKlpW41o6ZxcH184aMhnWQxkVp9fH2_-89RjMz-4,215
 shared_auth/authentication.py,sha256=AidtDV4zBWkezN2H6iyOiRNrBoWGgcYiXQU1WkhfUIo,1409
-shared_auth/conf.py,sha256=SawlvPXmTz5qfFECa6lROa_kgT-aORHvTHXQ-4DGxUM,490
+shared_auth/conf.py,sha256=WlSXQB7p3BfE3BL6WR6EDYpCHQEjDlxQlyf8dTfClsk,621
 shared_auth/decorators.py,sha256=RT-Qfi7oGBo6PvWJRR1dqJUQdU6ZOf9p-8mV3rZmqQ0,3237
 shared_auth/exceptions.py,sha256=VKamHjBl2yjXG2RsMrLrXru1_Q9IJXmy4xmDcXlpWsU,627
 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=xlaCmxA_9j8Gacq6xzfUEd7I-lPj6HMhnjJ0lncwtIQ,6563
 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/storage_backend.py,sha256=-2UqRyXT2WaGXFviRgZRrq0iWRLwci5HmZkY6tAZZoY,132
+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.24.dist-info/METADATA,sha256=BuMhI_eW59_M8llwLEK-_AMJfEUINtQ-NaXjqya7jiI,27190
-maquinaweb_shared_auth-0.2.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maquinaweb_shared_auth-0.2.24.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
-maquinaweb_shared_auth-0.2.24.dist-info/RECORD,,
+maquinaweb_shared_auth-0.2.26.dist-info/METADATA,sha256=tvK9JcMpKSKctbaQyd59YH5ih0jrT33nvwc-XJIQJh0,26331
+maquinaweb_shared_auth-0.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maquinaweb_shared_auth-0.2.26.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
+maquinaweb_shared_auth-0.2.26.dist-info/RECORD,,

shared_auth/conf.py

@@ -8,4 +8,6 @@ def get_setting(name, default):
 ORGANIZATION_TABLE = get_setting("SHARED_AUTH_ORGANIZATION_TABLE", "organization_organization")
 USER_TABLE = get_setting("SHARED_AUTH_USER_TABLE", "auth_user")
 MEMBER_TABLE = get_setting("SHARED_AUTH_MEMBER_TABLE", "organization_member")
-TOKEN_TABLE = get_setting("SHARED_AUTH_TOKEN_TABLE", "organization_multitoken")
+TOKEN_TABLE = get_setting("SHARED_AUTH_TOKEN_TABLE", "organization_multitoken")
+CLOUDFRONT_DOMAIN = get_setting("CLOUDFRONT_DOMAIN", "")
+CUSTOM_DOMAIN_AUTH = get_setting("CUSTOM_DOMAIN_AUTH", CLOUDFRONT_DOMAIN)

shared_auth/models.py

@@ -67,7 +67,7 @@ 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)

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(),

shared_auth/storage_backend.py

@@ -1,6 +1,6 @@
 from storages.backends.s3boto3 import S3Boto3Storage
-
+from .conf import CUSTOM_DOMAIN_AUTH
 
 class Storage(S3Boto3Storage):
     location = "media"
-    custom_domain = ""
+    custom_domain = CUSTOM_DOMAIN_AUTH