From 255811df7060799ded43cabc4ef2bfd4520961dd Mon Sep 17 00:00:00 2001 From: arthurfiorette Date: Sat, 30 Apr 2022 22:27:27 -0300 Subject: [PATCH 1/3] changes --- lib/adapters/http.js | 2 +- lib/adapters/xhr.js | 2 +- lib/cancel/CanceledError.js | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/adapters/http.js b/lib/adapters/http.js index 04a9aacf84..74a7f63420 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 && cancel.type) ? new CanceledError() : cancel); + reject(!cancel || (cancel && cancel.type) ? new CanceledError(null, config) : cancel); }; config.cancelToken && config.cancelToken.subscribe(onCanceled); diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 76d7e7ac1d..2102e2b9eb 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 && cancel.type) ? new CanceledError() : cancel); + reject(!cancel || (cancel && cancel.type) ? new CanceledError(null, config) : cancel); request.abort(); request = null; }; diff --git a/lib/cancel/CanceledError.js b/lib/cancel/CanceledError.js index b7ceb02567..a44e789ae8 100644 --- a/lib/cancel/CanceledError.js +++ b/lib/cancel/CanceledError.js @@ -8,10 +8,11 @@ var utils = require('../utils'); * * @class * @param {string=} message The message. + * @param {any=} config The config. */ -function CanceledError(message) { - // eslint-disable-next-line no-eq-null,eqeqeq - AxiosError.call(this, message == null ? 'canceled' : message, AxiosError.ERR_CANCELED); +function CanceledError(message, config) { + // eslint-disable-next-line no-eq-null + AxiosError.call(this, message == null ? 'canceled' : message, AxiosError.ERR_CANCELED, config); this.name = 'CanceledError'; } From 8aadf8d3689c3012a24a37024a8e5d7249e45b7d Mon Sep 17 00:00:00 2001 From: arthurfiorette Date: Sat, 30 Apr 2022 22:33:22 -0300 Subject: [PATCH 2/3] also include request --- lib/adapters/http.js | 2 +- lib/adapters/xhr.js | 2 +- lib/cancel/CanceledError.js | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/adapters/http.js b/lib/adapters/http.js index 74a7f63420..36084fbccc 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 && cancel.type) ? new CanceledError(null, config) : cancel); + reject(!cancel || (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 2102e2b9eb..9c423607d6 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 && cancel.type) ? new CanceledError(null, config) : cancel); + reject(!cancel || (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 a44e789ae8..f32e6451be 100644 --- a/lib/cancel/CanceledError.js +++ b/lib/cancel/CanceledError.js @@ -8,11 +8,12 @@ var utils = require('../utils'); * * @class * @param {string=} message The message. - * @param {any=} config The config. + * @param {Object=} config The config. + * @param {Object=} request The request. */ -function CanceledError(message, config) { +function CanceledError(message, config, request) { // eslint-disable-next-line no-eq-null - AxiosError.call(this, message == null ? 'canceled' : message, AxiosError.ERR_CANCELED, config); + AxiosError.call(this, message == null ? 'canceled' : message, AxiosError.ERR_CANCELED, config, request); this.name = 'CanceledError'; } From 668beca628f98ff3a065dcc4afffed53ecbd9a73 Mon Sep 17 00:00:00 2001 From: arthurfiorette Date: Tue, 3 May 2022 15:28:55 -0300 Subject: [PATCH 3/3] revert comment --- lib/cancel/CanceledError.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cancel/CanceledError.js b/lib/cancel/CanceledError.js index f32e6451be..1bac50e8d3 100644 --- a/lib/cancel/CanceledError.js +++ b/lib/cancel/CanceledError.js @@ -12,7 +12,7 @@ var utils = require('../utils'); * @param {Object=} request The request. */ function CanceledError(message, config, request) { - // eslint-disable-next-line no-eq-null + // eslint-disable-next-line no-eq-null,eqeqeq AxiosError.call(this, message == null ? 'canceled' : message, AxiosError.ERR_CANCELED, config, request); this.name = 'CanceledError'; }