Encryptors 2.22__tar.gz → 2.23__tar.gz

{encryptors-2.22 → encryptors-2.23}/PKG-INFO

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

{encryptors-2.22 → encryptors-2.23}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
  
 setup(
     name="Encryptors", 
-    version="2.22",
+    version="2.23",
     author="OSDental LLC",
     author_email="support@osdental.ai",
     description="End-to-end algorithm library",

{encryptors-2.22 → encryptors-2.23}/src/Encryptors.egg-info/PKG-INFO

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

{encryptors-2.22 → encryptors-2.23}/src/Osdental/Decorators/SecureResolver.py

@@ -4,9 +4,17 @@ from functools import wraps
 from typing import Callable, Dict, Any, Iterable
 from graphql import GraphQLResolveInfo
 from Osdental.Shared.Enums.Profile import Profile
-from Osdental.Models.Token import AuthToken
+from Osdental.Models.Response import Response
+from Osdental.Encryptor.Aes import AES
+from Osdental.Models._SecurityContext import SecurityContext
 from Osdental.Exception.ControlledException import OSDException, UnauthorizedException
 
+def _encrypt_if_needed(result: Response, security: SecurityContext) -> Response:
+    if result.data is not None and security.encryptor:
+        result.data = AES.encrypt(security.encryptor.aes_auth, result.data)
+
+    return result
+
 def secure_resolver(allowed_roles: Iterable[str] | None = None):
     def decorator(func: Callable):
 
@@ -16,8 +24,8 @@ def secure_resolver(allowed_roles: Iterable[str] | None = None):
         @wraps(func)
         async def wrapper(obj: Any, info: GraphQLResolveInfo, **rest_kwargs: Dict):
             try:
-                security = info.context.security
-                token: AuthToken = security.auth
+                security: SecurityContext = info.context.security
+                token = security.token
 
                 if allowed_roles:
                     if Profile(token.abbreviation) not in allowed_roles:
@@ -32,7 +40,9 @@ def secure_resolver(allowed_roles: Iterable[str] | None = None):
                     if payload:
                         rest_kwargs["data"] = payload
 
-                result = await func(obj, info, **rest_kwargs)
+                result: Response = await func(obj, info, **rest_kwargs)
+                result = _encrypt_if_needed(result, security)
+
                 _ = asyncio.create_task(
                     info.context.audit_dispatcher.dispatch(
                         security=security,
@@ -40,15 +50,15 @@ def secure_resolver(allowed_roles: Iterable[str] | None = None):
                     )
                 )
 
-                return result
+                return result.send()
 
             except (Exception, OSDException) as e:
-                result = {
-                    "status": getattr(e, "status_code", "DB_ERROR_UNEXPECTED"),
-                    "message": getattr(e, "message", "Could not process request."),
-                    "error": getattr(e, "error", type(e).__name__),
-                    "data": None
-                }
+                result = Response(
+                    status=getattr(e, "status_code", "DB_ERROR_UNEXPECTED"),
+                    message=getattr(e, "message", "Could not process request."),
+                    error=getattr(e, "error", type(e).__name__),
+                    data=None
+                )
 
                 _ = asyncio.create_task(
                     info.context.audit_dispatcher.dispatch(
@@ -57,7 +67,7 @@ def secure_resolver(allowed_roles: Iterable[str] | None = None):
                     )
                 )
 
-                return result
+                return result.send()
 
         return wrapper
     return decorator

{encryptors-2.22 → encryptors-2.23}/src/Osdental/Helpers/AuditDispatcher.py

@@ -4,6 +4,7 @@ from Osdental.Shared.Logger import logger
 from Osdental.Helpers.AuditLogHelper import AuditLogHelper
 from Osdental.Models.AuditConfig import AuditConfig
 from Osdental.Messaging import IMessageQueue
+from Osdental.Models.Response import Response
 
 class AuditType(Enum):
     RESPONSE = "RESPONSE"
@@ -65,7 +66,7 @@ class AuditDispatcher:
     # Aquí vive toda la lógica fea
     async def _process(self, payload):
         security = payload["security"]
-        result = payload["result"]
+        result: Response = payload["result"]
 
         operation_name = security.gql_request.operation_name
         if operation_name == 'UnknownOperation':
@@ -76,16 +77,14 @@ class AuditDispatcher:
             security, self.audit_config
         )
 
-        status = result.get("status")
-        data = result.get("data")
-        error = result.get("error")
+        status = result.status
         
         ERROR_PREFIXES = ("DB_ERROR", "DB_WARNING")
         if status.upper().startswith(ERROR_PREFIXES):
             payload = AuditLogHelper.build_final_payload(
                 type=AuditType.ERROR.value,
                 status_code=status,
-                error=error
+                error=result.error
             )
 
             audit_message = request_audit_payload | payload
@@ -94,7 +93,7 @@ class AuditDispatcher:
             payload = AuditLogHelper.build_final_payload(
                 type=AuditType.RESPONSE.value,
                 status_code=status,
-                result=data
+                result=result.data
             )
 
             audit_message = request_audit_payload | payload

{encryptors-2.22 → encryptors-2.23}/src/Osdental/Models/Response.py

@@ -7,7 +7,7 @@ class Response(BaseModel):
     status: str = Code.PROCESS_SUCCESS_CODE
     message: str = Message.PROCESS_SUCCESS_MSG
     data: Optional[Any] = None 
-
-
+    error: Optional[str] = None
+    
     def send(self):
-        return self.model_dump()
+        return self.model_dump(exclude={"error"})