Skip to content

Commit 4eb8ef1

Browse files
ckoegeltimon-sbr
ckoegel
authored and
timon-sbr
committed
[typescript-axios] Add User-Agent Header to Default Axios (OpenAPITools#20067)
* [typescript-axios] Add User-Agent Header to Default Axios * fix if `npmVersion` doesn't exist * generate samples * single line solution * move user agent header to config * generate samples * splat for headers as well * samples * move headers above baseOptions * samples * commas are hard * samples again
1 parent 6386e88 commit 4eb8ef1

File tree

16 files changed

+112
-16
lines changed

16 files changed

+112
-16
lines changed

‎modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@ export class Configuration {
7878
this.accessToken = param.accessToken;
7979
this.basePath = param.basePath;
8080
this.serverIndex = param.serverIndex;
81-
this.baseOptions = param.baseOptions;
81+
this.baseOptions = {
82+
headers: {
83+
...param.baseOptions?.headers,
84+
'User-Agent': "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios"
85+
},
86+
...param.baseOptions
87+
};
8288
this.formDataCtor = param.formDataCtor;
8389
}
8490

‎samples/client/echo_api/typescript-axios/build/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/default/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

‎samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ export class Configuration {
8989
this.accessToken = param.accessToken;
9090
this.basePath = param.basePath;
9191
this.serverIndex = param.serverIndex;
92-
this.baseOptions = param.baseOptions;
92+
this.baseOptions = {
93+
headers: {
94+
...param.baseOptions?.headers,
95+
'User-Agent': "OpenAPI-Generator/typescript-axios"
96+
},
97+
...param.baseOptions
98+
};
9399
this.formDataCtor = param.formDataCtor;
94100
}
95101

0 commit comments

Comments
 (0)