File tree 5 files changed +14
-0
lines changed
templates/base/http-clients
5 files changed +14
-0
lines changed Original file line number Diff line number Diff line change 1
1
# next release
2
2
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
+
3
9
# 6.2.0
4
10
5
11
Features:
Original file line number Diff line number Diff line change @@ -49,9 +49,11 @@ export class HttpClient<SecurityDataType = unknown> {
49
49
50
50
private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
51
51
return {
52
+ ...this.instance.defaults,
52
53
...params1,
53
54
...(params2 || {}),
54
55
headers: {
56
+ ...this.instance.defaults,
55
57
...(params1.headers || {}),
56
58
...((params2 && params2.headers) || {}),
57
59
},
Original file line number Diff line number Diff line change @@ -1483,9 +1483,11 @@ export class HttpClient<SecurityDataType = unknown> {
1483
1483
1484
1484
private mergeRequestParams ( params1 : AxiosRequestConfig , params2 ?: AxiosRequestConfig ) : AxiosRequestConfig {
1485
1485
return {
1486
+ ...this . instance . defaults ,
1486
1487
...params1 ,
1487
1488
...( params2 || { } ) ,
1488
1489
headers : {
1490
+ ...this . instance . defaults ,
1489
1491
...( params1 . headers || { } ) ,
1490
1492
...( ( params2 && params2 . headers ) || { } ) ,
1491
1493
} ,
Original file line number Diff line number Diff line change @@ -1483,9 +1483,11 @@ export class HttpClient<SecurityDataType = unknown> {
1483
1483
1484
1484
private mergeRequestParams ( params1 : AxiosRequestConfig , params2 ?: AxiosRequestConfig ) : AxiosRequestConfig {
1485
1485
return {
1486
+ ...this . instance . defaults ,
1486
1487
...params1 ,
1487
1488
...( params2 || { } ) ,
1488
1489
headers : {
1490
+ ...this . instance . defaults ,
1489
1491
...( params1 . headers || { } ) ,
1490
1492
...( ( params2 && params2 . headers ) || { } ) ,
1491
1493
} ,
Original file line number Diff line number Diff line change @@ -42,9 +42,11 @@ export class HttpClient {
42
42
}
43
43
mergeRequestParams ( params1 , params2 ) {
44
44
return {
45
+ ...this . instance . defaults ,
45
46
...params1 ,
46
47
...( params2 || { } ) ,
47
48
headers : {
49
+ ...this . instance . defaults ,
48
50
...( params1 . headers || { } ) ,
49
51
...( ( params2 && params2 . headers ) || { } ) ,
50
52
} ,
You can’t perform that action at this time.
0 commit comments