fix(chore): accept variables for mutations via POST

RisingStack · Feb 15, 2016 · e2292e7 · e2292e7
1 parent ddb11dd
commit e2292e7
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 4 deletions.
diff --git a/src/express/express.js b/src/express/express.js
@@ -31,7 +31,14 @@ export default function middleware({ graphiql = true, schema = required() } = {}
         return sendError(response, boom);
       }
 
-      return graphql(schema, query, request, variables)
+      let parsedVariables = variables;
+      try {
+        parsedVariables = JSON.parse(variables);
+      } catch (err) {
+        // ignore
+      }
+
+      return graphql(schema, query, request, parsedVariables)
         .then((result) => {
           if (result.errors) {
             const message = result.errors.map((error) => error.message).join('\n');

diff --git a/src/express/express.spec.js b/src/express/express.spec.js
@@ -176,5 +176,33 @@ describe('graffiti express', () => {
 
       mw(request, response);
     });
+
+    it('should accept variables for mutations via POST', function postTest(done) {
+      const result = { updateData: '123' };
+      const mw = mwFactory({
+        schema: this.schema
+      });
+
+      const request = {
+        method: 'POST',
+        path: '/graphql',
+        body: {
+          query: `mutation mutate($data: String!) {
+            updateData(data: $data)
+          }`,
+          variables: '{ "data": "123" }'
+        },
+        accepts: (type) => type === 'json'
+      };
+
+      const response = {
+        json: ({ data }) => {
+          expect(data).to.be.eql(result);
+          done();
+        }
+      };
+
+      mw(request, response);
+    });
   });
 });
diff --git a/src/hapi/hapi.js b/src/hapi/hapi.js
@@ -29,7 +29,14 @@ const plugin = {
         return reply(methodNotAllowed('GraphQL mutation only allowed in POST request.'));
       }
 
-      return graphql(schema, query, request, variables)
+      let parsedVariables = variables;
+      try {
+        parsedVariables = JSON.parse(variables);
+      } catch (err) {
+        // ignore
+      }
+
+      return graphql(schema, query, request, parsedVariables)
         .then((result) => {
           if (result.errors) {
             const message = result.errors.map((error) => error.message).join('\n');

diff --git a/src/hapi/hapi.spec.js b/src/hapi/hapi.spec.js
@@ -94,6 +94,38 @@ describe('graffiti hapi', () => {
       });
     });
 
+    it('should accept variables for mutations via POST', function postTest(done) {
+      const server = new Server();
+      server.connection({ port: 3000 });
+
+      const result = { updateData: '123' };
+
+      server.register({
+        register: hapi,
+        options: {
+          schema: this.schema
+        }
+      }, (err) => {
+        if (err) {
+          return done(err);
+        }
+
+        server.inject({
+          method: 'POST',
+          url: '/graphql',
+          payload: {
+            query: `mutation mutate($data: String!) {
+              updateData(data: $data)
+            }`,
+            variables: '{ "data": "123" }'
+          }
+        }, ({ payload }) => {
+          expect(JSON.parse(payload).data).to.eql(result);
+          done();
+        });
+      });
+    });
+
     it('should return with GraphiQL on GET when it is enabled', function getTest(done) {
       const server = new Server();
       server.connection({ port: 3000 });

diff --git a/src/koa/koa.js b/src/koa/koa.js
@@ -28,7 +28,14 @@ export default function middleware({ graphiql = true, schema = required() } = {}
         return this.body;
       }
 
-      this.body = yield graphql(schema, query, this, variables);
+      let parsedVariables = variables;
+      try {
+        parsedVariables = JSON.parse(variables);
+      } catch (err) {
+        // ignore
+      }
+
+      this.body = yield graphql(schema, query, this, parsedVariables);
       return this.body;
     }
 

diff --git a/src/koa/koa.spec.js b/src/koa/koa.spec.js
@@ -57,6 +57,30 @@ describe('graffiti koa', () => {
       expect(res.data).to.eql(result);
     });
 
+    it('should accept variables for mutations via POST', function *postTest() {
+      const mwFactory = koa;
+
+      const mw = mwFactory({
+        schema: this.schema
+      });
+
+      const request = {
+        method: 'POST',
+        path: '/graphql',
+        payload: {
+          query: `mutation mutate($data: String!) {
+            updateData(data: $data)
+          }`,
+          variables: '{ "data": "123" }'
+        }
+      };
+
+      const result = { updateData: '123' };
+      const res = yield mw.call(request);
+
+      expect(res.data).to.eql(result);
+    });
+
     it('should return with GraphiQL on GET when it is enabled', function *getTest() {
       const mwFactory = koa;
 

diff --git a/src/test-setup.spec.js b/src/test-setup.spec.js
@@ -5,7 +5,8 @@ import chaiSubset from 'chai-subset';
 import {
   GraphQLSchema,
   GraphQLObjectType,
-  GraphQLInt
+  GraphQLInt,
+  GraphQLString
 } from 'graphql';
 
 before(() => {
@@ -25,6 +26,22 @@ beforeEach(function beforeEachTest() {
           resolve: () => 1
         }
       }
+    }),
+    mutation: new GraphQLObjectType({
+      name: 'RootMutationType',
+      fields: {
+        updateData: {
+          type: GraphQLString,
+          args: {
+            data: {
+              name: 'data',
+              type: GraphQLString
+            }
+          },
+          description: 'Returns the data provided',
+          resolve: (obj, { data }) => data
+        }
+      }
     })
   });
 });