Encryptors 2.66__tar.gz → 2.67__tar.gz

{encryptors-2.66 → encryptors-2.67}/PKG-INFO

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

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

{encryptors-2.66 → encryptors-2.67}/src/Encryptors.egg-info/PKG-INFO

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

{encryptors-2.66 → encryptors-2.67}/src/Osdental/Decorators/SecureResolver.py

@@ -4,7 +4,7 @@ from typing import Callable
 from graphql import GraphQLResolveInfo
 from Osdental.Models.Response import Response
 from Osdental.Models.Graphql import BaseGraphQLContext
-from Osdental.Models.TokenClaims import UserTokenClaims
+from Osdental.Models.TokenClaims import UserTokenClaims, AccessTokenClaims
 from Osdental.Models.Token import AuthToken
 from Osdental.Enums.Profile import Profile
 from Osdental.Exception.ControlledException import (
@@ -39,16 +39,27 @@ def resolver(public: bool = False, action=None):
                 settings = container.settings
 
                 token: type[AuthToken] | None = None
+                aes_key = None
+                claims: UserTokenClaims | AccessTokenClaims
 
                 # ── 1. AUTENTICACIÓN ──────────────────────────────
+                token_service: IAuthTokenService = container.auth_token_service
                 if not public:
 
-                    token_service: IAuthTokenService = container.auth_token_service
-                    user_token = extract_bearer_token(headers)
-                    
-                    claims: UserTokenClaims = await token_service.validate_internal_access_token(
+                    user_token = extract_bearer_token(headers)                    
+                    claims = await token_service.validate_internal_access_token(
                         user_token
                     )
+                    aes_key = claims.aes_key_auth
+
+                else:
+
+                    access_token = request.get("Accesstoken")
+                    claims = await token_service.validate_external_access_token(
+                        access_token
+                    )
+                    aes_key = claims.aes_key
+                    context.access_token = claims
 
                 # ── 2. DECRYPT DEL PAYLOAD ────────────────────────
                 body = await request.json()
@@ -56,9 +67,9 @@ def resolver(public: bool = False, action=None):
                 encrypted_payload = kwargs.get("data") or variables.get("data")
                 decrypted_payload = None
 
-                if not public and encrypted_payload is not None:
+                if encrypted_payload is not None:
                     decrypted_payload = decrypt_and_parse_payload(
-                        aes_key_auth=claims.aes_key_auth,
+                        aes_key_auth=aes_key,
                         encrypted_payload=encrypted_payload
                     )
 
@@ -73,6 +84,8 @@ def resolver(public: bool = False, action=None):
                         decrypted_payload=decrypted_payload,
                         operation_type=info.operation.operation.value
                     )
+                    
+                    context.token = token
 
                 # ── 4. CONTROL DE ACCESO POR ROL ─────────────────
                 if not public and action:

{encryptors-2.66 → encryptors-2.67}/src/Osdental/Helpers/AuditHelper.py

@@ -81,7 +81,7 @@ def _build_success_payload(ctx: Optional[AuditContext], result: Response) -> Dic
 
     key = result.key if result.key else ctx.decrypted_key
 
-    result = decryptor_data(
+    data = decryptor_data(
         key=key,
         data=result.data,
         encryption_type=result.encryption_type,
@@ -90,7 +90,7 @@ def _build_success_payload(ctx: Optional[AuditContext], result: Response) -> Dic
     return base | _build_final_payload(
         type_=ResultType.RESPONSE,
         status_code=result.status,
-        result=result
+        result=data
     )
 
 def _build_error_payload(ctx: Optional[AuditContext], exc: OSDException) -> Dict[str, Any]:

encryptors-2.67/src/Osdental/Models/Graphql.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+from typing import Optional, Any
+from fastapi import Request
+from Osdental.Models.Token import AuthToken
+from Osdental.Models.TokenClaims import AccessTokenClaims
+
+@dataclass
+class BaseGraphQLContext:
+    request: Request
+    container: Any
+    access_token: Optional[AccessTokenClaims] = None
+    token: Optional[AuthToken] = None

encryptors-2.66/src/Osdental/Models/Graphql.py

@@ -1,14 +0,0 @@
-from dataclasses import dataclass
-from typing import Optional, Any
-from fastapi import Request
-from Osdental.Models.Token import AuthToken
-
-@dataclass
-class BaseGraphQLContext:
-    request: Request
-    container: Any
-    # valores agregados durante ejecución (AuditExtention)
-    token: Optional[AuthToken] = None
-    decrypted_payload: Optional[dict] = None
-    aes_auth: Optional[str] = None
-    audit_plain_response: Optional[Any] = None