Merge branch 'Aweary-master'

Author: leebyron

package.json

@@ -58,6 +58,7 @@
     "babel-core": "5.8.22",
     "babel-eslint": "4.0.10",
     "babel-runtime": "5.8.20",
+    "body-parser": "^1.14.0",
     "chai": "3.2.0",
     "coveralls": "2.11.4",
     "eslint": "1.1.0",

src/__tests__/http-test.js

@@ -16,6 +16,7 @@ import { describe, it } from 'mocha';
 import { stringify } from 'querystring';
 import zlib from 'zlib';
 import multer from 'multer';
+import bodyParser from 'body-parser';
 import request from 'supertest-as-promised';
 import express4 from 'express'; // modern
 import express3 from 'express3'; // old but commonly still used
@@ -485,6 +486,42 @@ describe('test harness', () => {
         });
       });
 
+      it('allows for pre-parsed POST using application/graphql', async () => {
+        var app = express();
+        app.use(bodyParser.text({ type: 'application/graphql' }));
+
+        app.use(urlString(), graphqlHTTP({ schema: TestSchema }));
+
+        var req = request(app)
+          .post(urlString())
+          .set('Content-Type', 'application/graphql');
+        req.write(new Buffer('{ test(who: "World") }'));
+        var response = await req;
+
+        expect(JSON.parse(response.text)).to.deep.equal({
+          data: {
+            test: 'Hello World'
+          }
+        });
+      });
+
+      it('does not accept unknown pre-parsed POST string', async () => {
+        var app = express();
+        app.use(bodyParser.text({ type: '*/*' }));
+
+        app.use(urlString(), graphqlHTTP({ schema: TestSchema }));
+
+        var req = request(app)
+          .post(urlString());
+        req.write(new Buffer('{ test(who: "World") }'));
+        var error = await catchError(req);
+
+        expect(error.response.status).to.equal(400);
+        expect(JSON.parse(error.response.text)).to.deep.equal({
+          errors: [ { message: 'Must provide query string.' } ]
+        });
+      });
+
     });
 
     describe('Pretty printing', () => {

src/parseBody.js

@@ -18,7 +18,7 @@ import type { Request } from 'express';
 
 export function parseBody(req: Request, next: NodeCallback): void {
   try {
-    // If express has already parsed a body, use it.
+    // If express has already parsed a body as an object, use it.
     if (typeof req.body === 'object') {
       return next(null, req.body);
     }
@@ -30,6 +30,18 @@ export function parseBody(req: Request, next: NodeCallback): void {
 
     var typeInfo = contentType.parse(req);
 
+    // If express has already parsed a body as a string, and the content-type
+    // was application/graphql, parse the string body.
+    if (typeof req.body === 'string' &&
+        typeInfo.type === 'application/graphql') {
+      return next(null, graphqlParser(req.body));
+    }
+
+    // Already parsed body we didn't recognise? Parse nothing.
+    if (req.body) {
+      return next();
+    }
+
     // Use the correct body parser based on Content-Type header.
     switch (typeInfo.type) {
       case 'application/graphql':