rename params

http-api/middlewares.py

@@ -1,5 +1,3 @@
-import json
-
 from aws_lambda_powertools.event_handler.api_gateway import (
     APIGatewayHttpResolver,
     Response,
@@ -8,7 +6,9 @@ from aws_lambda_powertools.event_handler.middlewares import (
     BaseMiddlewareHandler,
     NextMiddleware,
 )
-from aws_lambda_powertools.shared.json_encoder import Encoder
+from aws_lambda_powertools.shared.functions import (
+    extract_event_from_common_models,
+)
 from layercake.dateutils import now, ttl
 from layercake.dynamodb import ComposeKey, DynamoDBCollection, KeyPair
 from pydantic import UUID4, BaseModel, Field
@@ -16,6 +16,14 @@ from pydantic import UUID4, BaseModel, Field
 LOG_RETENTION_DAYS = 365 * 2  # 2 years
 
 
+class AuthenticatedUser(BaseModel):
+    id: str = Field(alias='custom:user_id')
+    name: str
+    email: str
+    email_verified: bool
+    sub: UUID4
+
+
 class AuthorizerMiddleware(BaseMiddlewareHandler):
     def handler(
         self,
@@ -33,14 +41,6 @@ class AuthorizerMiddleware(BaseMiddlewareHandler):
         return next_middleware(app)
 
 
-class AuthenticatedUser(BaseModel):
-    id: str = Field(alias='custom:user_id')
-    name: str
-    email: str
-    email_verified: bool
-    sub: UUID4
-
-
 class AuditLogMiddleware(BaseMiddlewareHandler):
     """This middleware logs audit details for successful requests, storing user,
     action, and IP info with a specified retention period.."""
@@ -71,7 +71,9 @@ class AuditLogMiddleware(BaseMiddlewareHandler):
         if 200 <= response.status_code < 300 and user:
             now_ = now()
             data = (
-                json.dumps(response.body, cls=Encoder) if response.is_json() else None
+                extract_event_from_common_models(response.body)
+                if response.is_json()
+                else None
             )
             retention_days = (
                 ttl(start_dt=now_, days=self.retention_days)