Skip to content

Commit e40d36f

Browse files
committed
fix: problem with missing default params for axios http client (issue #192, thanks @Nihisil); docs: update CHANGELOG
1 parent b0e0fd9 commit e40d36f

File tree

5 files changed

+14
-0
lines changed

5 files changed

+14
-0
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# next release
22

3+
# 6.2.1
4+
5+
Fixes:
6+
- missing `generateUnionEnums?: boolean;` in `index.d.ts` file (thanks @artsaban)
7+
- missing default params to axios http client (`--axios`) (issue #192, thanks @Nihisil)
8+
39
# 6.2.0
410

511
Features:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ export class HttpClient<SecurityDataType = unknown> {
4949

5050
private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
5151
return {
52+
...this.instance.defaults,
5253
...params1,
5354
...(params2 || {}),
5455
headers: {
56+
...this.instance.defaults,
5557
...(params1.headers || {}),
5658
...((params2 && params2.headers) || {}),
5759
},

tests/spec/axios/schema.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,9 +1483,11 @@ export class HttpClient<SecurityDataType = unknown> {
14831483

14841484
private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
14851485
return {
1486+
...this.instance.defaults,
14861487
...params1,
14871488
...(params2 || {}),
14881489
headers: {
1490+
...this.instance.defaults,
14891491
...(params1.headers || {}),
14901492
...((params2 && params2.headers) || {}),
14911493
},

tests/spec/axiosSingleHttpClient/schema.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,9 +1483,11 @@ export class HttpClient<SecurityDataType = unknown> {
14831483

14841484
private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
14851485
return {
1486+
...this.instance.defaults,
14861487
...params1,
14871488
...(params2 || {}),
14881489
headers: {
1490+
...this.instance.defaults,
14891491
...(params1.headers || {}),
14901492
...((params2 && params2.headers) || {}),
14911493
},

tests/spec/jsAxios/schema.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ export class HttpClient {
4242
}
4343
mergeRequestParams(params1, params2) {
4444
return {
45+
...this.instance.defaults,
4546
...params1,
4647
...(params2 || {}),
4748
headers: {
49+
...this.instance.defaults,
4850
...(params1.headers || {}),
4951
...((params2 && params2.headers) || {}),
5052
},

0 commit comments

Comments
 (0)