oxutils 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

oxutils/jwt/auth.py

@@ -1,5 +1,5 @@
 import os
-from typing import Dict, Any, Optional, Type, Tuple
+from typing import Dict, Any, Optional, Type, Tuple, List
 from django.utils.translation import gettext_lazy as _
 from django.http import HttpRequest
 from django.contrib.auth.models import AbstractUser

oxutils/oxiliere/caches.py

@@ -3,7 +3,7 @@ from cacheops import cached_as, cached
 from oxutils.oxiliere.utils import (
     get_tenant_model,
     get_tenant_user_model,
-    get_system_tenant_schema_name
+    get_system_tenant_oxi_id
 )
 
 
@@ -33,5 +33,4 @@ def get_tenant_user(oxi_org_id: str, oxi_user_id: str):
 
 @cached(timeout=60*15)
 def get_system_tenant():
-    schema_name = get_system_tenant_schema_name()
-    return get_tenant_model().objects.get(schema_name=schema_name)
+    return get_tenant_model().objects.get(oxi_id=get_system_tenant_oxi_id())

oxutils/oxiliere/context.py

@@ -1,10 +1,10 @@
 import contextvars
-from oxutils.oxiliere.utils import get_system_tenant_schema_name
+from oxutils.oxiliere.utils import get_system_tenant_oxi_id
 
 
 current_tenant_schema_name: contextvars.ContextVar[str] = contextvars.ContextVar(
     "current_tenant_schema_name",
-    default=get_system_tenant_schema_name()
+    default=f"[oxi_id] {get_system_tenant_oxi_id()}"
 )
 
 
@@ -14,5 +14,3 @@ def get_current_tenant_schema_name() -> str:
 
 def set_current_tenant_schema_name(schema_name: str):
     current_tenant_schema_name.set(schema_name)
-
-

oxutils/oxiliere/management/commands/init_oxiliere_system.py

@@ -1,11 +1,11 @@
 import uuid
 from django.core.management.base import BaseCommand
 from django.conf import settings
-from django.db import transaction
+from django.db import transaction, connection
 from django.contrib.auth import get_user_model
 from django_tenants.utils import (
     get_tenant_model,
-    get_tenant_domain_model
+    get_tenant_domain_model,
 )
 from oxutils.oxiliere.utils import (
     oxid_to_schema_name,
@@ -16,7 +16,7 @@ from oxutils.oxiliere.constants import (
     OXI_SYSTEM_DOMAIN,
     OXI_SYSTEM_OWNER_EMAIL
 )
-
+from oxutils.oxiliere.authorization import grant_manager_access_to_owners
 
 
 
@@ -38,8 +38,8 @@ class Command(BaseCommand):
         self.stdout.write(self.style.WARNING(f'Initialisation du tenant système...'))
         
         # Vérifier si le tenant système existe déjà
-        if TenantModel.objects.filter(schema_name=schema_name).exists():
-            self.stdout.write(self.style.ERROR(f'Le tenant système "{schema_name}" existe déjà!'))
+        if TenantModel.objects.filter(oxi_id=system_slug).exists():
+            self.stdout.write(self.style.ERROR(f'Le tenant système "{system_slug}" existe déjà!'))
             return
         
         # Créer le tenant système
@@ -62,6 +62,8 @@ class Command(BaseCommand):
             is_primary=True
         )
         self.stdout.write(self.style.SUCCESS(f'✓ Domaine créé: {domain.domain}'))
+
+        connection.set_tenant(tenant)
         
         self.stdout.write(f'Création du superuser: {owner_email}')
         try:
@@ -88,6 +90,11 @@ class Command(BaseCommand):
         )
         if created:
             self.stdout.write(self.style.SUCCESS(f'✓ Superuser lié au tenant système'))
+            try:
+                grant_manager_access_to_owners(tenant)
+                self.stdout.write(self.style.SUCCESS(f'✓ Droits mis en place'))
+            except Exception as e:
+                self.stdout.write(self.style.ERROR(f'Erreur lors de la mise en place des droits: {str(e)}'))
         else:
             self.stdout.write(self.style.WARNING(f'⚠ Liaison existe déjà'))
         

