Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move transform response logic from adapters to dispatcher
  • Loading branch information
mzabriskie committed Jun 23, 2016
1 parent e833a2f commit 10eb238
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
10 changes: 3 additions & 7 deletions lib/adapters/README.md
Expand Up @@ -6,23 +6,18 @@ The modules under `adapters/` are modules that handle dispatching a request and

```js
var settle = require('./../core/settle');
var transformData = require('./../core/transformData');

module.exports myAdapter(resolve, reject, config) {
// At this point:
// - config has been merged with defaults
// - request transformers have already run
// - request interceptors have already run

// Make the request using config provided/
// Make the request using config provided
// Upon response settle the Promise

var response = {
data: transformData(
responseData,
responseHeaders,
config.transformResponse
),
data: responseData,
status: request.status,
statusText: request.statusText,
headers: responseHeaders,
Expand All @@ -33,6 +28,7 @@ module.exports myAdapter(resolve, reject, config) {
settle(resolve, reject, response);

// From here:
// - response transformers will run
// - response interceptors will run
}
```
5 changes: 3 additions & 2 deletions lib/adapters/http.js
Expand Up @@ -2,7 +2,6 @@

var utils = require('./../utils');
var settle = require('./../core/settle');
var transformData = require('./../core/transformData');
var buildURL = require('./../helpers/buildURL');
var http = require('http');
var https = require('https');
Expand Down Expand Up @@ -117,6 +116,7 @@ module.exports = function httpAdapter(resolve, reject, config) {
config: config,
request: req
};

if (config.responseType === 'stream') {
response.data = stream;
settle(resolve, reject, response);
Expand All @@ -141,7 +141,8 @@ module.exports = function httpAdapter(resolve, reject, config) {
if (config.responseType !== 'arraybuffer') {
responseData = responseData.toString('utf8');
}
response.data = transformData(responseData, res.headers, config.transformResponse);

response.data = responseData;
settle(resolve, reject, response);
});
}
Expand Down
12 changes: 5 additions & 7 deletions lib/adapters/xhr.js
Expand Up @@ -2,7 +2,6 @@

var utils = require('./../utils');
var settle = require('./../core/settle');
var transformData = require('./../core/transformData');
var buildURL = require('./../helpers/buildURL');
var parseHeaders = require('./../helpers/parseHeaders');
var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
Expand All @@ -24,7 +23,10 @@ module.exports = function xhrAdapter(resolve, reject, config) {
// For IE 8/9 CORS support
// Only supports POST and GET calls and doesn't returns the response headers.
// DON'T do this for testing b/c XMLHttpRequest is mocked, not XDomainRequest.
if (process.env.NODE_ENV !== 'test' && typeof window !== 'undefined' && window.XDomainRequest && !('withCredentials' in request) && !isURLSameOrigin(config.url)) {
if (process.env.NODE_ENV !== 'test' &&
typeof window !== 'undefined' &&
window.XDomainRequest && !('withCredentials' in request) &&
!isURLSameOrigin(config.url)) {
request = new window.XDomainRequest();
loadEvent = 'onload';
xDomain = true;
Expand Down Expand Up @@ -60,11 +62,7 @@ module.exports = function xhrAdapter(resolve, reject, config) {
var responseHeaders = 'getAllResponseHeaders' in request ? parseHeaders(request.getAllResponseHeaders()) : null;
var responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response;
var response = {
data: transformData(
responseData,
responseHeaders,
config.transformResponse
),
data: responseData,
// IE sends 1223 instead of 204 (https://github.com/mzabriskie/axios/issues/201)
status: request.status === 1223 ? 204 : request.status,
statusText: request.status === 1223 ? 'No Content' : request.statusText,
Expand Down
9 changes: 9 additions & 0 deletions lib/core/dispatchRequest.js
Expand Up @@ -56,6 +56,15 @@ module.exports = function dispatchRequest(config) {
} catch (e) {
reject(e);
}
}).then(function onFulfilled(response) {
// Transform response data
response.data = transformData(
response.data,
response.headers,
config.transformResponse
);

return response;
});
};

0 comments on commit 10eb238

Please sign in to comment.