Simplified logic

Author: syrusakbary

flask_graphql/graphqlview.py

@@ -73,14 +73,21 @@ def dispatch_request(self):
                 raise HttpError(MethodNotAllowed(['GET', 'POST'], 'GraphQL only supports GET and POST requests.'))
 
             data = self.parse_body(request)
+
             show_graphiql = self.graphiql and self.can_display_graphiql(data)
 
-            if self.batch:
+            if isinstance(data, list):
+                if not self.batch or show_graphiql:
+                    raise HttpError(BadRequest('Batch requests are not allowed.'))
+
                 responses = [self.get_response(request, entry) for entry in data]
-                result = '[{}]'.format(','.join([response[0] for response in responses]))
-                status_code = max(responses, key=lambda response: response[1])[1]
+                response, status_codes = zip(*responses)
+                status_code = max(status_codes)
             else:
-                result, status_code = self.get_response(request, data, show_graphiql)
+                response, status_code = self.get_response(request, data, show_graphiql)
+
+            pretty = self.pretty or show_graphiql or request.args.get('pretty')
+            result = self.json_encode(response, pretty)
 
             if show_graphiql:
                 query, variables, operation_name, id = self.get_graphql_params(request, data)
@@ -99,7 +106,7 @@ def dispatch_request(self):
 
         except HttpError as e:
             return Response(
-                self.json_encode(request, {
+                self.json_encode({
                     'errors': [self.format_error(e)]
                 }),
                 status=e.response.code,
@@ -132,20 +139,15 @@ def get_response(self, request, data, show_graphiql=False):
                 response['data'] = execution_result.data
 
             if self.batch:
-                response = {
-                    'id': id,
-                    'payload': response,
-                    'status': status_code,
-                }
+                response['id'] = id
 
-            result = self.json_encode(request, response, show_graphiql)
         else:
-            result = None
+            response = None
 
-        return result, status_code
+        return response, status_code
 
-    def json_encode(self, request, d, show_graphiql=False):
-        pretty = self.pretty or show_graphiql or request.args.get('pretty')
+    @staticmethod
+    def json_encode(d, pretty=False):
         if not pretty:
             return json.dumps(d, separators=(',', ':'))
 
@@ -160,12 +162,7 @@ def parse_body(self, request):
 
         elif content_type == 'application/json':
             try:
-                request_json = json.loads(request.data.decode('utf8'))
-                if self.batch:
-                    assert isinstance(request_json, list)
-                else:
-                    assert isinstance(request_json, dict)
-                return request_json
+                return json.loads(request.data.decode('utf8'))
             except:
                 raise HttpError(BadRequest('POST body sent invalid JSON.'))
 

tests/test_graphqlview.py

@@ -376,12 +376,12 @@ def test_handles_errors_caused_by_a_lack_of_query(client):
     }
 
 
-def test_handles_invalid_json_bodies(client):
+def test_handles_batch_correctly_if_is_disabled(client):
     response = client.post(url_string(), data='[]', content_type='application/json')
 
     assert response.status_code == 400
     assert response_json(response) == {
-        'errors': [{'message': 'POST body sent invalid JSON.'}]
+        'errors': [{'message': 'Batch requests are not allowed.'}]
     }
 
 
@@ -477,8 +477,7 @@ def test_batch_allows_post_with_json_encoding(client):
     assert response.status_code == 200
     assert response_json(response) == [{
         'id': 1,
-        'payload': { 'data': {'test': "Hello World"} },
-        'status': 200,
+        'data': {'test': "Hello World"}
     }]
 
 
@@ -497,8 +496,7 @@ def test_batch_supports_post_json_query_with_json_variables(client):
     assert response.status_code == 200
     assert response_json(response) == [{
         'id': 1,
-        'payload': { 'data': {'test': "Hello Dolly"} },
-        'status': 200,
+        'data': {'test': "Hello Dolly"}
     }]
 
 
@@ -524,11 +522,8 @@ def test_batch_allows_post_with_operation_name(client):
     assert response.status_code == 200
     assert response_json(response) == [{
         'id': 1,
-        'payload': {
-            'data': {
-                'test': 'Hello World',
-                'shared': 'Hello Everyone'
-            }
-        },
-        'status': 200,
+        'data': {
+            'test': 'Hello World',
+            'shared': 'Hello Everyone'
+        }
     }]