Encryptors 2.70__tar.gz → 2.72__tar.gz

{encryptors-2.70 → encryptors-2.72}/PKG-INFO

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

{encryptors-2.70 → encryptors-2.72}/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.70",
+    version="2.72",
     author="OSDental LLC",
     author_email="support@osdental.ai",
     description="End-to-end algorithm library",

{encryptors-2.70 → encryptors-2.72}/src/Encryptors.egg-info/PKG-INFO

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

{encryptors-2.70 → encryptors-2.72}/src/Encryptors.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ src/Osdental/Enums/GrahpqlOperation.py
 src/Osdental/Enums/GrpcStatusCode.py
 src/Osdental/Enums/Profile.py
 src/Osdental/Enums/ResultType.py
+src/Osdental/Enums/Secret.py
 src/Osdental/Enums/StatusCode.py
 src/Osdental/Enums/__init__.py
 src/Osdental/Exception/ControlledException.py

encryptors-2.72/src/Osdental/Enums/Secret.py

@@ -0,0 +1,8 @@
+from enum import StrEnum
+
+class Secret(StrEnum):
+
+    ISSUER = "LEGACY-NAME"
+    AUDIENCE = "LEGACY-URL"
+    SECRET_KEY_1 = "SECRET-KEY-1"
+    PUBLIC_KEY_1 = "PUBLIC-KEY-1"

{encryptors-2.70 → encryptors-2.72}/src/Osdental/Helpers/AuthTokenProcessor.py

@@ -1,6 +1,7 @@
 import json
 from typing import Dict, Any
 from uuid import UUID
+from datetime import datetime, timezone, timedelta
 from graphql import OperationType
 from starlette.datastructures import Headers
 from Osdental.Encryptor.Aes import AES
@@ -111,4 +112,8 @@ def get_current_aes_key(context: BaseGraphQLContext):
     if context.access_token_claims:
         return context.access_token_claims.aes_key
 
-    return None
+    return None
+
+def get_token_exp(exp_minutes: int) -> datetime:
+    now = datetime.now(timezone.utc)
+    return now + timedelta(minutes=exp_minutes)

{encryptors-2.70 → encryptors-2.72}/src/Osdental/Helpers/JwtTokenHelper.py

@@ -25,7 +25,7 @@ class JwtTokenHelper:
     def generate_token(
         self,
         claims: dict,
-        expiration_minutes: int,
+        expires_at: datetime,
     ) -> str:
 
         now = datetime.now(timezone.utc)
@@ -34,14 +34,7 @@ class JwtTokenHelper:
             **claims,
             "iat": int(now.timestamp()),
             "nbf": int(now.timestamp()),
-            "exp": int(
-                (
-                    now
-                    + timedelta(
-                        minutes=expiration_minutes
-                    )
-                ).timestamp()
-            ),
+            "exp": int(expires_at.timestamp()),
         }
 
         # 1. Firmar → JWS (inner JWT)

encryptors-2.72/src/Osdental/Models/TokenClaims.py

@@ -0,0 +1,80 @@
+from typing import Dict, Any
+from dataclasses import dataclass, asdict
+from typing import Optional
+
+@dataclass(frozen=True, slots=True)
+class TokenValidationOptions:
+    issuer: Optional[str] = None
+    audience: Optional[str] = None
+
+    validate_issuer: bool = True
+    validate_audience: bool = True
+
+@dataclass(frozen=True, slots=True)
+class BaseClaims:
+
+    def to_dict(self) -> Dict[str, Any]:
+        return asdict(self)
+    
+@dataclass(frozen=True, slots=True)
+class AccessTokenClaims(BaseClaims):
+
+    id_legacy: int
+    id_enterprise: int
+    aes_key: str
+    exp: Optional[int] = 0
+    
+    @classmethod
+    def from_dict(cls, claims: dict):
+
+        return cls(
+            id_legacy=claims["id_legacy"],
+            id_enterprise=claims["id_enterprise"],
+            aes_key=claims["aes_key"],
+            exp=claims["exp"],
+        )
+
+@dataclass(frozen=True, slots=True)
+class UserTokenClaims(BaseClaims):
+    
+    id_legacy: str
+    id_enterprise: str
+    id_token: str
+    id_user: str
+    id_external_enterprise: str
+    id_profile: str
+    user_full_name: str
+    abbreviation: str
+    aes_key_auth: str
+    exp: Optional[int] = 0
+
+    @classmethod
+    def from_dict(cls, claims: dict):
+
+        return cls(
+            id_legacy=claims["id_legacy"],
+            id_enterprise=claims["id_enterprise"],
+            id_token=claims["id_token"],
+            id_user=claims["id_user"],
+            id_external_enterprise=claims["id_external_enterprise"],
+            id_profile=claims["id_profile"],
+            user_full_name=claims["user_full_name"],
+            abbreviation=claims["abbreviation"],
+            aes_key_auth=claims["aes_key_auth"],
+            exp=claims["exp"],
+        )
+
+
+@dataclass(frozen=True, slots=True)
+class ActionTokenClaims(BaseClaims):
+
+    sub: str
+    action: Optional[str] = None
+
+    @classmethod
+    def from_dict(cls, claims: dict):
+
+        return cls(
+            sub=claims["sub"],
+            action=claims["action"],
+        )

