Improved query params retreival

syrusakbary · syrusakbary · commit 258af89c59ce · 2017-03-16T01:26:27.000-07:00
diff --git a/flask_graphql/graphqlview.py b/flask_graphql/graphqlview.py
@@ -81,18 +81,20 @@ def dispatch_request(self):
                 )
 
             data = self.parse_body(request)
+            is_batch = isinstance(data, list)
 
-            show_graphiql = self.graphiql and self.can_display_graphiql(data)
+            show_graphiql = not is_batch and self.graphiql and self.can_display_graphiql(data)
 
-            is_batch = isinstance(data, list)
-            if is_batch:
-                if not self.batch or show_graphiql:
-                    raise HttpError(
-                        400,
-                        'Batch requests are not allowed.'
-                    )
-            else:
+            if not is_batch:
+                # print data
+                data = dict(data, **request.args.to_dict())
                 data = [data]
+            elif not self.batch:
+                raise HttpError(
+                    400,
+                    'Batch requests are not allowed.'
+                )
+
             responses = [self.get_response(request, entry, show_graphiql) for entry in data]
             response, status_codes = zip(*responses)
             status_code = max(status_codes)
@@ -185,10 +187,10 @@ def parse_body(self, request):
                 )
 
         elif content_type == 'application/x-www-form-urlencoded':
-            return request.form
+            return request.form.to_dict()
 
         elif content_type == 'multipart/form-data':
-            return request.form
+            return request.form.to_dict()
 
         return {}
 
@@ -254,8 +256,8 @@ def request_wants_html(cls, request):
 
     @staticmethod
     def get_graphql_params(request, data):
-        query = request.args.get('query') or data.get('query')
-        variables = request.args.get('variables') or data.get('variables')
+        query = data.get('query')
+        variables = data.get('variables')
         id = data.get('id')
 
         if variables and isinstance(variables, six.text_type):
@@ -264,7 +266,7 @@ def get_graphql_params(request, data):
             except:
                 raise HttpError(400, 'Variables are invalid JSON.')
 
-        operation_name = request.args.get('operationName') or data.get('operationName')
+        operation_name = data.get('operationName')
 
         return query, variables, operation_name, id
 
