chore: Use fetch as default for browsers instead of reqwest

okta · Mar 27, 2019 · a458ce2 · a458ce2
1 parent 076d18c
commit a458ce2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/fetch/fetchRequest.js b/fetch/fetchRequest.js
@@ -33,8 +33,8 @@ function fetchRequest(method, url, args) {
       }
       return result;
     };
-    if (response.headers.get('Accept') &&
-        response.headers.get('Accept').toLowerCase().indexOf('application/json') >= 0) {
+    if (response.headers.get('Content-Type') &&
+        response.headers.get('Content-Type').toLowerCase().indexOf('application/json') >= 0) {
       return response.json().then(respHandler);
     } else {
       return response.text().then(respHandler);

diff --git a/fetch/index.js b/fetch/index.js
diff --git a/lib/browser/browserIndex.js b/lib/browser/browserIndex.js
@@ -11,5 +11,7 @@
  *
  */
 
-// This exists to use reqwest for http requests by default when library used on browser
-module.exports = require('../../reqwest');
+var fetchRequest = require('../../fetch/fetchRequest');
+var storageUtil = require('./browserStorage');
+
+module.exports = require('./browser')(storageUtil, fetchRequest);
diff --git a/lib/server/serverIndex.js b/lib/server/serverIndex.js
@@ -11,5 +11,7 @@
  *
  */
 
-// This exists to use fetch for http requests by default when library used on server side
-module.exports = require('../../fetch');
+var fetchRequest = require('../../fetch/fetchRequest');
+var storageUtil = require('./serverStorage');
+
+module.exports = require('./server')(storageUtil, fetchRequest);