mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-17 19:21:29 +03:00
Code Activity

Making isURLSameOrigin/cookies safe to use in all envs

Browse Source
This commit is contained in:
Matt Zabriskie
2015-11-19 15:18:47 -07:00
parent affe3aaa9a
commit 3d65057d71
9 changed files with 139 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/http.js
+2 -2
View File
@@ -2,7 +2,7 @@
var defaults = require('./../defaults');
var utils = require('./../utils');
var buildUrl = require('./../helpers/buildUrl');
var buildURL = require('./../helpers/buildURL');
var transformData = require('./../helpers/transformData');
var http = require('http');
var https = require('https');
@@ -50,7 +50,7 @@ module.exports = function httpAdapter(resolve, reject, config) {
var options = {
host: parsed.hostname,
port: parsed.port,
path: buildUrl(parsed.path, config.params).replace(/^\?/, ''),
path: buildURL(parsed.path, config.params).replace(/^\?/, ''),
method: config.method,
headers: headers,
agent: config.agent
lib/adapters/xhr.js
+4 -4
View File
@@ -4,7 +4,7 @@
var defaults = require('./../defaults');
var utils = require('./../utils');
var buildUrl = require('./../helpers/buildUrl');
var buildURL = require('./../helpers/buildURL');
var parseHeaders = require('./../helpers/parseHeaders');
var transformData = require('./../helpers/transformData');
@@ -29,7 +29,7 @@ module.exports = function xhrAdapter(resolve, reject, config) {
// Create the request
var request = new (XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
request.open(config.method.toUpperCase(), buildUrl(config.url, config.params, config.paramsSerializer), true);
request.open(config.method.toUpperCase(), buildURL(config.url, config.params, config.paramsSerializer), true);
// Set the request timeout in MS
request.timeout = config.timeout;
@@ -67,10 +67,10 @@ module.exports = function xhrAdapter(resolve, reject, config) {
// Specifically not if we're in a web worker, or react-native.
if (utils.isStandardBrowserEnv()) {
var cookies = require('./../helpers/cookies');
var urlIsSameOrigin = require('./../helpers/urlIsSameOrigin');
var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
// Add xsrf header
var xsrfValue = urlIsSameOrigin(config.url) ?
var xsrfValue = isURLSameOrigin(config.url) ?
cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
undefined;