Merge pull request #7 from opentable/request

Switch to request

Author: chriscartlidge

index.js

@@ -1,51 +1,37 @@
-const fetch = require('isomorphic-fetch');
+const http = require('http');
+const request = require('request');
 const _ = require('lodash');
 
-let client;
+let settings;
 
-const createQuery = (query, variables) => {
-  const body = {
-    query,
-    variables,
-    operationName: null,
-  };
-
-  return JSON.stringify(body);
-};
-
-const checkResponseStatus = (response) => {
-  if (response.ok) {
-    return response;
-  }
-
-  const error = new Error(response.statusText);
-  error.response = response;
-  throw error;
-};
-
-const parseResponse = response => response.json();
-
-module.exports.register = (opts, dependencies, next) => { // eslint-disable-line consistent-return
+module.exports.register = (opts, dependencies, next) => {
   if (!opts.serverUrl) {
     return next(new Error('The serverUrl parameter is invalid'));
   }
 
-  client = (options, headers, timeout) => fetch(opts.serverUrl, {
-    method: 'POST',
-    timeout,
-    headers: _.extend(
-      {
-        'Content-Type': 'application/json',
-        'User-Agent': 'oc',
-      }, headers),
-
-    body: createQuery(options.query, options.variables),
-  }).then(checkResponseStatus)
-    .then(parseResponse);
-
-  next();
+  settings = opts;
+  return next();
 };
 
 module.exports.execute = () => ({
-  query: (options, headers, timeout) => client(options, headers, timeout),
+  query: (options, headers, timeout) => new Promise((resolve, reject) => request({
+    body: {
+      query: options.query,
+      variables: options.variables,
+      operationName: null,
+    },
+    headers: _.extend({ 'User-Agent': 'oc' }, headers),
+    json: true,
+    method: 'POST',
+    timeout,
+    url: settings.serverUrl,
+  }, (err, result, body) => {
+    if (err) {
+      return reject(new Error(err));
+    } else if (result.statusCode !== 200) {
+      return reject(new Error(http.STATUS_CODES[result.statusCode]));
+    }
+
+    return resolve(body);
+  })),
 });

package.json

@@ -14,8 +14,8 @@
     "test": "npm run lint && mocha tests"
   },
   "dependencies": {
-    "isomorphic-fetch": "^2.2.1",
-    "lodash": "^4.17.4"
+    "lodash": "^4.17.4",
+    "request": "^2.81.0"
   },
   "devDependencies": {
     "chai": "^3.5.0",

tests/index.js

@@ -6,7 +6,7 @@ describe('OpenTable OC registry :: plugins :: graphql-plugin ', () => {
 
   describe('when calling register with an valid batchInterval', () => {
     const plugin = injectr('../index.js', {
-      'fetch': (url, options) => { }
+      request: sinon.stub().yields(null, {}, 'ok')
     });
 
     let error;
@@ -24,7 +24,7 @@ describe('OpenTable OC registry :: plugins :: graphql-plugin ', () => {
 
   describe('when calling register with no serverUrl', () => {
     const plugin = injectr('../index.js', {
-      'fetch': (url, options) => { }
+      request: sinon.stub().yields(null, {}, 'ok')
     });
     let error;
     beforeEach((done) => {
@@ -41,7 +41,7 @@ describe('OpenTable OC registry :: plugins :: graphql-plugin ', () => {
 
   describe('when calling with the correct options', () => {
     const plugin = injectr('../index.js', {
-      'fetch': (url, options) => { }
+      request: sinon.stub().yields(null, {}, 'ok')
     });
     const next = sinon.spy();
 
@@ -59,7 +59,7 @@ describe('OpenTable OC registry :: plugins :: graphql-plugin ', () => {
 
   describe('when calling execute', () => {
     const plugin = injectr('../index.js', {
-      'fetch': (url, options) => { }
+      request: sinon.stub().yields(null, {}, 'ok')
     });
     let client;
     beforeEach((done) => {
@@ -78,7 +78,7 @@ describe('OpenTable OC registry :: plugins :: graphql-plugin ', () => {
   describe('when calling query and endpoint fails', () => {
     let client;
     const plugin = injectr('../index.js', {
-      'isomorphic-fetch': sinon.stub().returns(Promise.resolve({ ok: false, statusText: 'Failure' }))
+      request: sinon.stub().yields(null, { statusCode: 500}, {})
     });
 
     beforeEach((done) => {
@@ -92,15 +92,15 @@ describe('OpenTable OC registry :: plugins :: graphql-plugin ', () => {
     it('should return a failure message', (done) => {
       client.query({ query: {}, variables: { test: 1 } }, { 'accept-language': 'en-US' })
         .catch(error => {
-          expect(error.message).to.equal('Failure')
+          expect(error.message).to.equal('Internal Server Error')
         }).then(done, done)
     });
   });
 
   describe('when calling query successfully', () => {
     let client;
     const plugin = injectr('../index.js', {
-      'isomorphic-fetch': sinon.stub().returns(Promise.resolve({ ok: true, json: () => Promise.resolve('PASSED') }))
+      request: sinon.stub().yields(null, { statusCode: 200}, { someJson: true })
     });
 
     beforeEach((done) => {
@@ -114,7 +114,7 @@ describe('OpenTable OC registry :: plugins :: graphql-plugin ', () => {
     it('should return a failture message', (done) => {
       client.query({ query: {}, variables: { test: 1 } }, { 'accept-language': 'en-US' })
         .then(res => {
-          expect(res).to.equal('PASSED')
+          expect(res).to.eql({ someJson: true })
         }).then(done, done)
     });
   });