Skip to content

fix: use config basePath instead of the class context basePath #8186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macjohnny merged 3 commits into from
Dec 15, 2020
Merged

fix: use config basePath instead of the class context basePath #8186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f43ac4
fix: use config basePath instead of the class context basePath
sahanatroam Dec 14, 2020
5963b7e
chore: build samples
sahanatroam Dec 15, 2020
7892886
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
sahanatroam Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@ export const {{classname}}Fp = function(configuration?: Configuration) {
*/
async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>> {
const localVarAxiosArgs = await {{classname}}AxiosParamCreator(configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ export const DefaultApiFp = function(configuration?: Configuration) {
*/
async filePost(inlineObject?: InlineObject, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).filePost(inlineObject, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -355,8 +355,8 @@ export const DefaultApiFp = function(configuration?: Configuration) {
*/
async petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).petsFilteredPatch(petByAgePetByType, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -368,8 +368,8 @@ export const DefaultApiFp = function(configuration?: Configuration) {
*/
async petsPatch(catDog?: Cat | Dog, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).petsPatch(catDog, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand Down
80 changes: 40 additions & 40 deletions samples/client/petstore/typescript-axios/builds/default/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions samples/client/petstore/typescript-axios/builds/es6-target/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions ...pt-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -531,8 +531,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -545,8 +545,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Pet>>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -559,8 +559,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async findPetsByTags(tags: Array<string>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Pet>>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -573,8 +573,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Pet>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -587,8 +587,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -603,8 +603,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -619,8 +619,8 @@ export const PetApiFp = function(configuration?: Configuration) {
*/
async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ApiResponse>> {
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand Down
16 changes: 8 additions & 8 deletions ...-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
*/
async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -239,8 +239,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
*/
async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -253,8 +253,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
*/
async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand All @@ -267,8 +267,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
*/
async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
Expand Down
Loading