Merge branch 'master' of github.com:FoxComm/api-js

Author: mbektimirov

package.json

@@ -28,7 +28,8 @@
   "homepage": "https://github.com/FoxComm/api-js#readme",
   "dependencies": {
     "debug": "^2.2.0",
-    "isomorphic-fetch": "^2.2.1",
+    "postinstall-build": "^0.2.1",
+    "superagent": "^3.2.1",
     "jwt-decode": "^2.0.1"
   },
   "devDependencies": {
@@ -37,7 +38,6 @@
     "babel-preset-stage-1": "^6.5.0",
     "escape-html": "^1.0.3",
     "leafdoc": "github:anru/Leafdoc#v1.1",
-    "lodash": "^4.13.1",
     "mkdirp": "^0.5.1",
     "mocha": "^2.5.2",
     "nock": "^8.0.0"

src/api/auth.js

@@ -29,8 +29,9 @@ export default class Auth {
 
   _processJWT(promise, jwt) {
     return promise.then(response => {
-      jwt = response.headers.get('jwt');
-      return response.json();
+      jwt = response.header.jwt;
+
+      return response.body;
     })
     .then(data => {
       if (data.email) {

src/index.js

@@ -33,6 +33,9 @@ export default class Api {
     this.api_url = args.api_url.replace(/\/?$/, ''); // ensure no trailing slash
     this.stripe_key = args.stripe_key;
 
+    // could be passed superagent or supertest instance
+    this.agent = args.agent || require('superagent');
+
     // @property addresses: Addresses
     // Addresses instance
     this.addresses = new Addresses(this);
@@ -138,6 +141,9 @@ export default class Api {
         ...(options.headers || {}),
       };
     }
+
+    options.agent = this.agent;
+
     return request(method, finalUrl, data, options);
   }
 

src/utils/request.js

@@ -1,5 +1,4 @@
-
-import fetch from 'isomorphic-fetch';
+import superagent from 'superagent';
 import makeDebug from 'debug';
 
 const debug = makeDebug('foxapi');
@@ -49,61 +48,58 @@ export default function request(method, uri, data, options) {
     },
   };
 
+  const agent = options.agent || superagent;
+  const requestPromise =
+    agent[method.toLowerCase()](uri)
+    .set(options.headers)
+    .withCredentials();
+
   if (data) {
     if (method.toUpperCase() === 'GET') {
       const queryString = serialize(data);
+
       if (queryString) {
-        uri = appendQueryString(uri, queryString);
+        requestPromise.query(queryString);
       }
     } else {
-      options.body = JSON.stringify(data);
+      requestPromise.send(data);
     }
   }
 
   let error = null;
 
   debug(`${method.toUpperCase()} ${uri}`);
+
   if (debug.enabled && data) {
     debug(JSON.stringify(data));
   }
-  const promise = fetch(uri, options);
 
   if (options.handleResponse !== false) {
-    return promise
-      .then(response => {
-        debug(`${response.status} ${method.toUpperCase()} ${uri}`);
-        if (response.status == 401) {
-          options.unauthorizedHandler(response);
-        }
-        if (response.status < 200 || response.status >= 300) {
-          const message = `${method.toUpperCase()} ${uri} responded with ${response.statusText}`;
-          error = new Error(message);
-          error.response = response;
-        }
-
-        return response;
-      })
-      .then(response => response.text())
-      .then(responseText => {
-        let json = null;
-        if (responseText) {
-          try {
-            json = JSON.parse(responseText);
-          } catch (ex) {
-            // invalid json
+    return requestPromise
+      .then(
+        response => {
+          debug(`${response.status} ${method.toUpperCase()} ${uri}`);
+
+          return response.body;
+        },
+        err => {
+          if (err.statusCode === 401) {
+            options.unauthorizedHandler();
           }
-        }
 
-        if (error) {
-          error.responseJson = json;
+          error = new Error(err.message || String(err));
+          error.response = err.response;
+          error.responseJson = err.response;
+
+          const message = `${method.toUpperCase()} ${uri} responded with ${err.statusCode}`;
+          debug(message);
+
           throw error;
         }
-
-        return json;
-      });
+      );
   }
 
-  return promise;
+  return requestPromise;
 }