{encryptors-2.70 → encryptors-2.72}/src/Osdental/Services/JwtAuthTokenService.py

@@ -1,17 +1,14 @@
 import asyncio
-
+from datetime import datetime
 from Osdental.Models.TokenClaims import (
     BaseClaims, AccessTokenClaims, UserTokenClaims,
     ActionTokenClaims, TokenValidationOptions
 )
-
 from Osdental.Services import IAuthTokenService
-
 from Osdental.Helpers.JwtTokenHelper import JwtTokenHelper
-
 from Osdental.Utils.RsaUtils import normalize_rsa_keys
-
 from Osdental.Secrets import ISecretProvider
+from Osdental.Enums.Secret import Secret
 
 class JwtAuthTokenService(IAuthTokenService):
 
@@ -27,36 +24,46 @@ class JwtAuthTokenService(IAuthTokenService):
 
         self._jwt = None
 
+        self._init_lock = asyncio.Lock()
+
 
-    async def __get_token_signatures(self):
+    async def _ensure_initialized(self):
         
-        issuer, audience, private_key, public_key = await asyncio.gather(
-            self.secrets.get("LEGACY-NAME"),
-            self.secrets.get("LEGACY-URL"),
-            self.secrets.get("SECRET-KEY-1"),
-            self.secrets.get("PUBLIC-KEY-1"),
-        )
+        if self._jwt is not None:
+            return
+        
+        async with self._init_lock:
+            
+            if self._jwt is not None:
+                return
+        
+            issuer, audience, private_key, public_key = await asyncio.gather(
+                self.secrets.get(Secret.ISSUER),
+                self.secrets.get(Secret.AUDIENCE),
+                self.secrets.get(Secret.SECRET_KEY_1),
+                self.secrets.get(Secret.PUBLIC_KEY_1),
+            )
 
-        self._issuer = issuer
-        self._audience = audience
+            self._issuer = issuer
+            self._audience = audience
 
-        self._jwt = JwtTokenHelper(
-            private_key_pem=normalize_rsa_keys(
-                private_key
-            ),
-            public_key_pem=normalize_rsa_keys(
-                public_key
+            self._jwt = JwtTokenHelper(
+                private_key_pem=normalize_rsa_keys(
+                    private_key
+                ),
+                public_key_pem=normalize_rsa_keys(
+                    public_key
+                )
             )
-        )
 
 
     async def generate_token(
         self,
         claims: BaseClaims,
-        expiration_minutes: int,
+        expires_at: datetime,
     ) -> str:
 
-        await self.__get_token_signatures()
+        await self._ensure_initialized()
 
         claims = {
             **claims.to_dict(),
@@ -65,7 +72,7 @@ class JwtAuthTokenService(IAuthTokenService):
         }
         return self._jwt.generate_token(
             claims=claims,
-            expiration_minutes=expiration_minutes,
+            expires_at=expires_at,
         )
 
 
@@ -74,7 +81,7 @@ class JwtAuthTokenService(IAuthTokenService):
         token: str,
     ) -> AccessTokenClaims:
 
-        await self.__get_token_signatures()
+        await self._ensure_initialized()
 
         claims = self._jwt.validate_token(
             token=token,
@@ -84,12 +91,7 @@ class JwtAuthTokenService(IAuthTokenService):
             )
         )
 
-        return AccessTokenClaims(
-            id_legacy=claims["id_legacy"],
-            id_enterprise=claims["id_enterprise"],
-            aes_key=claims["aes_key"],
-            exp=claims["exp"],
-        )
+        return AccessTokenClaims.from_dict(claims)
     
 
     async def validate_action_token(
@@ -97,7 +99,7 @@ class JwtAuthTokenService(IAuthTokenService):
         token: str,
     ) -> ActionTokenClaims:
 
-        await self.__get_token_signatures()
+        await self._ensure_initialized()
 
         claims = self._jwt.validate_token(
             token=token,
@@ -107,10 +109,7 @@ class JwtAuthTokenService(IAuthTokenService):
             )
         )
 
-        return ActionTokenClaims(
-            sub=claims["sub"],
-            action=claims["action"],
-        )
+        return ActionTokenClaims.from_dict(claims)
     
 
     async def validate_internal_access_token(
@@ -118,7 +117,7 @@ class JwtAuthTokenService(IAuthTokenService):
         token: str,
     ) -> UserTokenClaims:
 
-        await self.__get_token_signatures()
+        await self._ensure_initialized()
 
         claims = self._jwt.validate_token(
             token=token,
@@ -130,18 +129,7 @@ class JwtAuthTokenService(IAuthTokenService):
             )
         )
 
-        return UserTokenClaims(
-            id_legacy=claims["id_legacy"],
-            id_enterprise=claims["id_enterprise"],
-            id_token=claims["id_token"],
-            id_user=claims["id_user"],
-            id_external_enterprise=claims["id_external_enterprise"],
-            id_profile=claims["id_profile"],
-            user_full_name=claims["user_full_name"],
-            abbreviation=claims["abbreviation"],
-            aes_key_auth=claims["aes_key_auth"],
-            exp=claims["exp"],
-        )
+        return UserTokenClaims.from_dict(claims)
     
 
     async def validate_token_for_refresh(
@@ -152,19 +140,8 @@ class JwtAuthTokenService(IAuthTokenService):
         Valida firma pero ignora exp.
         Usar exclusivamente para emitir un nuevo token cuando el anterior venció.
         """
-        await self.__get_token_signatures()
+        await self._ensure_initialized()
 
         claims = self._jwt.get_claims_ignore_expiration(token)
 
-        return UserTokenClaims(
-            id_legacy=claims["id_legacy"],
-            id_enterprise=claims["id_enterprise"],
-            id_token=claims["id_token"],
-            id_user=claims["id_user"],
-            id_external_enterprise=claims["id_external_enterprise"],
-            id_profile=claims["id_profile"],
-            user_full_name=claims["user_full_name"],
-            abbreviation=claims["abbreviation"],
-            aes_key_auth=claims["aes_key_auth"],
-            exp=claims["exp"],
-        )
+        return UserTokenClaims.from_dict(claims)

encryptors-2.70/src/Osdental/Models/TokenClaims.py

@@ -1,47 +0,0 @@
-from typing import Dict, Any
-from dataclasses import dataclass, asdict
-from typing import Optional
-
-@dataclass(frozen=True, slots=True)
-class TokenValidationOptions:
-    issuer: Optional[str] = None
-    audience: Optional[str] = None
-
-    validate_issuer: bool = True
-    validate_audience: bool = True
-
-@dataclass(frozen=True, slots=True)
-class BaseClaims:
-
-    def to_dict(self) -> Dict[str, Any]:
-        return asdict(self)
-    
-@dataclass(frozen=True, slots=True)
-class AccessTokenClaims(BaseClaims):
-
-    id_legacy: int
-    id_enterprise: int
-    aes_key: str
-    exp: Optional[int] = 0
-
-
-@dataclass(frozen=True, slots=True)
-class UserTokenClaims(BaseClaims):
-    
-    id_legacy: str
-    id_enterprise: str
-    id_token: str
-    id_user: str
-    id_external_enterprise: str
-    id_profile: str
-    user_full_name: str
-    abbreviation: str
-    aes_key_auth: str
-    exp: Optional[int] = 0
-
-
-@dataclass(frozen=True, slots=True)
-class ActionTokenClaims(BaseClaims):
-
-    sub: str
-    action: Optional[str] = None