Skip to content

Commit a3aa199

Browse files
sahanatroamsahanatroam
authored
feat(config): pull the basePath from config is exists (#8078)
* feat(config): pull the basePath from config if the basePath doesn't exist * chore: update samples * chore: use the basePath from the base class * chore: update all the samples
1 parent cbe1fd9 commit a3aa199

File tree

11 files changed

+144
-144
lines changed

11 files changed

+144
-144
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ export const {{classname}}Fp = function(configuration?: Configuration) {
241241
*/
242242
async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>> {
243243
const localVarAxiosArgs = await {{classname}}AxiosParamCreator(configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
244-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
244+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
245245
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
246246
return axios.request(axiosRequestArgs);
247247
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ export const DefaultApiFp = function(configuration?: Configuration) {
342342
*/
343343
async filePost(inlineObject?: InlineObject, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
344344
const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).filePost(inlineObject, options);
345-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
345+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
346346
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
347347
return axios.request(axiosRequestArgs);
348348
};
@@ -355,7 +355,7 @@ export const DefaultApiFp = function(configuration?: Configuration) {
355355
*/
356356
async petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
357357
const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).petsFilteredPatch(petByAgePetByType, options);
358-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
358+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
359359
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
360360
return axios.request(axiosRequestArgs);
361361
};
@@ -368,7 +368,7 @@ export const DefaultApiFp = function(configuration?: Configuration) {
368368
*/
369369
async petsPatch(catDog?: Cat | Dog, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
370370
const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).petsPatch(catDog, options);
371-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
371+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
372372
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
373373
return axios.request(axiosRequestArgs);
374374
};

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ export const PetApiFp = function(configuration?: Configuration) {
740740
*/
741741
async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
742742
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options);
743-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
743+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
744744
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
745745
return axios.request(axiosRequestArgs);
746746
};
@@ -755,7 +755,7 @@ export const PetApiFp = function(configuration?: Configuration) {
755755
*/
756756
async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
757757
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options);
758-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
758+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
759759
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
760760
return axios.request(axiosRequestArgs);
761761
};
@@ -769,7 +769,7 @@ export const PetApiFp = function(configuration?: Configuration) {
769769
*/
770770
async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Pet>>> {
771771
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options);
772-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
772+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
773773
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
774774
return axios.request(axiosRequestArgs);
775775
};
@@ -783,7 +783,7 @@ export const PetApiFp = function(configuration?: Configuration) {
783783
*/
784784
async findPetsByTags(tags: Array<string>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Pet>>> {
785785
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options);
786-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
786+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
787787
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
788788
return axios.request(axiosRequestArgs);
789789
};
@@ -797,7 +797,7 @@ export const PetApiFp = function(configuration?: Configuration) {
797797
*/
798798
async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Pet>> {
799799
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options);
800-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
800+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
801801
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
802802
return axios.request(axiosRequestArgs);
803803
};
@@ -811,7 +811,7 @@ export const PetApiFp = function(configuration?: Configuration) {
811811
*/
812812
async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
813813
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options);
814-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
814+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
815815
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
816816
return axios.request(axiosRequestArgs);
817817
};
@@ -827,7 +827,7 @@ export const PetApiFp = function(configuration?: Configuration) {
827827
*/
828828
async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
829829
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options);
830-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
830+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
831831
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
832832
return axios.request(axiosRequestArgs);
833833
};
@@ -843,7 +843,7 @@ export const PetApiFp = function(configuration?: Configuration) {
843843
*/
844844
async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ApiResponse>> {
845845
const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options);
846-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
846+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
847847
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
848848
return axios.request(axiosRequestArgs);
849849
};
@@ -1261,7 +1261,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
12611261
*/
12621262
async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
12631263
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options);
1264-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1264+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
12651265
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
12661266
return axios.request(axiosRequestArgs);
12671267
};
@@ -1274,7 +1274,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
12741274
*/
12751275
async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> {
12761276
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options);
1277-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1277+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
12781278
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
12791279
return axios.request(axiosRequestArgs);
12801280
};
@@ -1288,7 +1288,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
12881288
*/
12891289
async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order>> {
12901290
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options);
1291-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1291+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
12921292
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
12931293
return axios.request(axiosRequestArgs);
12941294
};
@@ -1302,7 +1302,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
13021302
*/
13031303
async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order>> {
13041304
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options);
1305-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1305+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
13061306
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
13071307
return axios.request(axiosRequestArgs);
13081308
};
@@ -1826,7 +1826,7 @@ export const UserApiFp = function(configuration?: Configuration) {
18261826
*/
18271827
async createUser(body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
18281828
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(body, options);
1829-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1829+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
18301830
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
18311831
return axios.request(axiosRequestArgs);
18321832
};
@@ -1840,7 +1840,7 @@ export const UserApiFp = function(configuration?: Configuration) {
18401840
*/
18411841
async createUsersWithArrayInput(body: Array<User>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
18421842
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(body, options);
1843-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1843+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
18441844
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
18451845
return axios.request(axiosRequestArgs);
18461846
};
@@ -1854,7 +1854,7 @@ export const UserApiFp = function(configuration?: Configuration) {
18541854
*/
18551855
async createUsersWithListInput(body: Array<User>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
18561856
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(body, options);
1857-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1857+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
18581858
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
18591859
return axios.request(axiosRequestArgs);
18601860
};
@@ -1868,7 +1868,7 @@ export const UserApiFp = function(configuration?: Configuration) {
18681868
*/
18691869
async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
18701870
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options);
1871-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1871+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
18721872
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
18731873
return axios.request(axiosRequestArgs);
18741874
};
@@ -1882,7 +1882,7 @@ export const UserApiFp = function(configuration?: Configuration) {
18821882
*/
18831883
async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
18841884
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options);
1885-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1885+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
18861886
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
18871887
return axios.request(axiosRequestArgs);
18881888
};
@@ -1897,7 +1897,7 @@ export const UserApiFp = function(configuration?: Configuration) {
18971897
*/
18981898
async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
18991899
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options);
1900-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1900+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
19011901
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
19021902
return axios.request(axiosRequestArgs);
19031903
};
@@ -1910,7 +1910,7 @@ export const UserApiFp = function(configuration?: Configuration) {
19101910
*/
19111911
async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
19121912
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options);
1913-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1913+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
19141914
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
19151915
return axios.request(axiosRequestArgs);
19161916
};
@@ -1925,7 +1925,7 @@ export const UserApiFp = function(configuration?: Configuration) {
19251925
*/
19261926
async updateUser(username: string, body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
19271927
const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, body, options);
1928-
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
1928+
return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => {
19291929
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
19301930
return axios.request(axiosRequestArgs);
19311931
};

0 commit comments

Comments
 (0)