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

* changes * also include request * revert comment Co-authored-by: Jay <jasonsaayman@gmail.com>
axios · May 3, 2022 · ff1e5cd · ff1e5cd
1 parent c07998a
commit ff1e5cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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';
 }