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]>

Author: js2me

CHANGELOG.md

@@ -1,6 +1,9 @@
 # next release  
 
+# 6.4.1  
 
+Fixes:  
+- Bug with axios headers (thanks @mutoe)  
 
 # 6.4.0  
 

package-lock.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",

package.json

@@ -53,7 +53,7 @@ export class HttpClient<SecurityDataType = unknown> {
             ...params1,
             ...(params2 || {}),
             headers: {
-                ...this.instance.defaults,
+                ...(this.instance.defaults.headers || {}),
                 ...(params1.headers || {}),
                 ...((params2 && params2.headers) || {}),
             },

templates/base/http-clients/axios-http-client.eta

@@ -1497,7 +1497,7 @@ export class HttpClient<SecurityDataType = unknown> {
       ...params1,
       ...(params2 || {}),
       headers: {
-        ...this.instance.defaults,
+        ...(this.instance.defaults.headers || {}),
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },

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) || {}),
       },

tests/spec/axiosSingleHttpClient/schema.ts

@@ -46,7 +46,7 @@ export class HttpClient {
       ...params1,
       ...(params2 || {}),
       headers: {
-        ...this.instance.defaults,
+        ...(this.instance.defaults.headers || {}),
         ...(params1.headers || {}),
         ...((params2 && params2.headers) || {}),
       },