added cookie xhr2

web3 · Jun 27, 2018 · f98fe14 · f98fe14
1 parent c0e727e
commit f98fe14
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 15 deletions.
diff --git a/packages/web3-providers-http/package-lock.json b/packages/web3-providers-http/package-lock.json
diff --git a/packages/web3-providers-http/package.json b/packages/web3-providers-http/package.json
@@ -8,6 +8,6 @@
  "main": "src/index.js",
  "dependencies": {
  "web3-core-helpers": "1.0.0-beta.34",
- "xhr2": "0.1.4"
+ "xhr2-cookies": "1.1.0"
  }
 }
diff --git a/packages/web3-providers-http/src/index.js b/packages/web3-providers-http/src/index.js
@@ -23,7 +23,7 @@
  */
 
 var errors = require('web3-core-helpers').errors;
-var XHR2 = require('xhr2'); // jshint ignore: line
+var XHR2 = require('xhr2-cookies').XMLHttpRequest // jshint ignore: line
 
 /**
  * HttpProvider should be used to send rpc calls over http
@@ -42,6 +42,7 @@ HttpProvider.prototype._prepareRequest = function(){
  request.open('POST', this.host, true);
  request.setRequestHeader('Content-Type','application/json');
  request.timeout = this.timeout && this.timeout !== 1 ? this.timeout : 0;
+ request.withCredentials = true;
 
  if(this.headers) {
  this.headers.forEach(function(header) {
@@ -63,7 +64,6 @@ HttpProvider.prototype.send = function (payload, callback) {
  var _this = this;
  var request = this._prepareRequest();
 
-
  request.onreadystatechange = function() {
  if (request.readyState === 4 && request.timeout !== 1) {
  var result = request.responseText;

diff --git a/packages/web3-providers-ws/package-lock.json b/packages/web3-providers-ws/package-lock.json
diff --git a/test/helpers/FakeXHR2.js b/test/helpers/FakeXHR2.js
@@ -33,4 +33,4 @@ FakeXHR2.prototype.send = function (payload) {
  }
 };
 
-module.exports = FakeXHR2;
+module.exports = {XMLHttpRequest: FakeXHR2};
diff --git a/test/httpprovider.js b/test/httpprovider.js
@@ -5,7 +5,7 @@ var SandboxedModule = require('sandboxed-module');
 SandboxedModule.registerBuiltInSourceTransformer('istanbul');
 var HttpProvider = SandboxedModule.require('../packages/web3-providers-http', {
  requires: {
- 'xhr2': require('./helpers/FakeXHR2'),
+ 'xhr2-cookies': require('./helpers/FakeXHR2'),
  // 'xmlhttprequest': require('./helpers/FakeXMLHttpRequest')
  },
  singleOnly: true