diff --git a/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache index a3d501dd80d..d33a206803f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache @@ -62,10 +62,12 @@ export class {{classname}} { protected basePath = '{{{basePath}}}'; public defaultHeaders: Record = {}; public configuration = new Configuration(); + protected httpClient: HttpService; - constructor(protected httpClient: HttpService, @Optional() configuration: Configuration) { + constructor(httpClient: HttpService, @Optional() configuration: Configuration) { this.configuration = configuration || this.configuration; this.basePath = configuration?.basePath || this.basePath; + this.httpClient = configuration?.httpClient || httpClient; } /** diff --git a/modules/openapi-generator/src/main/resources/typescript-nestjs/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-nestjs/configuration.mustache index 1ee763ae549..5db77aed725 100644 --- a/modules/openapi-generator/src/main/resources/typescript-nestjs/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-nestjs/configuration.mustache @@ -1,3 +1,4 @@ +import type { HttpService } from '@nestjs/axios'; import { ModuleMetadata, Type } from '@nestjs/common/interfaces'; export interface ConfigurationParameters { @@ -7,6 +8,7 @@ export interface ConfigurationParameters { accessToken?: string | Promise | (() => string | Promise); basePath?: string; withCredentials?: boolean; + httpClient?: HttpService; } export class Configuration { @@ -16,6 +18,7 @@ export class Configuration { accessToken?: string | Promise | (() => string | Promise); basePath?: string; withCredentials?: boolean; + httpClient?: HttpService; constructor(configurationParameters: ConfigurationParameters = {}) { this.apiKeys = configurationParameters.apiKeys; @@ -24,6 +27,7 @@ export class Configuration { this.accessToken = configurationParameters.accessToken; this.basePath = configurationParameters.basePath; this.withCredentials = configurationParameters.withCredentials; + this.httpClient = configurationParameters.httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts index fc179af6e23..1f0ae5010da 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts @@ -26,10 +26,12 @@ export class PetService { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders: Record = {}; public configuration = new Configuration(); + protected httpClient: HttpService; - constructor(protected httpClient: HttpService, @Optional() configuration: Configuration) { + constructor(httpClient: HttpService, @Optional() configuration: Configuration) { this.configuration = configuration || this.configuration; this.basePath = configuration?.basePath || this.basePath; + this.httpClient = configuration?.httpClient || httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts index 3c45cde1c26..94297bee306 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts @@ -25,10 +25,12 @@ export class StoreService { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders: Record = {}; public configuration = new Configuration(); + protected httpClient: HttpService; - constructor(protected httpClient: HttpService, @Optional() configuration: Configuration) { + constructor(httpClient: HttpService, @Optional() configuration: Configuration) { this.configuration = configuration || this.configuration; this.basePath = configuration?.basePath || this.basePath; + this.httpClient = configuration?.httpClient || httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/user.service.ts index 5ab42497f8f..ab3450300f7 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/user.service.ts @@ -25,10 +25,12 @@ export class UserService { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders: Record = {}; public configuration = new Configuration(); + protected httpClient: HttpService; - constructor(protected httpClient: HttpService, @Optional() configuration: Configuration) { + constructor(httpClient: HttpService, @Optional() configuration: Configuration) { this.configuration = configuration || this.configuration; this.basePath = configuration?.basePath || this.basePath; + this.httpClient = configuration?.httpClient || httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/configuration.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/configuration.ts index 1ee763ae549..5db77aed725 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/configuration.ts +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/configuration.ts @@ -1,3 +1,4 @@ +import type { HttpService } from '@nestjs/axios'; import { ModuleMetadata, Type } from '@nestjs/common/interfaces'; export interface ConfigurationParameters { @@ -7,6 +8,7 @@ export interface ConfigurationParameters { accessToken?: string | Promise | (() => string | Promise); basePath?: string; withCredentials?: boolean; + httpClient?: HttpService; } export class Configuration { @@ -16,6 +18,7 @@ export class Configuration { accessToken?: string | Promise | (() => string | Promise); basePath?: string; withCredentials?: boolean; + httpClient?: HttpService; constructor(configurationParameters: ConfigurationParameters = {}) { this.apiKeys = configurationParameters.apiKeys; @@ -24,6 +27,7 @@ export class Configuration { this.accessToken = configurationParameters.accessToken; this.basePath = configurationParameters.basePath; this.withCredentials = configurationParameters.withCredentials; + this.httpClient = configurationParameters.httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts index 8adce2ebe57..5f68577397a 100644 --- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts @@ -27,10 +27,12 @@ export class PetService { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders: Record = {}; public configuration = new Configuration(); + protected httpClient: HttpService; - constructor(protected httpClient: HttpService, @Optional() configuration: Configuration) { + constructor(httpClient: HttpService, @Optional() configuration: Configuration) { this.configuration = configuration || this.configuration; this.basePath = configuration?.basePath || this.basePath; + this.httpClient = configuration?.httpClient || httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts index 93bfd113ba8..72e0006fcb7 100644 --- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts +++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts @@ -26,10 +26,12 @@ export class StoreService { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders: Record = {}; public configuration = new Configuration(); + protected httpClient: HttpService; - constructor(protected httpClient: HttpService, @Optional() configuration: Configuration) { + constructor(httpClient: HttpService, @Optional() configuration: Configuration) { this.configuration = configuration || this.configuration; this.basePath = configuration?.basePath || this.basePath; + this.httpClient = configuration?.httpClient || httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/user.service.ts index dcbfddd4fa0..d55838c23a1 100644 --- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/user.service.ts +++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/user.service.ts @@ -26,10 +26,12 @@ export class UserService { protected basePath = 'http://petstore.swagger.io/v2'; public defaultHeaders: Record = {}; public configuration = new Configuration(); + protected httpClient: HttpService; - constructor(protected httpClient: HttpService, @Optional() configuration: Configuration) { + constructor(httpClient: HttpService, @Optional() configuration: Configuration) { this.configuration = configuration || this.configuration; this.basePath = configuration?.basePath || this.basePath; + this.httpClient = configuration?.httpClient || httpClient; } /** diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/configuration.ts b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/configuration.ts index 1ee763ae549..5db77aed725 100644 --- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/configuration.ts +++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/configuration.ts @@ -1,3 +1,4 @@ +import type { HttpService } from '@nestjs/axios'; import { ModuleMetadata, Type } from '@nestjs/common/interfaces'; export interface ConfigurationParameters { @@ -7,6 +8,7 @@ export interface ConfigurationParameters { accessToken?: string | Promise | (() => string | Promise); basePath?: string; withCredentials?: boolean; + httpClient?: HttpService; } export class Configuration { @@ -16,6 +18,7 @@ export class Configuration { accessToken?: string | Promise | (() => string | Promise); basePath?: string; withCredentials?: boolean; + httpClient?: HttpService; constructor(configurationParameters: ConfigurationParameters = {}) { this.apiKeys = configurationParameters.apiKeys; @@ -24,6 +27,7 @@ export class Configuration { this.accessToken = configurationParameters.accessToken; this.basePath = configurationParameters.basePath; this.withCredentials = configurationParameters.withCredentials; + this.httpClient = configurationParameters.httpClient; } /**