Encryptors 2.63__tar.gz → 2.65__tar.gz

{encryptors-2.63 → encryptors-2.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.63
+Version: 2.65
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai

{encryptors-2.63 → encryptors-2.65}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 # ANDERSON REVISAR EL CACHE LOCAL DEL KEYVAULT PARA VALIDAR SI FUNCIONA
 setup(
     name="Encryptors", 
-    version="2.63",
+    version="2.65",
     author="OSDental LLC",
     author_email="support@osdental.ai",
     description="End-to-end algorithm library",

{encryptors-2.63 → encryptors-2.65}/src/Encryptors.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.63
+Version: 2.65
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai

{encryptors-2.63 → encryptors-2.65}/src/Osdental/Helpers/JwtTokenHelper.py

@@ -45,20 +45,20 @@ class JwtTokenHelper:
         }
 
         # 1. Firmar → JWS (inner JWT)
-        signed: bytes = jwt.encode(
+        signed: str = jwt.encode(
             header={"alg": "RS256", "typ": "JWT"},
             claims=payload,
             key=self._private_key,
         )
 
         # 2. Encriptar → JWE (outer token)
-        encrypted: bytes = jwe.encrypt_compact(
+        encrypted: str = jwe.encrypt_compact(
             protected={"alg": "RSA-OAEP", "enc": "A256CBC-HS512", "cty": "JWT"},
-            plaintext=signed,          # el JWT firmado es el payload del JWE
+            plaintext=signed.encode(),          # el JWT firmado es el payload del JWE
             public_key=self._public_key,
         )
 
-        return encrypted.decode()
+        return encrypted
 
     def get_claims_ignore_expiration(
         self,
@@ -107,7 +107,7 @@ class JwtTokenHelper:
         try:
             # --- Paso 1: desencriptar JWE ---
             decrypted = jwe.decrypt_compact(
-                token=token.encode(),
+                value=token.encode(),
                 private_key=self._private_key,
                 algorithms=self._jwe_algorithms,
             )

{encryptors-2.63 → encryptors-2.65}/src/Osdental/Models/TokenClaims.py

@@ -37,6 +37,7 @@ class UserTokenClaims(BaseClaims):
     user_full_name: str
     abbreviation: str
     aes_key_auth: str
+    exp: Optional[int] = 0
 
 
 @dataclass(frozen=True, slots=True)

{encryptors-2.63 → encryptors-2.65}/src/Osdental/Services/JwtAuthTokenService.py

@@ -140,6 +140,7 @@ class JwtAuthTokenService(IAuthTokenService):
             user_full_name=claims["user_full_name"],
             abbreviation=claims["abbreviation"],
             aes_key_auth=claims["aes_key_auth"],
+            exp=claims["exp"],
         )
     
 
@@ -165,4 +166,5 @@ class JwtAuthTokenService(IAuthTokenService):
             user_full_name=claims["user_full_name"],
             abbreviation=claims["abbreviation"],
             aes_key_auth=claims["aes_key_auth"],
+            exp=claims["exp"],
         )

{encryptors-2.63 → encryptors-2.65}/src/Osdental/Services/__init__.py

@@ -47,6 +47,13 @@ class IAuthTokenService(ABC):
     ) -> ActionTokenClaims:
         pass
 
+    @abstractmethod
+    async def validate_token_for_refresh(
+        self,
+        token: str,
+    ) -> UserTokenClaims:
+        pass
+
 
 class IAuditEmitter(Protocol):
     async def process(self, payload: Dict[str, Any]) -> None: