More improvements

Author: syrusakbary

src/graphql_server/http/async_base_view.py

@@ -338,7 +338,7 @@ async def run(
             raise HTTPException(405, "GraphQL only supports GET and POST requests.")
 
         try:
-            request_data = await self.parse_http_body(context, request_adapter)
+            request_data = await self.parse_http_body(request_adapter, context)
         except json.decoder.JSONDecodeError as e:
             raise HTTPException(400, "Unable to parse request body as JSON") from e
             # DO this only when doing files
@@ -543,6 +543,7 @@ async def parse_multipart_subscriptions(
 
     async def get_graphql_request_data(
         self,
+        request: Union[AsyncHTTPRequestAdapter, WebSocketRequest],
         context: Context,
         data: dict[str, Any],
         protocol: Literal["http", "multipart-subscription", "subscription"],
@@ -557,7 +558,9 @@ async def get_graphql_request_data(
         )
 
     async def parse_http_body(
-        self, context: Context, request: AsyncHTTPRequestAdapter
+        self,
+        request: AsyncHTTPRequestAdapter,
+        context: Context,
     ) -> GraphQLRequestData:
         headers = {key.lower(): value for key, value in request.headers.items()}
         content_type, _ = parse_content_type(request.content_type or "")
@@ -577,7 +580,7 @@ async def parse_http_body(
         else:
             raise HTTPException(400, "Unsupported content type")
 
-        return await self.get_graphql_request_data(context, data, protocol)
+        return await self.get_graphql_request_data(request, context, data, protocol)
 
     async def process_result(
         self, request: Request, result: ExecutionResult

src/graphql_server/http/sync_base_view.py

@@ -132,6 +132,7 @@ def parse_multipart(self, request: SyncHTTPRequestAdapter) -> dict[str, str]:
 
     def get_graphql_request_data(
         self,
+        request: SyncHTTPRequestAdapter,
         context: Context,
         data: dict[str, Any],
         protocol: Literal["http", "multipart-subscription"],
@@ -146,7 +147,9 @@ def get_graphql_request_data(
         )
 
     def parse_http_body(
-        self, context: Context, request: SyncHTTPRequestAdapter
+        self,
+        request: SyncHTTPRequestAdapter,
+        context: Context,
     ) -> GraphQLRequestData:
         content_type, params = parse_content_type(request.content_type or "")
 
@@ -164,7 +167,7 @@ def parse_http_body(
         else:
             raise HTTPException(400, "Unsupported content type")
 
-        return self.get_graphql_request_data(context, data, "http")
+        return self.get_graphql_request_data(request, context, data, "http")
 
     def _handle_errors(
         self, errors: list[GraphQLError], response_data: GraphQLHTTPResponse
@@ -190,7 +193,7 @@ def run(
         )
 
         try:
-            request_data = self.parse_http_body(context, request_adapter)
+            request_data = self.parse_http_body(request_adapter, context)
         except json.decoder.JSONDecodeError as e:
             raise HTTPException(400, "Unable to parse request body as JSON") from e
             # DO this only when doing files

src/graphql_server/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -255,7 +255,7 @@ async def handle_subscribe(self, message: SubscribeMessage) -> None:
             )
 
         request_data = await self.view.get_graphql_request_data(
-            self.context, message["payload"], "subscription"
+            self.websocket, self.context, message["payload"], "subscription"
         )
 
         operation = Operation(