From c25461e9c6491ca0096032b22e22624096de8d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BA=D0=BE=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=9A=D1=80=D0=B8=D1=81=D1=82=D0=B8=D0=B0=D0=BD=20?= =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?= Date: Thu, 20 Oct 2022 16:27:20 +0300 Subject: [PATCH] fix axios config headers --- lib/core/Axios.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/core/Axios.js b/lib/core/Axios.js index 31f8b531dc..f18b154fc9 100644 --- a/lib/core/Axios.js +++ b/lib/core/Axios.js @@ -68,19 +68,21 @@ class Axios { config.method = (config.method || this.defaults.method || 'get').toLowerCase(); // Flatten headers - const defaultHeaders = config.headers && utils.merge( - config.headers.common, - config.headers[config.method] - ); - - defaultHeaders && utils.forEach( - ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'], - function cleanHeaderConfig(method) { - delete config.headers[method]; - } - ); - - config.headers = new AxiosHeaders(config.headers, defaultHeaders); + if (!(config.headers instanceof AxiosHeaders)) { + const defaultHeaders = config.headers && utils.merge( + config.headers.common, + config.headers[config.method] + ); + + defaultHeaders && utils.forEach( + ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'], + function cleanHeaderConfig(method) { + delete config.headers[method]; + } + ); + + config.headers = new AxiosHeaders(config.headers, defaultHeaders); + } // filter out skipped interceptors const requestInterceptorChain = [];