loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[typescript-axios] Conditionally set user-agent (#20571)

Browse Source 
The change in #20067 has caused some issues with clients which run in a
Browser. This commit replaces that change, leaving the default
User-Agent for axios unmodified, and only sets the User-Agent if the
`http-user-agent` parameter is provided during generation time.
This commit is contained in:
David Wittman 2025-02-03 09:00:18 -06:00 committed by GitHub
parent 5ecde555ab
commit 68e7d49456
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/configs/typescript-axios-echo-api.yaml
View File

@ -2,6 +2,7 @@ generatorName: typescript-axios
outputDir: samples/client/echo_api/typescript-axios/build
inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
templateDir: modules/openapi-generator/src/main/resources/typescript-axios
httpUserAgent: EchoApi/1.0.0
additionalProperties:
artifactId: echo-api-typescript-axios
hideGenerationTimestamp: "true"

6
modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache vendored
View File

@ -79,11 +79,13 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
{{#httpUserAgent}}
'User-Agent': "{{httpUserAgent}}",
{{/httpUserAgent}}
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

4
samples/client/echo_api/typescript-axios/build/configuration.ts
View File

@ -90,11 +90,11 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
'User-Agent': "EchoApi/1.0.0",
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

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

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/default/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

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

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

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

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

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

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}

3
samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts
View File

@ -90,11 +90,10 @@ export class Configuration {
this.basePath = param.basePath;
this.serverIndex = param.serverIndex;
this.baseOptions = {
...param.baseOptions,
headers: {
...param.baseOptions?.headers,
'User-Agent': "OpenAPI-Generator/typescript-axios"
},
...param.baseOptions
};
this.formDataCtor = param.formDataCtor;
}