Encryptors 2.37__tar.gz → 2.39__tar.gz

{encryptors-2.37 → encryptors-2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.37
+Version: 2.39
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai
@@ -35,6 +35,7 @@ Requires-Dist: pydantic_core==2.41.4
 Requires-Dist: PyJWT==2.10.1
 Requires-Dist: aioodbc==0.5.0
 Requires-Dist: python-dotenv==1.0.1
+Requires-Dist: pydantic_settings==2.13.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: six==1.17.0
 Requires-Dist: sniffio==1.3.1

{encryptors-2.37 → encryptors-2.39}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
  
 setup(
     name="Encryptors", 
-    version="2.37",
+    version="2.39",
     author="OSDental LLC",
     author_email="support@osdental.ai",
     description="End-to-end algorithm library",
@@ -43,6 +43,7 @@ setup(
         "PyJWT==2.10.1",
         "aioodbc==0.5.0",
         "python-dotenv==1.0.1",
+        "pydantic_settings==2.13.1",
         "requests==2.32.3",
         "six==1.17.0",
         "sniffio==1.3.1",

{encryptors-2.37 → encryptors-2.39}/src/Encryptors.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.37
+Version: 2.39
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai
@@ -35,6 +35,7 @@ Requires-Dist: pydantic_core==2.41.4
 Requires-Dist: PyJWT==2.10.1
 Requires-Dist: aioodbc==0.5.0
 Requires-Dist: python-dotenv==1.0.1
+Requires-Dist: pydantic_settings==2.13.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: six==1.17.0
 Requires-Dist: sniffio==1.3.1

{encryptors-2.37 → encryptors-2.39}/src/Encryptors.egg-info/SOURCES.txt

@@ -46,8 +46,6 @@ src/Osdental/Messaging/Kafka.py
 src/Osdental/Messaging/RabbitMQ.py
 src/Osdental/Messaging/__init__.py
 src/Osdental/Models/AuditConfig.py
-src/Osdental/Models/Catalog.py
-src/Osdental/Models/Legacy.py
 src/Osdental/Models/Response.py
 src/Osdental/Models/Token.py
 src/Osdental/Models/_Audit.py

{encryptors-2.37 → encryptors-2.39}/src/Encryptors.egg-info/requires.txt

@@ -24,6 +24,7 @@ pydantic_core==2.41.4
 PyJWT==2.10.1
 aioodbc==0.5.0
 python-dotenv==1.0.1
+pydantic_settings==2.13.1
 requests==2.32.3
 six==1.17.0
 sniffio==1.3.1

{encryptors-2.37 → encryptors-2.39}/src/Osdental/Graphql/Extensions/AuditExtension.py

@@ -102,7 +102,10 @@ class AuditExtension(Extension):
         self.errors = errors
 
     def request_finished(self, context):
+        if not self.request_payload: return
+
         query = self.request_payload.get("query", "")
+        
         if "__schema" in query or "__type" in query: return
     
         if not hasattr(context, "audit_plain_response"): return

{encryptors-2.37 → encryptors-2.39}/src/Osdental/Graphql/_Helpers/_TenantPolicy.py

@@ -14,9 +14,7 @@ class TenantPolicy:
         decrypted_payload: Dict[str, Any], 
         operation_type: str
     ) -> AuthToken:
-
-        # Set original idExternalEnterprise
-        token.base_id_external_enterprise = token.id_external_enterprise
+        
         # SUPER ADMIN / OSDEL ADMIN -> UUID 0
         should_use_zero_uuid = (
             token.abbreviation.startswith(("SPAU", "OSDA")) 
@@ -37,7 +35,10 @@ class TenantPolicy:
                 return token
 
         # If it comes by request, it is taken as priority
-        external_enterprise_req = decrypted_payload.get("idExternalEnterprise")
+        external_enterprise_req = (
+            decrypted_payload.get("idExternalEnterprise")
+            if decrypted_payload else None
+        )
         if external_enterprise_req and token:
             token.id_external_enterprise = external_enterprise_req
 

{encryptors-2.37 → encryptors-2.39}/src/Osdental/Graphql/_Helpers/_TokenService.py

@@ -15,7 +15,22 @@ class TokenService:
 
         user_token = AES.decrypt(aes_user, encrypted_token)
         payload = JWT.extract_payload(user_token, self.jwt_user_key)
-        token = AuthToken(**payload)
+
+        token = AuthToken(
+            id_token=payload.get("idToken"),
+            id_user=payload.get("idUser"),
+            id_external_enterprise=payload.get("idExternalEnterprise"),
+            id_profile=payload.get("idProfile"),
+            id_legacy=payload.get("idLegacy"),
+            id_authorization=payload.get("idAuthorization"),
+            id_item_report=payload.get("idItemReport"),
+            id_enterprise=payload.get("idEnterprise"),
+            user_full_name=payload.get("userFullName"),
+            abbreviation=payload.get("abbreviation"),
+            aes_key_auth=payload.get("aesKeyAuth"),
+            aes_key_user=payload.get("aesKeyUser"),
+            base_id_external_enterprise=payload.get("idExternalEnterprise")
+        )
 
         # Validate via RPC
         paylod = {

{encryptors-2.37 → encryptors-2.39}/src/Osdental/Messaging/AzureServiceBus.py

@@ -3,6 +3,7 @@ from typing import Dict, Any
 from azure.servicebus import ServiceBusMessage
 from azure.servicebus.aio import ServiceBusClient
 from azure.identity.aio import DefaultAzureCredential
+from azure.servicebus.exceptions import ServiceBusError
 from Osdental.Messaging import IMessageQueue
 
 class AzureServiceBusQueue(IMessageQueue):
@@ -33,7 +34,7 @@ class AzureServiceBusQueue(IMessageQueue):
         try:
             await self.sender.send_messages(msg)
 
-        except Exception:
+        except ServiceBusError:
             # recrear sender si se rompió conexión
             await self.sender.__aexit__(None, None, None)
             self.sender = self.client.get_queue_sender(queue_name=self.queue_name)

encryptors-2.39/src/Osdental/Models/Token.py

@@ -0,0 +1,20 @@
+from typing import Optional
+from dataclasses import dataclass
+
+@dataclass
+class AuthToken:
+    id_token: str
+    id_user: str
+    id_external_enterprise: str
+    id_profile: str
+    id_legacy: str
+    id_authorization: str
+    id_item_report: str
+    id_enterprise: str
+    user_full_name: str
+    abbreviation: str
+    aes_key_auth: str
+    aes_key_user: Optional[str] = None
+    access_token: Optional[str] = None
+    base_id_external_enterprise: Optional[str] = None
+    mk_id_external_enterprise: Optional[str] = None

encryptors-2.37/src/Osdental/Models/Catalog.py

@@ -1,19 +0,0 @@
-from __future__ import annotations
-from dataclasses import dataclass
-from typing import Dict
-from Osdental.Shared.Utils.CaseConverter import CaseConverter
-
-@dataclass
-class Catalog:
-    id_catalog: str
-    name_catalog: str
-    id_detail: str
-    code: str
-    value: str
-
-    @classmethod
-    def from_db(cls, record: Dict[str,str]) -> Catalog:
-        mapped = {CaseConverter.case_to_snake(key) : value for key, value in record.items()}
-        valid_fields = cls.__dataclass_fields__.keys()
-        clean = {k: v for k, v in mapped.items() if k in valid_fields}
-        return cls(**clean)

encryptors-2.37/src/Osdental/Models/Legacy.py

@@ -1,52 +0,0 @@
-from __future__ import annotations
-from dataclasses import dataclass
-from typing import Dict
-from Osdental.Shared.Utils.CaseConverter import CaseConverter
-from Osdental.Exception.ControlledException import MissingFieldException
-from Osdental.Shared.Enums.Message import Message
-
-@dataclass
-class Legacy:
-    id_legacy: str
-    legacy_name: str
-    id_enterprise: str
-    refresh_token_exp_min: int
-    access_token_exp_min: int
-    public_key2: str
-    private_key1: str
-    private_key2: str
-    aes_key_user: str
-    aes_key_auth: str
-
-    def __post_init__(self):
-        if not self.legacy_name:
-            raise MissingFieldException(message=Message.LEGACY_NAME_REQUIRED_MSG)
-        
-        if not self.refresh_token_exp_min:
-            raise MissingFieldException(message=Message.REFRESH_TOKEN_EXP_REQUIRED_MSG)
-        
-        if not self.access_token_exp_min:
-            raise MissingFieldException(message=Message.ACCESS_TOKEN_EXP_REQUIRED_MSG)
-        
-        if not self.public_key2:
-            raise MissingFieldException(message=Message.PUBLIC_KEY2_REQUIRED_MSG)
-        
-        if not self.private_key1:
-            raise MissingFieldException(message=Message.PRIVATE_KEY1_REQUIRED_MSG)
-        
-        if not self.private_key2:
-            raise MissingFieldException(message=Message.PRIVATE_KEY2_REQUIRED_MSG)
-        
-        if not self.aes_key_user:
-            raise MissingFieldException(message=Message.AES_KEY_USER_REQUIRED_MSG)
-        
-        if not self.aes_key_auth:
-            raise MissingFieldException(message=Message.AES_KEY_AUTH_REQUIRED_MSG)
-    
-    @classmethod
-    def from_db(cls, record: Dict[str,str]) -> Legacy:
-        mapped = {CaseConverter.case_to_snake(key) : value for key, value in record.items()}
-        valid_fields = cls.__dataclass_fields__.keys()
-        clean = {k: v for k, v in mapped.items() if k in valid_fields}
-        return cls(**clean)
-

encryptors-2.37/src/Osdental/Models/Token.py

@@ -1,23 +0,0 @@
-from typing import Optional
-from pydantic import BaseModel, Field
-from Osdental.Models.Legacy import Legacy
-
-class AuthToken(BaseModel):
-    
-    id_token: str = Field(alias="idToken")
-    id_user: str = Field(alias="idUser")
-    id_external_enterprise: str = Field(alias="idExternalEnterprise")
-    id_profile: str = Field(alias="idProfile")
-    id_legacy: str = Field(alias="idLegacy")
-    id_authorization: str = Field(default=None, alias="idAuthorization")
-    id_item_report: str = Field(alias="idItemReport")
-    id_enterprise: str = Field(alias="idEnterprise")
-    user_full_name: str = Field(alias="userFullName")
-    abbreviation: str = Field(alias="abbreviation")
-    aes_key_auth: str = Field(alias="aesKeyAuth")
-    access_token: Optional[str] = Field(default=None, alias="accessToken")
-    base_id_external_enterprise: Optional[str] = Field(default=None, alias="baseIdExternalEnterprise")
-    mk_id_external_enterprise: Optional[str] = Field(default=None, alias="mkIdExternalEnterprise")
-
-    class ConfigDict:
-        populate_by_name = True