mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-23 20:40:40 +03:00
Code Activity

Modify createError and enhanceError functions to accept response as parameter

Browse Source
This commit is contained in:
Nick Uraltsev
2016-06-13 18:58:55 -07:00
parent 91dae3c4ad
commit 6f2186d863
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/createError.js
+5 -4
View File
@@ -3,14 +3,15 @@
var enhanceError = require('./enhanceError'); var enhanceError = require('./enhanceError');
/** /**
* Create an Error with the specified message, config, and optional error code. * Create an Error with the specified message, config, error code, and response.
* *
* @param {string} message The error message. * @param {string} message The error message.
* @param {Object} config The config object. * @param {Object} config The config.
* @param {string} [code] The error code (for example, 'ECONNABORTED'). * @param {string} [code] The error code (for example, 'ECONNABORTED').
@ @param {Object} [response] The response.
* @returns {Error} The created error. * @returns {Error} The created error.
*/ */
module.exports = function createError(message, config, code) { module.exports = function createError(message, config, code, response) {
var error = new Error(message); var error = new Error(message);
return enhanceError(error, config, code); return enhanceError(error, config, code, response);
}; };
lib/core/enhanceError.js
+5 -3
View File
@@ -1,17 +1,19 @@
'use strict'; 'use strict';
/** /**
* Update an Error with the specified config and optional error code. * Update an Error with the specified config, error code, and response.
* *
* @param {Error} error The error to update. * @param {Error} error The error to update.
* @param {Object} config The config object. * @param {Object} config The config.
* @param {string} [code] The error code (for example, 'ECONNABORTED'). * @param {string} [code] The error code (for example, 'ECONNABORTED').
@ @param {Object} [response] The response.
* @returns {Error} The error. * @returns {Error} The error.
*/ */
module.exports = function enhanceError(error, config, code) { module.exports = function enhanceError(error, config, code, response) {
error.config = config; error.config = config;
if (code) { if (code) {
error.code = code; error.code = code;
} }
error.response = response;
return error; return error;
}; };
lib/core/settle.js
+6 -3
View File
@@ -15,8 +15,11 @@ module.exports = function settle(resolve, reject, response) {
if (!response.status || !validateStatus || validateStatus(response.status)) { if (!response.status || !validateStatus || validateStatus(response.status)) {
resolve(response); resolve(response);
} else { } else {
var error = createError('Request failed with status code ' + response.status, response.config); reject(createError(
error.response = response; 'Request failed with status code ' + response.status,
reject(error); response.config,
null,
response
));
} }
}; };