Encryptors 2.67__tar.gz → 2.69__tar.gz

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

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

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

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

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

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

@@ -4,7 +4,9 @@ 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, AccessTokenClaims
+from Osdental.Models.TokenClaims import (
+    UserTokenClaims, AccessTokenClaims
+)
 from Osdental.Models.Token import AuthToken
 from Osdental.Enums.Profile import Profile
 from Osdental.Exception.ControlledException import (
@@ -12,7 +14,8 @@ from Osdental.Exception.ControlledException import (
 )
 from Osdental.Services import IAuthTokenService
 from Osdental.Helpers.AuthTokenProcessor import (
-    extract_bearer_token, build_auth_token, decrypt_and_parse_payload
+    extract_bearer_token, build_auth_token, decrypt_and_parse_payload,
+    get_current_user, get_current_aes_key
 )
 from Osdental.Enums.StatusCode import StatusCode
 from Osdental.Models.AuditContext import AuditContext
@@ -38,33 +41,36 @@ def resolver(public: bool = False, action=None):
                 headers = request.headers
                 settings = container.settings
 
+                access_token = headers.get("Accesstoken")
                 token: type[AuthToken] | None = None
                 aes_key = None
-                claims: UserTokenClaims | AccessTokenClaims
+                claims: UserTokenClaims | AccessTokenClaims | None = None
+                audit_ctx: AuditContext | None = None
+                operation_type = info.operation.operation.value
 
                 # ── 1. AUTENTICACIÓN ──────────────────────────────
                 token_service: IAuthTokenService = container.auth_token_service
                 if not public:
-
                     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")
+                elif public and access_token:
                     claims = await token_service.validate_external_access_token(
                         access_token
                     )
                     aes_key = claims.aes_key
-                    context.access_token = claims
+                    context.access_token = access_token
+                    context.access_token_claims = claims
 
                 # ── 2. DECRYPT DEL PAYLOAD ────────────────────────
                 body = await request.json()
-                variables = body.get("variables") or {}
-                encrypted_payload = kwargs.get("data") or variables.get("data")
+                encrypted_payload = (
+                    kwargs.get("data")
+                    or body.get("variables", {}).get("data")
+                )
                 decrypted_payload = None
 
                 if encrypted_payload is not None:
@@ -82,7 +88,7 @@ def resolver(public: bool = False, action=None):
                         claims=claims,
                         headers=request.headers,
                         decrypted_payload=decrypted_payload,
-                        operation_type=info.operation.operation.value
+                        operation_type=operation_type,
                     )
                     
                     context.token = token
@@ -97,13 +103,15 @@ def resolver(public: bool = False, action=None):
 
                 # ── 5. CONTEXTO DE AUDITORÍA ──────────────
                 # Lo construimos antes del resolver para que siempre exista
-
+                user = get_current_user(context)
+                key = get_current_aes_key(context)
                 audit_ctx = AuditContext.from_request(
                     request=request,
                     settings=settings,
                     body=body,
-                    operation_type=info.operation.operation.value,
-                    token=token,
+                    operation_type=operation_type,
+                    id_user=user,
+                    decrypted_key=key,
                     decrypted_payload=decrypted_payload,
                 )
 
@@ -123,20 +131,22 @@ def resolver(public: bool = False, action=None):
                 return result
 
             except OSDException as e:
-                # logger.warning(f"Business error: {str(e)}")
-                await container.audit_emitter.emit(
-                    _build_error_payload(audit_ctx, e)
-                )
+                logger.warning(f"Business error: {str(e)}")
+                if audit_ctx:
+                    await container.audit_emitter.emit(
+                        _build_error_payload(audit_ctx, e)
+                    )
                 return Response(
                     status=e.status_code,
                     message=e.message,
                     error=e.error
                 )
             except Exception as e:
-                # logger.exception(f"Unexpected error: {str(e)}")
-                await container.audit_emitter.emit(
-                    _build_unexpected_payload(audit_ctx, e)
-                )
+                logger.exception(f"Unexpected error: {str(e)}")
+                if audit_ctx:
+                    await container.audit_emitter.emit(
+                        _build_unexpected_payload(audit_ctx, e)
+                    )
                 return Response(
                     status=StatusCode.INTERNAL_SERVER_ERROR,
                     message="Could not process request.",

{encryptors-2.67 → encryptors-2.69}/src/Osdental/Helpers/AuthTokenProcessor.py

@@ -7,6 +7,7 @@ from Osdental.Encryptor.Aes import AES
 from Osdental.Models.Token import AuthToken
 from Osdental.Enums.Profile import Profile
 from Osdental.Models.TokenClaims import UserTokenClaims
+from Osdental.Models.Graphql import BaseGraphQLContext
 
 def extract_bearer_token(headers: Headers) -> str:
 
@@ -56,8 +57,6 @@ def build_auth_token(
         id_external_enterprise=final_id,
         id_profile=claims.id_profile,
         id_legacy=claims.id_legacy,
-        id_authorization="000",
-        id_item_report="000",
         id_enterprise=claims.id_enterprise,
         user_full_name=claims.user_full_name,
         abbreviation=claims.abbreviation,
@@ -95,4 +94,21 @@ def decrypt_and_parse_payload(aes_key_auth: str, encrypted_payload: str) -> Dict
     else:
         raise ValueError("Unsupported decrypted payload type")
     
-    return decrypted_payload
+    return decrypted_payload
+
+
+def get_current_user(context: BaseGraphQLContext):
+    if context.token:
+        return context.token.id_user
+
+    return "00000000-0000-0000-0000-000000000000"
+
+
+def get_current_aes_key(context: BaseGraphQLContext):
+    if context.token:
+        return context.token.aes_key_auth
+
+    if context.access_token_claims:
+        return context.access_token_claims.aes_key
+
+    return None

{encryptors-2.67 → encryptors-2.69}/src/Osdental/Models/AuditContext.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional, Dict, Any
 from fastapi import Request
-from Osdental.Models.Token import AuthToken
+
 
 @dataclass
 class AuditContext:
@@ -30,7 +30,8 @@ class AuditContext:
         settings,
         body: Dict,
         operation_type: str,
-        token: AuthToken = None,
+        id_user: str | None,
+        decrypted_key: str | None,
         decrypted_payload = None,
     ) -> "AuditContext":
         
@@ -51,9 +52,9 @@ class AuditContext:
             operation_name=body.get("operationName", "UnknownOperation"),
             query=body.get("query"),
             variables=decrypted_payload,
-            user=token.id_user if token else "00000000-0000-0000-0000-000000000000",
+            user=id_user if id_user else "00000000-0000-0000-0000-000000000000",
             message_log_id=request.headers.get("Idmessagelog"),
-            decrypted_key=token.aes_key_auth if token else None,
+            decrypted_key=decrypted_key,
             user_ip=user_ip,
             headers=safe_headers,
             url=str(request.url),

{encryptors-2.67 → encryptors-2.69}/src/Osdental/Models/Graphql.py

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

{encryptors-2.67 → encryptors-2.69}/src/Osdental/Models/Token.py

@@ -8,8 +8,6 @@ class AuthToken:
     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

{encryptors-2.67 → encryptors-2.69}/src/Osdental/Services/ServiceBusAuditEmitter.py

@@ -14,6 +14,7 @@ class ServiceBusAuditEmitter:
         message_log_id = payload.get("idMessageLog")
         data = json.dumps(payload)
         blob_name = f"audits/{message_log_id}.text"
+        print(data)
         # url = await self._storage.upload(blob_name, data)
         # if not url:
         #     return