Merge pull request #9 from graphql-python/feature/handler_fixes

Allow posting Query as plaintext body in POST

Author: ekampf

graphene_gae/webapp2/__init__.py

@@ -53,19 +53,26 @@ def _get_pretty(self):
         return self.app.config.get('graphql_pretty', False)
 
     def _get_grapl_params(self):
-        query = None if not self.request.body else self.request.json_body.get('query')
+        try:
+            request_data = self.request.json_body
+        except:
+            request_data = {}
+
+        request_data.update(dict(self.request.GET))
+
+        query = request_data.get('query', self.request.body)
         if not query:
             webapp2.abort(400, "Query is empty.")
 
-        operation_name = self.request.json_body.get('operation_name')
-        variables = self.request.json_body.get('variables')
+        operation_name = request_data.get('operation_name')
+        variables = request_data.get('variables')
         if variables and isinstance(variables, six.text_type):
             try:
                 variables = json.loads(variables)
             except:
                 raise webapp2.abort(400, 'Variables are invalid JSON.')
 
-        pretty = self.request.json_body.get('pretty') or self.request.GET.get('pretty')
+        pretty = request_data.get('pretty')
 
         return query, operation_name, variables, pretty
 

tests/_webapp2/test_graphql_handler.py

@@ -184,3 +184,7 @@ def testPOST_override_pretty_via_post_param(self):
             pretty=True
         )))
         self.assertEqual(response.body, '{\n  "data": {\n    "greet": "Hello You!"\n  }\n}')
+
+    def testPOST_stringBody_readsQueryFromBodyAndRestFromGET(self):
+        response = self.app.post('/graphql?pretty=True', params='query helloYou { greet(who: "You") }')
+        self.assertEqual(response.body, '{\n  "data": {\n    "greet": "Hello You!"\n  }\n}')