From ff1e5cd6c2388059f895511ad2a24ac1dbbbb8bf Mon Sep 17 00:00:00 2001 From: Arthur Fiorette Date: Tue, 3 May 2022 15:33:38 -0300 Subject: [PATCH] Include request and config when creating a `CanceledError`. (#4659) * changes * also include request * revert comment Co-authored-by: Jay --- lib/adapters/http.js | 2 +- lib/adapters/xhr.js | 2 +- lib/cancel/CanceledError.js | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/adapters/http.js b/lib/adapters/http.js index 3740bceff7..8384f34ea7 100755 --- a/lib/adapters/http.js +++ b/lib/adapters/http.js @@ -402,7 +402,7 @@ module.exports = function httpAdapter(config) { if (req.aborted) return; 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); diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 16e6683d10..337b7a015a 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -193,7 +193,7 @@ module.exports = function xhrAdapter(config) { if (!request) { return; } - reject(!cancel || cancel.type ? new CanceledError() : cancel); + reject(!cancel || cancel.type ? new CanceledError(null, config, req) : cancel); request.abort(); request = null; }; diff --git a/lib/cancel/CanceledError.js b/lib/cancel/CanceledError.js index b7ceb02567..1bac50e8d3 100644 --- a/lib/cancel/CanceledError.js +++ b/lib/cancel/CanceledError.js @@ -8,10 +8,12 @@ var utils = require('../utils'); * * @class * @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 - 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'; }