oxutils/oxiliere/utils.py

@@ -23,14 +23,10 @@ def get_tenant_user_model() -> Any:
     return get_model('TENANT_USER_MODEL')
 
 def is_system_tenant(tenant: Any) -> bool:
-    return tenant.schema_name == get_system_tenant_schema_name()
+    return tenant.oxi_id == get_system_tenant_oxi_id()
 
-def get_system_tenant_schema_name():
-    system_schema_name = oxid_to_schema_name(
-        getattr(settings, 'OXI_SYSTEM_TENANT', OXI_SYSTEM_TENANT)
-    )
-
-    return system_schema_name
+def get_system_tenant_oxi_id():
+    return getattr(settings, 'OXI_SYSTEM_TENANT', OXI_SYSTEM_TENANT)
 
 def oxid_to_schema_name(oxid: str) -> str:
     """

{oxutils-0.1.10.dist-info → oxutils-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oxutils
-Version: 0.1.10
+Version: 0.1.11
 Summary: Production-ready utilities for Django applications in the Oxiliere ecosystem
 Keywords: django,utilities,jwt,s3,audit,logging,celery,structlog
 Author: Edimedia Mutoke

{oxutils-0.1.10.dist-info → oxutils-0.1.11.dist-info}/RECORD

@@ -33,7 +33,7 @@ oxutils/enums/invoices.py,sha256=E33QGQeutZUqvlovJY0VGDxWUb0i_kdfhEiir1ARKuQ,201
 oxutils/exceptions.py,sha256=CCjENOD0of6_noif2ajrpfbBLoG16DWa46iB9_uEe3M,3592
 oxutils/functions.py,sha256=4stHj94VebWX0s1XeWshubMD2v8w8QztTWppbkTE_Gg,3246
 oxutils/jwt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oxutils/jwt/auth.py,sha256=G7jIxH7Xw8meDhAnwh9JFlTcd_waZ3BRfKMz4gmpp7A,6343
+oxutils/jwt/auth.py,sha256=h3rm7nSEweMgyzy5HBRwqC1gPvZ-EZuwdJISSvnltXY,6349
 oxutils/jwt/models.py,sha256=Q0zRnWpK0trFoPDv5ZEY2ROCRaNn83W-K8SbrmSg1E8,2122
 oxutils/jwt/tokens.py,sha256=kWgtPl4XxV0xHkjbhd5QteQy8Wv5MsvyLcLVyO-gzuo,1822
 oxutils/jwt/utils.py,sha256=Wuy-PnCcUw6MpY6z1Isy2vOx-_u1o6LjUfRJgf_cqbY,1202
@@ -55,17 +55,17 @@ oxutils/oxiliere/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 oxutils/oxiliere/apps.py,sha256=sPZFBFyCM7nbvDdIv15VbdPLl_-Apm1OsaaByfGpP3o,327
 oxutils/oxiliere/authorization.py,sha256=52-ch4T443sC1ZdXvYgzgbQRfotVyQJbfna5-ubBnFM,1408
 oxutils/oxiliere/cacheops.py,sha256=VGG5qG5IsxvWJTu1aTlmsaDXV2aiuIMVdVcvHGHeY3g,163
-oxutils/oxiliere/caches.py,sha256=NKO7F0Ihm2Ba9cB9BV6AeOM6dvVxTh6PRjw5bz9d9gg,935
+oxutils/oxiliere/caches.py,sha256=y1UxBRL9N8xQzN5BYRyIGaNqmbro4_YblcCtOp5BD38,890
 oxutils/oxiliere/checks.py,sha256=fV1DCdLmtL35CUCsisyCf4FRw8yZMl66ntpuksrjoL8,930
 oxutils/oxiliere/constants.py,sha256=IMLhZN7rWHooE9Y9nB4nYsDticNuUscvgvEPUScG58M,125
-oxutils/oxiliere/context.py,sha256=7sLRKaiE4CRB-D9uCO09nq6vNEZNYQxP-6ENOsEiZts,445
+oxutils/oxiliere/context.py,sha256=TZ_dNlYhpdSG8r8MNjv75SA8dTUEw2hdZ8fMkW0zEmU,447
 oxutils/oxiliere/controllers.py,sha256=hL_snutY1EuSO0n06NDbjkz-3A3hkqa3sYGie3Grbmg,847
 oxutils/oxiliere/enums.py,sha256=etpHgzsHTQKMrPIxVH-d592_DYSRJ2_o0c8bOdIza-8,201
 oxutils/oxiliere/exceptions.py,sha256=d-J-beEend4L49SJcoGRO7SKLyxlQeuLkLnFU5oTCPQ,178
 oxutils/oxiliere/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oxutils/oxiliere/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oxutils/oxiliere/management/commands/grant_tenant_owners.py,sha256=U0tc-b677kEFA7KC6xah3Ufbg6qYkW21nRikC0FJRQI,774
-oxutils/oxiliere/management/commands/init_oxiliere_system.py,sha256=wRmm_u_tX1j9WTHLGEJ27XaolTIWz7LbP0kEe0lkXss,3829
+oxutils/oxiliere/management/commands/init_oxiliere_system.py,sha256=7ZmKOwL2TOIaPYBpGEoqcw2XslpG1VikUnTJwpu84Lo,4247
 oxutils/oxiliere/middleware.py,sha256=c0C1aalshhYNfe4SBglJkWfUo4Ct-d391GoWP_NhPOw,6412
 oxutils/oxiliere/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oxutils/oxiliere/models.py,sha256=dN3q-8W2gUcUra49b3R33o0ZNn3stc-pfkoVMAKR4gE,6260
@@ -74,7 +74,7 @@ oxutils/oxiliere/schemas.py,sha256=eV9MzkIpHFHmZFtv8Ck2xaGoVUDJXr-yl7w50U-Tj_8,2
 oxutils/oxiliere/settings.py,sha256=ZuKppEyrucWxvvYC2-wLap4RzKfaEfaRdjJnsNZzpuY,440
 oxutils/oxiliere/signals.py,sha256=il6twTzbmv14SxukLx7dLw2QzuNDyVAsIgHmqbYspjw,97
 oxutils/oxiliere/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
-oxutils/oxiliere/utils.py,sha256=V2EsMW2QaqqjnO8LRBm25CTWRQHfF3yPbo4TCXO7Xak,3498
+oxutils/oxiliere/utils.py,sha256=3Q7c_KFiw3iRrGtP8mVtWpuPqCzS4YFmM6V69BIeHvg,3403
 oxutils/pagination/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oxutils/pagination/cursor.py,sha256=l1KuKnILkN96JSoDRJGwiXIpdjxSk-tqQhJREK1TBUM,13159
 oxutils/pdf/__init__.py,sha256=Uu_yOEd-FcNHIB7CV6y76c53wjL5Hce2GMjho8gnkbM,236
@@ -120,6 +120,6 @@ oxutils/users/models.py,sha256=y5SF5tSqri11LRqRBDorSv5IYRa7noBHjFqQUJ5Jkkg,3105
 oxutils/users/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 oxutils/users/utils.py,sha256=jY-zL8vLT5U3E2FV3DqCvrPORjKLutbkPZTQ-z96dCw,376
 oxutils/utils.py,sha256=6yGX2d1ajU5RqgfqiaS4McYm7ip2KEgADABo3M-yA3U,595
-oxutils-0.1.10.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-oxutils-0.1.10.dist-info/METADATA,sha256=Af55agNjLKtrfZd7U30ogkRwzz3MrHOeJqw-ns7YwLI,8760
-oxutils-0.1.10.dist-info/RECORD,,
+oxutils-0.1.11.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+oxutils-0.1.11.dist-info/METADATA,sha256=9V6IvUcbPq-tFiBMHMK4rMurzifue-WYnH7arQtqSYk,8760
+oxutils-0.1.11.dist-info/RECORD,,