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

Include request and config when creating a CanceledError. (#4659)

Browse Source 
* changes

* also include request

* revert comment

Co-authored-by: Jay <jasonsaayman@gmail.com>
This commit is contained in:
Arthur Fiorette
2022-05-03 15:33:38 -03:00
committed by GitHub
parent c07998a621
commit ff1e5cd6c2
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/http.js
+1 -1
View File
@@ -402,7 +402,7 @@ module.exports = function httpAdapter(config) {
if (req.aborted) return; if (req.aborted) return;
req.abort(); req.abort();
reject(!cancel || cancel.type ? new CanceledError() : cancel); reject(!cancel || cancel.type ? new CanceledError(null, config, req) : cancel);
}; };
config.cancelToken && config.cancelToken.subscribe(onCanceled); config.cancelToken && config.cancelToken.subscribe(onCanceled);
lib/adapters/xhr.js
+1 -1
View File
@@ -193,7 +193,7 @@ module.exports = function xhrAdapter(config) {
if (!request) { if (!request) {
return; return;
} }
reject(!cancel || cancel.type ? new CanceledError() : cancel); reject(!cancel || cancel.type ? new CanceledError(null, config, req) : cancel);
request.abort(); request.abort();
request = null; request = null;
}; };
lib/cancel/CanceledError.js
+4 -2
View File
@@ -8,10 +8,12 @@ var utils = require('../utils');
* *
* @class * @class
* @param {string=} message The message. * @param {string=} message The message.
* @param {Object=} config The config.
* @param {Object=} request The request.
*/ */
function CanceledError(message) { function CanceledError(message, config, request) {
// eslint-disable-next-line no-eq-null,eqeqeq // eslint-disable-next-line no-eq-null,eqeqeq
AxiosError.call(this, message == null ? 'canceled' : message, AxiosError.ERR_CANCELED); AxiosError.call(this, message == null ? 'canceled' : message, AxiosError.ERR_CANCELED, config, request);
this.name = 'CanceledError'; this.name = 'CanceledError';
} }