More improvements

Author: syrusakbary

src/graphql_server/http/async_base_view.py

@@ -327,12 +327,18 @@ async def run(
         request = cast("Request", request)
 
         request_adapter = self.request_adapter_class(request)
+        sub_response = await self.get_sub_response(request)
+        context = (
+            await self.get_context(request, response=sub_response)
+            if context is UNSET
+            else context
+        )
 
         if not self.is_request_allowed(request_adapter):
             raise HTTPException(405, "GraphQL only supports GET and POST requests.")
 
         try:
-            request_data = await self.parse_http_body(request_adapter)
+            request_data = await self.parse_http_body(context, request_adapter)
         except json.decoder.JSONDecodeError as e:
             raise HTTPException(400, "Unable to parse request body as JSON") from e
             # DO this only when doing files
@@ -350,13 +356,6 @@ async def run(
             if self.graphql_ide and self.should_render_graphql_ide(request_adapter):
                 return await self.render_graphql_ide(request, request_data)
 
-        sub_response = await self.get_sub_response(request)
-        context = (
-            await self.get_context(request, response=sub_response)
-            if context is UNSET
-            else context
-        )
-
         try:
             result = await self.execute_operation(
                 request=request,
@@ -544,6 +543,7 @@ async def parse_multipart_subscriptions(
 
     async def get_graphql_request_data(
         self,
+        context: Context,
         data: dict[str, Any],
         protocol: Literal["http", "multipart-subscription", "subscription"],
     ) -> GraphQLRequestData:
@@ -557,7 +557,7 @@ async def get_graphql_request_data(
         )
 
     async def parse_http_body(
-        self, request: AsyncHTTPRequestAdapter
+        self, context: Context, request: AsyncHTTPRequestAdapter
     ) -> GraphQLRequestData:
         headers = {key.lower(): value for key, value in request.headers.items()}
         content_type, _ = parse_content_type(request.content_type or "")
@@ -577,7 +577,7 @@ async def parse_http_body(
         else:
             raise HTTPException(400, "Unsupported content type")
 
-        return await self.get_graphql_request_data(data, protocol)
+        return await self.get_graphql_request_data(context, data, protocol)
 
     async def process_result(
         self, request: Request, result: ExecutionResult

src/graphql_server/http/sync_base_view.py

@@ -131,7 +131,10 @@ def parse_multipart(self, request: SyncHTTPRequestAdapter) -> dict[str, str]:
             raise HTTPException(400, "File(s) missing in form data") from e
 
     def get_graphql_request_data(
-        self, data: dict[str, Any], protocol: Literal["http", "multipart-subscription"]
+        self,
+        context: Context,
+        data: dict[str, Any],
+        protocol: Literal["http", "multipart-subscription"],
     ) -> GraphQLRequestData:
         return GraphQLRequestData(
             query=data.get("query"),
@@ -142,7 +145,9 @@ def get_graphql_request_data(
             protocol=protocol,
         )
 
-    def parse_http_body(self, request: SyncHTTPRequestAdapter) -> GraphQLRequestData:
+    def parse_http_body(
+        self, context: Context, request: SyncHTTPRequestAdapter
+    ) -> GraphQLRequestData:
         content_type, params = parse_content_type(request.content_type or "")
 
         if request.method == "GET":
@@ -159,7 +164,7 @@ def parse_http_body(self, request: SyncHTTPRequestAdapter) -> GraphQLRequestData
         else:
             raise HTTPException(400, "Unsupported content type")
 
-        return self.get_graphql_request_data(data, "http")
+        return self.get_graphql_request_data(context, data, "http")
 
     def _handle_errors(
         self, errors: list[GraphQLError], response_data: GraphQLHTTPResponse
@@ -177,8 +182,15 @@ def run(
         if not self.is_request_allowed(request_adapter):
             raise HTTPException(405, "GraphQL only supports GET and POST requests.")
 
+        sub_response = self.get_sub_response(request)
+        context = (
+            self.get_context(request, response=sub_response)
+            if context is UNSET
+            else context
+        )
+
         try:
-            request_data = self.parse_http_body(request_adapter)
+            request_data = self.parse_http_body(context, request_adapter)
         except json.decoder.JSONDecodeError as e:
             raise HTTPException(400, "Unable to parse request body as JSON") from e
             # DO this only when doing files
@@ -196,12 +208,6 @@ def run(
             if self.graphql_ide and self.should_render_graphql_ide(request_adapter):
                 return self.render_graphql_ide(request, request_data)
 
-        sub_response = self.get_sub_response(request)
-        context = (
-            self.get_context(request, response=sub_response)
-            if context is UNSET
-            else context
-        )
         root_value = self.get_root_value(request) if root_value is UNSET else root_value
 
         try:

src/graphql_server/static/graphiql.html

@@ -123,35 +123,20 @@
 
       // Collect the URL parameters
       var parameters = {};
-      window.location.search.substr(1).split('&').forEach(function (entry) {
-        var eq = entry.indexOf('=');
-        if (eq >= 0) {
-          parameters[decodeURIComponent(entry.slice(0, eq))] =
-            decodeURIComponent(entry.slice(eq + 1));
-        }
-      });
-      // Produce a Location query string from a parameter object.
-      function locationQuery(params) {
-        return '?' + Object.keys(params).filter(function (key) {
-          return Boolean(params[key]);
-        }).map(function (key) {
-          return encodeURIComponent(key) + '=' +
-            encodeURIComponent(params[key]);
-        }).join('&');
-      }
       // Derive a fetch URL from the current URL, sans the GraphQL parameters.
       var graphqlParamNames = {
         query: true,
         variables: true,
         operationName: true
       };
-      var otherParams = {};
-      for (var k in parameters) {
-        if (parameters.hasOwnProperty(k) && graphqlParamNames[k] !== true) {
-          otherParams[k] = parameters[k];
+      var currentURL = new URL(window.location.href);
+      var newParams = new URLSearchParams();
+      for (var [k, v] of currentURL.searchParams.entries()) {
+        if (graphqlParamNames[k] !== true) {
+          newParams.append(k, v);
         }
       }
-      var fetchURL = window.location.pathname + locationQuery(otherParams);
+      var fetchURL = window.location.pathname + '?' + newParams.toString();
 
       function httpUrlToWebSockeUrl(url) {
         const parsedURL = new URL(url, window.location.href);
@@ -208,15 +193,15 @@
           defaultEditorToolsVisibility: true,
           plugins: [explorerPlugin],
           inputValueDeprecation: true,
-          onEditQuery: onEditQuery,
-          onEditVariables: onEditVariables,
-          onEditHeaders: onEditHeaders,
-          onEditOperationName: onEditOperationName,
           query: {{query}},
-          variables: {{variables}},
+          variables: '{{variables}}',
           headers: parameters.headers,
           operationName: {{operation_name}},
           defaultQuery: EXAMPLE_QUERY,
+          onEditQuery: onEditQuery,
+          onEditVariables: onEditVariables,
+          onEditHeaders: onEditHeaders,
+          onEditOperationName: onEditOperationName,
         }),
       );
     </script>

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(
-            message["payload"], "subscription"
+            self.context, message["payload"], "subscription"
         )
 
         operation = Operation(

src/tests/websockets/test_graphql_transport_ws.py

@@ -194,7 +194,6 @@ async def test_connection_init_timeout_cancellation(
     )
 
 
-@pytest.mark.xfail(reason="This test is flaky")
 async def test_close_twice(mocker: MockerFixture, http_client_class: type[HttpClient]):
     test_client = http_client_class(
         connection_init_wait_timeout=timedelta(seconds=0.25)
@@ -1049,9 +1048,6 @@ async def test_rejects_connection_params_with_wrong_type(
     assert ws.close_reason == "Invalid connection init payload"
 
 
-# timings can sometimes fail currently.  Until this test is rewritten when
-# generator based subscriptions are implemented, mark it as flaky
-@pytest.mark.xfail(reason="This test is flaky, see comment above")
 async def test_subsciption_cancel_finalization_delay(ws: WebSocketClient):
     # Test that when we cancel a subscription, the websocket isn't blocked
     # while some complex finalization takes place.