Release 6.4.1 (bugfix) (#204)

* fix(template): axios merge request headers issue (#202) * bump: up version to 6.4.1 Co-authored-by: Dongsen <[email protected]>
acacode · Mar 7, 2021 · 8354a4f · 8354a4f
1 parent d86aca2
commit 8354a4f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # next release  
 
+# 6.4.1  
 
+Fixes:  
+- Bug with axios headers (thanks @mutoe)  
 
 # 6.4.0  
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "Generate typescript/javascript api from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",

diff --git a/templates/base/http-clients/axios-http-client.eta b/templates/base/http-clients/axios-http-client.eta
@@ -53,7 +53,7 @@ export class HttpClient<SecurityDataType = unknown> {
             ...params1,
             ...(params2 || {}),
             headers: {
-                ...this.instance.defaults,
+                ...(this.instance.defaults.headers || {}),
                 ...(params1.headers || {}),
                 ...((params2 && params2.headers) || {}),
             },

diff --git a/tests/spec/axios/schema.ts b/tests/spec/axios/schema.ts
@@ -1497,7 +1497,7 @@ export class HttpClient<SecurityDataType = unknown> {
       ...params1,
       ...(params2 || {}),
       headers: {
-        ...this.instance.defaults,
+        ...(this.instance.defaults.headers || {}),
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },

diff --git a/tests/spec/axiosSingleHttpClient/schema.ts b/tests/spec/axiosSingleHttpClient/schema.ts
@@ -1497,7 +1497,7 @@ export class HttpClient<SecurityDataType = unknown> {
       ...params1,
       ...(params2 || {}),
       headers: {
-        ...this.instance.defaults,
+        ...(this.instance.defaults.headers || {}),
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },

diff --git a/tests/spec/jsAxios/schema.js b/tests/spec/jsAxios/schema.js
@@ -46,7 +46,7 @@ export class HttpClient {
       ...params1,
       ...(params2 || {}),
       headers: {
-        ...this.instance.defaults,
+        ...(this.instance.defaults.headers || {}),
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },