From 29f1e49437a00d068f71e8b4b8bbd69f7f8b1066 Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Wed, 15 Sep 2021 17:58:23 +0300 Subject: [PATCH 1/9] add headers --- .../resources/typescript/api/api.mustache | 6 ++++- .../resources/typescript/http/http.mustache | 9 ++++--- .../typescript/http/servers.mustache | 25 +++++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache index 9fa8f1de5851..0e31cd56b5cd 100644 --- a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache @@ -59,7 +59,11 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { .replace('{' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}}; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.{{httpMethod}}); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.{{httpMethod}}, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") {{#queryParams}} diff --git a/modules/openapi-generator/src/main/resources/typescript/http/http.mustache b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache index fc485a7fec88..be54d5b93fab 100644 --- a/modules/openapi-generator/src/main/resources/typescript/http/http.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache @@ -57,6 +57,8 @@ export type HttpFile = {{{fileContentDataType}}} & { readonly name: string }; {{/node}} {{/platforms}} +export type Headers = { [key: string]: string } + {{#platforms}} {{#deno}} /** @@ -110,7 +112,7 @@ export type RequestBody = undefined | string | FormData | URLSearchParams; * Represents an HTTP request context */ export class RequestContext { - private headers: { [key: string]: string } = {}; + private headers: Headers = {}; private body: RequestBody = undefined; private url: URLParse; @@ -120,8 +122,9 @@ export class RequestContext { * @param url url of the requested resource * @param httpMethod http method */ - public constructor(url: string, private httpMethod: HttpMethod) { + public constructor(url: string, private httpMethod: HttpMethod, headers: Headers = {}) { this.url = new URLParse(url, true); + this.headers = headers; } /* @@ -157,7 +160,7 @@ export class RequestContext { return this.httpMethod; } - public getHeaders(): { [key: string]: string } { + public getHeaders(): Headers { return this.headers; } diff --git a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache index d2a0a254255c..614b9b077fd1 100644 --- a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache @@ -1,7 +1,10 @@ -import { RequestContext, HttpMethod } from "./http/http{{extensionForDeno}}"; +import { RequestContext, HttpMethod, Headers } from "./http/http{{extensionForDeno}}"; export interface BaseServerConfiguration { - makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + getHeaders(): Headers + makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + setHeaders(headers: Headers): any; + setHeaderParam(key: string, value: string): void } /** @@ -11,7 +14,7 @@ export interface BaseServerConfiguration { * */ export class ServerConfiguration implements BaseServerConfiguration { - public constructor(private url: string, private variableConfiguration: T) {} + public constructor(private url: string, private variableConfiguration: T, private headers: Headers = {}) {} /** * Sets the value of the variables of this server. @@ -26,6 +29,18 @@ export class ServerConfiguration implements return this.variableConfiguration } + public setHeaders(headers: Headers): void { + Object.assign(this.headers, headers); + } + + public getHeaders(): Headers { + return this.headers + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } + private getUrl() { let replacedUrl = this.url; for (const key in this.variableConfiguration) { @@ -43,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); } } From 5f26bd56fc4c4796b0a7e0055e4e94fddf1b720b Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Thu, 16 Sep 2021 11:42:12 +0300 Subject: [PATCH 2/9] add samples --- .../composed-schemas/apis/DefaultApi.ts | 18 +++++-- .../builds/composed-schemas/http/http.ts | 9 ++-- .../builds/composed-schemas/servers.ts | 25 ++++++++-- .../typescript/builds/default/apis/PetApi.ts | 48 +++++++++++++++---- .../builds/default/apis/StoreApi.ts | 24 ++++++++-- .../typescript/builds/default/apis/UserApi.ts | 48 +++++++++++++++---- .../typescript/builds/default/http/http.ts | 9 ++-- .../typescript/builds/default/servers.ts | 25 ++++++++-- .../typescript/builds/deno/apis/PetApi.ts | 48 +++++++++++++++---- .../typescript/builds/deno/apis/StoreApi.ts | 24 ++++++++-- .../typescript/builds/deno/apis/UserApi.ts | 48 +++++++++++++++---- .../typescript/builds/deno/http/http.ts | 9 ++-- .../typescript/builds/deno/servers.ts | 25 ++++++++-- .../builds/inversify/apis/PetApi.ts | 48 +++++++++++++++---- .../builds/inversify/apis/StoreApi.ts | 24 ++++++++-- .../builds/inversify/apis/UserApi.ts | 48 +++++++++++++++---- .../typescript/builds/inversify/http/http.ts | 9 ++-- .../typescript/builds/inversify/servers.ts | 25 ++++++++-- .../typescript/builds/jquery/apis/PetApi.ts | 48 +++++++++++++++---- .../typescript/builds/jquery/apis/StoreApi.ts | 24 ++++++++-- .../typescript/builds/jquery/apis/UserApi.ts | 48 +++++++++++++++---- .../typescript/builds/jquery/http/http.ts | 9 ++-- .../typescript/builds/jquery/servers.ts | 25 ++++++++-- .../builds/object_params/apis/PetApi.ts | 48 +++++++++++++++---- .../builds/object_params/apis/StoreApi.ts | 24 ++++++++-- .../builds/object_params/apis/UserApi.ts | 48 +++++++++++++++---- .../builds/object_params/http/http.ts | 9 ++-- .../builds/object_params/servers.ts | 25 ++++++++-- 28 files changed, 671 insertions(+), 151 deletions(-) diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts index 0e394cc47919..54e8d6642c92 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts @@ -29,7 +29,11 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/file'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -59,7 +63,11 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pets-filtered'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PATCH, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -89,7 +97,11 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pets'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PATCH, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts index 79a4889b9589..9244615548f5 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts @@ -25,6 +25,8 @@ export enum HttpMethod { */ export type HttpFile = Blob & { readonly name: string }; +export type Headers = { [key: string]: string } + export class HttpException extends Error { public constructor(msg: string) { @@ -41,7 +43,7 @@ export type RequestBody = undefined | string | FormData | URLSearchParams; * Represents an HTTP request context */ export class RequestContext { - private headers: { [key: string]: string } = {}; + private headers: Headers = {}; private body: RequestBody = undefined; private url: URLParse; @@ -51,8 +53,9 @@ export class RequestContext { * @param url url of the requested resource * @param httpMethod http method */ - public constructor(url: string, private httpMethod: HttpMethod) { + public constructor(url: string, private httpMethod: HttpMethod, headers: Headers = {}) { this.url = new URLParse(url, true); + this.headers = headers; } /* @@ -88,7 +91,7 @@ export class RequestContext { return this.httpMethod; } - public getHeaders(): { [key: string]: string } { + public getHeaders(): Headers { return this.headers; } diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts index f1bd953bf872..6e9720cf5547 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts @@ -1,7 +1,10 @@ -import { RequestContext, HttpMethod } from "./http/http"; +import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { - makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + getHeaders(): Headers + makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + setHeaders(headers: Headers): any; + setHeaderParam(key: string, value: string): void } /** @@ -11,7 +14,7 @@ export interface BaseServerConfiguration { * */ export class ServerConfiguration implements BaseServerConfiguration { - public constructor(private url: string, private variableConfiguration: T) {} + public constructor(private url: string, private variableConfiguration: T, private headers: Headers = {}) {} /** * Sets the value of the variables of this server. @@ -26,6 +29,18 @@ export class ServerConfiguration implements return this.variableConfiguration } + public setHeaders(headers: Headers): void { + Object.assign(this.headers, headers); + } + + public getHeaders(): Headers { + return this.headers + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } + private getUrl() { let replacedUrl = this.url; for (const key in this.variableConfiguration) { @@ -43,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts index adea9e4a0eea..1ff7e5fc5286 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts @@ -34,7 +34,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -81,7 +85,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -116,7 +124,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -153,7 +165,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -191,7 +207,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -222,7 +242,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -271,7 +295,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -336,7 +364,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts index 5709bad523e7..f66293b400d4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts @@ -35,7 +35,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -54,7 +58,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -87,7 +95,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -112,7 +124,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts index 424c02a45a46..58d16d7602d7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts @@ -34,7 +34,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -76,7 +80,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -118,7 +126,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -162,7 +174,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -194,7 +210,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -226,7 +246,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -254,7 +278,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -294,7 +322,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts index 21195a4dc51b..d7a3f5f98b65 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts @@ -31,6 +31,8 @@ export type HttpFile = { name: string }; +export type Headers = { [key: string]: string } + export class HttpException extends Error { public constructor(msg: string) { @@ -47,7 +49,7 @@ export type RequestBody = undefined | string | FormData | URLSearchParams; * Represents an HTTP request context */ export class RequestContext { - private headers: { [key: string]: string } = {}; + private headers: Headers = {}; private body: RequestBody = undefined; private url: URLParse; @@ -57,8 +59,9 @@ export class RequestContext { * @param url url of the requested resource * @param httpMethod http method */ - public constructor(url: string, private httpMethod: HttpMethod) { + public constructor(url: string, private httpMethod: HttpMethod, headers: Headers = {}) { this.url = new URLParse(url, true); + this.headers = headers; } /* @@ -94,7 +97,7 @@ export class RequestContext { return this.httpMethod; } - public getHeaders(): { [key: string]: string } { + public getHeaders(): Headers { return this.headers; } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts index ce34c8714c0c..3d7a7a705b01 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts @@ -1,7 +1,10 @@ -import { RequestContext, HttpMethod } from "./http/http"; +import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { - makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + getHeaders(): Headers + makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + setHeaders(headers: Headers): any; + setHeaderParam(key: string, value: string): void } /** @@ -11,7 +14,7 @@ export interface BaseServerConfiguration { * */ export class ServerConfiguration implements BaseServerConfiguration { - public constructor(private url: string, private variableConfiguration: T) {} + public constructor(private url: string, private variableConfiguration: T, private headers: Headers = {}) {} /** * Sets the value of the variables of this server. @@ -26,6 +29,18 @@ export class ServerConfiguration implements return this.variableConfiguration } + public setHeaders(headers: Headers): void { + Object.assign(this.headers, headers); + } + + public getHeaders(): Headers { + return this.headers + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } + private getUrl() { let replacedUrl = this.url; for (const key in this.variableConfiguration) { @@ -43,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts index 8107d8652877..0aabb73c3824 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts @@ -32,7 +32,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -79,7 +83,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -114,7 +122,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -151,7 +163,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -189,7 +205,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -220,7 +240,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -269,7 +293,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -334,7 +362,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts index b7b9eb284c31..33928297dc0b 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts @@ -33,7 +33,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -52,7 +56,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -85,7 +93,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -110,7 +122,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts index 0eb20195ccb9..6fcf6f1610eb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts @@ -32,7 +32,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -74,7 +78,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -116,7 +124,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -160,7 +172,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -192,7 +208,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -224,7 +244,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -252,7 +276,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -292,7 +320,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts index a45d304d6947..e852d6df5caa 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts @@ -21,6 +21,8 @@ export enum HttpMethod { */ export type HttpFile = Blob & { readonly name: string }; +export type Headers = { [key: string]: string } + /** * URLParse Wrapper for Deno */ @@ -70,7 +72,7 @@ export type RequestBody = undefined | string | FormData | URLSearchParams; * Represents an HTTP request context */ export class RequestContext { - private headers: { [key: string]: string } = {}; + private headers: Headers = {}; private body: RequestBody = undefined; private url: URLParse; @@ -80,8 +82,9 @@ export class RequestContext { * @param url url of the requested resource * @param httpMethod http method */ - public constructor(url: string, private httpMethod: HttpMethod) { + public constructor(url: string, private httpMethod: HttpMethod, headers: Headers = {}) { this.url = new URLParse(url, true); + this.headers = headers; } /* @@ -117,7 +120,7 @@ export class RequestContext { return this.httpMethod; } - public getHeaders(): { [key: string]: string } { + public getHeaders(): Headers { return this.headers; } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts index 6e5f2cc8cfdd..35b2c6e05bb2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts @@ -1,7 +1,10 @@ -import { RequestContext, HttpMethod } from "./http/http.ts"; +import { RequestContext, HttpMethod, Headers } from "./http/http.ts"; export interface BaseServerConfiguration { - makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + getHeaders(): Headers + makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + setHeaders(headers: Headers): any; + setHeaderParam(key: string, value: string): void } /** @@ -11,7 +14,7 @@ export interface BaseServerConfiguration { * */ export class ServerConfiguration implements BaseServerConfiguration { - public constructor(private url: string, private variableConfiguration: T) {} + public constructor(private url: string, private variableConfiguration: T, private headers: Headers = {}) {} /** * Sets the value of the variables of this server. @@ -26,6 +29,18 @@ export class ServerConfiguration implements return this.variableConfiguration } + public setHeaders(headers: Headers): void { + Object.assign(this.headers, headers); + } + + public getHeaders(): Headers { + return this.headers + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } + private getUrl() { let replacedUrl = this.url; for (const key in this.variableConfiguration) { @@ -43,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts index 46b1a2ab03e4..9443286be4cb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts @@ -36,7 +36,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -83,7 +87,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -118,7 +126,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -155,7 +167,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -193,7 +209,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -224,7 +244,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -273,7 +297,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -338,7 +366,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts index a90223b0a9ea..9f904abf9413 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts @@ -37,7 +37,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -56,7 +60,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -89,7 +97,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -114,7 +126,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts index f8594e27cf61..7b1bf8cd5e7b 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts @@ -36,7 +36,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -78,7 +82,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -120,7 +128,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -164,7 +176,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -196,7 +212,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -228,7 +248,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -256,7 +280,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -296,7 +324,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts index 21195a4dc51b..d7a3f5f98b65 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts @@ -31,6 +31,8 @@ export type HttpFile = { name: string }; +export type Headers = { [key: string]: string } + export class HttpException extends Error { public constructor(msg: string) { @@ -47,7 +49,7 @@ export type RequestBody = undefined | string | FormData | URLSearchParams; * Represents an HTTP request context */ export class RequestContext { - private headers: { [key: string]: string } = {}; + private headers: Headers = {}; private body: RequestBody = undefined; private url: URLParse; @@ -57,8 +59,9 @@ export class RequestContext { * @param url url of the requested resource * @param httpMethod http method */ - public constructor(url: string, private httpMethod: HttpMethod) { + public constructor(url: string, private httpMethod: HttpMethod, headers: Headers = {}) { this.url = new URLParse(url, true); + this.headers = headers; } /* @@ -94,7 +97,7 @@ export class RequestContext { return this.httpMethod; } - public getHeaders(): { [key: string]: string } { + public getHeaders(): Headers { return this.headers; } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts index ce34c8714c0c..3d7a7a705b01 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts @@ -1,7 +1,10 @@ -import { RequestContext, HttpMethod } from "./http/http"; +import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { - makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + getHeaders(): Headers + makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + setHeaders(headers: Headers): any; + setHeaderParam(key: string, value: string): void } /** @@ -11,7 +14,7 @@ export interface BaseServerConfiguration { * */ export class ServerConfiguration implements BaseServerConfiguration { - public constructor(private url: string, private variableConfiguration: T) {} + public constructor(private url: string, private variableConfiguration: T, private headers: Headers = {}) {} /** * Sets the value of the variables of this server. @@ -26,6 +29,18 @@ export class ServerConfiguration implements return this.variableConfiguration } + public setHeaders(headers: Headers): void { + Object.assign(this.headers, headers); + } + + public getHeaders(): Headers { + return this.headers + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } + private getUrl() { let replacedUrl = this.url; for (const key in this.variableConfiguration) { @@ -43,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts index 9d9c00153c49..2ba7849ea9f2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts @@ -32,7 +32,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -79,7 +83,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -114,7 +122,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -151,7 +163,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -189,7 +205,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -220,7 +240,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -269,7 +293,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -334,7 +362,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts index 0c887d5b8f48..a936311ceb64 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts @@ -33,7 +33,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -52,7 +56,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -85,7 +93,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -110,7 +122,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts index 1e6fb2ce5d02..17313104b04f 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts @@ -32,7 +32,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -74,7 +78,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -116,7 +124,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -160,7 +172,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -192,7 +208,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -224,7 +244,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -252,7 +276,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -292,7 +320,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts index 242e1a72a5ac..f2e8702fb12f 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts @@ -25,6 +25,8 @@ export enum HttpMethod { */ export type HttpFile = Blob & { readonly name: string }; +export type Headers = { [key: string]: string } + export class HttpException extends Error { public constructor(msg: string) { @@ -41,7 +43,7 @@ export type RequestBody = undefined | string | FormData | URLSearchParams; * Represents an HTTP request context */ export class RequestContext { - private headers: { [key: string]: string } = {}; + private headers: Headers = {}; private body: RequestBody = undefined; private url: URLParse; @@ -51,8 +53,9 @@ export class RequestContext { * @param url url of the requested resource * @param httpMethod http method */ - public constructor(url: string, private httpMethod: HttpMethod) { + public constructor(url: string, private httpMethod: HttpMethod, headers: Headers = {}) { this.url = new URLParse(url, true); + this.headers = headers; } /* @@ -88,7 +91,7 @@ export class RequestContext { return this.httpMethod; } - public getHeaders(): { [key: string]: string } { + public getHeaders(): Headers { return this.headers; } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts index ce34c8714c0c..3d7a7a705b01 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts @@ -1,7 +1,10 @@ -import { RequestContext, HttpMethod } from "./http/http"; +import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { - makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + getHeaders(): Headers + makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + setHeaders(headers: Headers): any; + setHeaderParam(key: string, value: string): void } /** @@ -11,7 +14,7 @@ export interface BaseServerConfiguration { * */ export class ServerConfiguration implements BaseServerConfiguration { - public constructor(private url: string, private variableConfiguration: T) {} + public constructor(private url: string, private variableConfiguration: T, private headers: Headers = {}) {} /** * Sets the value of the variables of this server. @@ -26,6 +29,18 @@ export class ServerConfiguration implements return this.variableConfiguration } + public setHeaders(headers: Headers): void { + Object.assign(this.headers, headers); + } + + public getHeaders(): Headers { + return this.headers + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } + private getUrl() { let replacedUrl = this.url; for (const key in this.variableConfiguration) { @@ -43,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts index adea9e4a0eea..1ff7e5fc5286 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts @@ -34,7 +34,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -81,7 +85,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -116,7 +124,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -153,7 +165,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -191,7 +207,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -222,7 +242,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -271,7 +295,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -336,7 +364,11 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts index 5709bad523e7..f66293b400d4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts @@ -35,7 +35,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -54,7 +58,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -87,7 +95,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -112,7 +124,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts index 424c02a45a46..58d16d7602d7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts @@ -34,7 +34,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -76,7 +80,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -118,7 +126,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.POST, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -162,7 +174,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.DELETE, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -194,7 +210,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -226,7 +246,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -254,7 +278,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.GET, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -294,7 +322,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext( + localVarPath, + HttpMethod.PUT, + _config.baseServer.getHeaders() + ); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts index 21195a4dc51b..d7a3f5f98b65 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts @@ -31,6 +31,8 @@ export type HttpFile = { name: string }; +export type Headers = { [key: string]: string } + export class HttpException extends Error { public constructor(msg: string) { @@ -47,7 +49,7 @@ export type RequestBody = undefined | string | FormData | URLSearchParams; * Represents an HTTP request context */ export class RequestContext { - private headers: { [key: string]: string } = {}; + private headers: Headers = {}; private body: RequestBody = undefined; private url: URLParse; @@ -57,8 +59,9 @@ export class RequestContext { * @param url url of the requested resource * @param httpMethod http method */ - public constructor(url: string, private httpMethod: HttpMethod) { + public constructor(url: string, private httpMethod: HttpMethod, headers: Headers = {}) { this.url = new URLParse(url, true); + this.headers = headers; } /* @@ -94,7 +97,7 @@ export class RequestContext { return this.httpMethod; } - public getHeaders(): { [key: string]: string } { + public getHeaders(): Headers { return this.headers; } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts index ce34c8714c0c..3d7a7a705b01 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts @@ -1,7 +1,10 @@ -import { RequestContext, HttpMethod } from "./http/http"; +import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { - makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + getHeaders(): Headers + makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + setHeaders(headers: Headers): any; + setHeaderParam(key: string, value: string): void } /** @@ -11,7 +14,7 @@ export interface BaseServerConfiguration { * */ export class ServerConfiguration implements BaseServerConfiguration { - public constructor(private url: string, private variableConfiguration: T) {} + public constructor(private url: string, private variableConfiguration: T, private headers: Headers = {}) {} /** * Sets the value of the variables of this server. @@ -26,6 +29,18 @@ export class ServerConfiguration implements return this.variableConfiguration } + public setHeaders(headers: Headers): void { + Object.assign(this.headers, headers); + } + + public getHeaders(): Headers { + return this.headers + } + + public setHeaderParam(key: string, value: string): void { + this.headers[key] = value; + } + private getUrl() { let replacedUrl = this.url; for (const key in this.variableConfiguration) { @@ -43,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); } } From 01410baed458c7ae79a4186fbd6e7bd0f8630a51 Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Fri, 24 Sep 2021 14:38:35 +0300 Subject: [PATCH 3/9] update function make request --- .../src/main/resources/typescript/api/api.mustache | 6 +----- .../src/main/resources/typescript/http/servers.mustache | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache index 0e31cd56b5cd..9fa8f1de5851 100644 --- a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache @@ -59,11 +59,7 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { .replace('{' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}}; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.{{httpMethod}}, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.{{httpMethod}}); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") {{#queryParams}} diff --git a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache index 614b9b077fd1..4c3da95815ad 100644 --- a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache @@ -2,7 +2,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http{{extensionForDe export interface BaseServerConfiguration { getHeaders(): Headers - makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; setHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -58,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); } } From ff5de8814c0e381d862f7e190542730ec9830d45 Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Fri, 24 Sep 2021 16:14:04 +0300 Subject: [PATCH 4/9] generate samples --- .../composed-schemas/apis/DefaultApi.ts | 18 ++----- .../builds/composed-schemas/servers.ts | 6 +-- .../typescript/builds/default/apis/PetApi.ts | 48 ++++--------------- .../builds/default/apis/StoreApi.ts | 24 ++-------- .../typescript/builds/default/apis/UserApi.ts | 48 ++++--------------- .../typescript/builds/default/servers.ts | 6 +-- .../typescript/builds/deno/apis/PetApi.ts | 48 ++++--------------- .../typescript/builds/deno/apis/StoreApi.ts | 24 ++-------- .../typescript/builds/deno/apis/UserApi.ts | 48 ++++--------------- .../typescript/builds/deno/servers.ts | 6 +-- .../builds/inversify/apis/PetApi.ts | 48 ++++--------------- .../builds/inversify/apis/StoreApi.ts | 24 ++-------- .../builds/inversify/apis/UserApi.ts | 48 ++++--------------- .../typescript/builds/inversify/servers.ts | 6 +-- .../typescript/builds/jquery/apis/PetApi.ts | 48 ++++--------------- .../typescript/builds/jquery/apis/StoreApi.ts | 24 ++-------- .../typescript/builds/jquery/apis/UserApi.ts | 48 ++++--------------- .../typescript/builds/jquery/servers.ts | 6 +-- .../builds/object_params/apis/PetApi.ts | 48 ++++--------------- .../builds/object_params/apis/StoreApi.ts | 24 ++-------- .../builds/object_params/apis/UserApi.ts | 48 ++++--------------- .../builds/object_params/servers.ts | 6 +-- 22 files changed, 121 insertions(+), 533 deletions(-) diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts index 54e8d6642c92..0e394cc47919 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts @@ -29,11 +29,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/file'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -63,11 +59,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pets-filtered'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PATCH, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -97,11 +89,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pets'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PATCH, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts index 6e9720cf5547..2656d95999eb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts @@ -2,7 +2,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers - makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; setHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -58,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts index 1ff7e5fc5286..adea9e4a0eea 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts @@ -34,11 +34,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -85,11 +81,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -124,11 +116,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -165,11 +153,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -207,11 +191,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -242,11 +222,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -295,11 +271,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -364,11 +336,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts index f66293b400d4..5709bad523e7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts @@ -35,11 +35,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -58,11 +54,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -95,11 +87,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -124,11 +112,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts index 58d16d7602d7..424c02a45a46 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts @@ -34,11 +34,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -80,11 +76,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -126,11 +118,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -174,11 +162,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -210,11 +194,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -246,11 +226,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -278,11 +254,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -322,11 +294,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts index 3d7a7a705b01..34d7a0c7b758 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts @@ -2,7 +2,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers - makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; setHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -58,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts index 0aabb73c3824..8107d8652877 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts @@ -32,11 +32,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -83,11 +79,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -122,11 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -163,11 +151,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -205,11 +189,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -240,11 +220,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -293,11 +269,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -362,11 +334,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts index 33928297dc0b..b7b9eb284c31 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts @@ -33,11 +33,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -56,11 +52,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -93,11 +85,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -122,11 +110,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts index 6fcf6f1610eb..0eb20195ccb9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts @@ -32,11 +32,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -78,11 +74,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -124,11 +116,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -172,11 +160,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -208,11 +192,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -244,11 +224,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -276,11 +252,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -320,11 +292,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts index 35b2c6e05bb2..ba2f77f94747 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts @@ -2,7 +2,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http.ts"; export interface BaseServerConfiguration { getHeaders(): Headers - makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; setHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -58,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts index 9443286be4cb..46b1a2ab03e4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts @@ -36,11 +36,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -87,11 +83,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -126,11 +118,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -167,11 +155,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -209,11 +193,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -244,11 +224,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -297,11 +273,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -366,11 +338,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts index 9f904abf9413..a90223b0a9ea 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts @@ -37,11 +37,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -60,11 +56,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -97,11 +89,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -126,11 +114,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts index 7b1bf8cd5e7b..f8594e27cf61 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts @@ -36,11 +36,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -82,11 +78,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -128,11 +120,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -176,11 +164,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -212,11 +196,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -248,11 +228,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -280,11 +256,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -324,11 +296,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts index 3d7a7a705b01..34d7a0c7b758 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts @@ -2,7 +2,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers - makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; setHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -58,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts index 2ba7849ea9f2..9d9c00153c49 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts @@ -32,11 +32,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -83,11 +79,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -122,11 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -163,11 +151,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -205,11 +189,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -240,11 +220,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -293,11 +269,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -362,11 +334,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts index a936311ceb64..0c887d5b8f48 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts @@ -33,11 +33,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -56,11 +52,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -93,11 +85,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -122,11 +110,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts index 17313104b04f..1e6fb2ce5d02 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts @@ -32,11 +32,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -78,11 +74,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -124,11 +116,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -172,11 +160,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -208,11 +192,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -244,11 +224,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -276,11 +252,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -320,11 +292,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts index 3d7a7a705b01..34d7a0c7b758 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts @@ -2,7 +2,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers - makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; setHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -58,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts index 1ff7e5fc5286..adea9e4a0eea 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts @@ -34,11 +34,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -85,11 +81,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -124,11 +116,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -165,11 +153,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -207,11 +191,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -242,11 +222,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -295,11 +271,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -364,11 +336,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts index f66293b400d4..5709bad523e7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts @@ -35,11 +35,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -58,11 +54,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -95,11 +87,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -124,11 +112,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts index 58d16d7602d7..424c02a45a46 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts @@ -34,11 +34,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -80,11 +76,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -126,11 +118,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.POST, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -174,11 +162,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.DELETE, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -210,11 +194,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -246,11 +226,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -278,11 +254,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.GET, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -322,11 +294,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext( - localVarPath, - HttpMethod.PUT, - _config.baseServer.getHeaders() - ); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts index 3d7a7a705b01..34d7a0c7b758 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts @@ -2,7 +2,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers - makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext; + makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; setHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -58,8 +58,8 @@ export class ServerConfiguration implements * @param httpMethod httpMethod to be used * */ - public makeRequestContext(endpoint: string, httpMethod: HttpMethod, headers?: Headers): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, headers); + public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { + return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); } } From f0e324718225fafcc50a640ba6a53ba2150d1675 Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Fri, 1 Oct 2021 15:05:28 +0300 Subject: [PATCH 5/9] rename setHeaders to addHeaders --- .../src/main/resources/typescript/http/servers.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache index 4c3da95815ad..2605670c9aa9 100644 --- a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache @@ -3,7 +3,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http{{extensionForDe export interface BaseServerConfiguration { getHeaders(): Headers makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; - setHeaders(headers: Headers): any; + addHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -29,7 +29,7 @@ export class ServerConfiguration implements return this.variableConfiguration } - public setHeaders(headers: Headers): void { + public addHeaders(headers: Headers): void { Object.assign(this.headers, headers); } From bfb51d1d3a32729cf732ae20988486d47b7ad008 Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Fri, 1 Oct 2021 15:10:21 +0300 Subject: [PATCH 6/9] generete samples --- .../petstore/typescript/builds/composed-schemas/servers.ts | 4 ++-- .../client/petstore/typescript/builds/default/servers.ts | 4 ++-- .../client/petstore/typescript/builds/deno/servers.ts | 4 ++-- .../client/petstore/typescript/builds/inversify/servers.ts | 4 ++-- .../client/petstore/typescript/builds/jquery/servers.ts | 4 ++-- .../petstore/typescript/builds/object_params/servers.ts | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts index 2656d95999eb..bdeff4af7ea1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts @@ -3,7 +3,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; - setHeaders(headers: Headers): any; + addHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -29,7 +29,7 @@ export class ServerConfiguration implements return this.variableConfiguration } - public setHeaders(headers: Headers): void { + public addHeaders(headers: Headers): void { Object.assign(this.headers, headers); } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts index 34d7a0c7b758..e9b661f6a905 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts @@ -3,7 +3,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; - setHeaders(headers: Headers): any; + addHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -29,7 +29,7 @@ export class ServerConfiguration implements return this.variableConfiguration } - public setHeaders(headers: Headers): void { + public addHeaders(headers: Headers): void { Object.assign(this.headers, headers); } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts index ba2f77f94747..a7cd7b01e268 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts @@ -3,7 +3,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http.ts"; export interface BaseServerConfiguration { getHeaders(): Headers makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; - setHeaders(headers: Headers): any; + addHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -29,7 +29,7 @@ export class ServerConfiguration implements return this.variableConfiguration } - public setHeaders(headers: Headers): void { + public addHeaders(headers: Headers): void { Object.assign(this.headers, headers); } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts index 34d7a0c7b758..e9b661f6a905 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts @@ -3,7 +3,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; - setHeaders(headers: Headers): any; + addHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -29,7 +29,7 @@ export class ServerConfiguration implements return this.variableConfiguration } - public setHeaders(headers: Headers): void { + public addHeaders(headers: Headers): void { Object.assign(this.headers, headers); } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts index 34d7a0c7b758..e9b661f6a905 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts @@ -3,7 +3,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; - setHeaders(headers: Headers): any; + addHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -29,7 +29,7 @@ export class ServerConfiguration implements return this.variableConfiguration } - public setHeaders(headers: Headers): void { + public addHeaders(headers: Headers): void { Object.assign(this.headers, headers); } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts index 34d7a0c7b758..e9b661f6a905 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts @@ -3,7 +3,7 @@ import { RequestContext, HttpMethod, Headers } from "./http/http"; export interface BaseServerConfiguration { getHeaders(): Headers makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; - setHeaders(headers: Headers): any; + addHeaders(headers: Headers): any; setHeaderParam(key: string, value: string): void } @@ -29,7 +29,7 @@ export class ServerConfiguration implements return this.variableConfiguration } - public setHeaders(headers: Headers): void { + public addHeaders(headers: Headers): void { Object.assign(this.headers, headers); } From e29ae3de096f7d5753472f493c695f1b693ac88c Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Thu, 25 Nov 2021 16:11:00 +0300 Subject: [PATCH 7/9] clone headers for RequestContext --- .../src/main/resources/typescript/http/servers.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache index 2605670c9aa9..7b4892c8b40d 100644 --- a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache @@ -59,7 +59,7 @@ export class ServerConfiguration implements * */ public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); + return new RequestContext(this.getUrl() + endpoint, httpMethod, Object.assign({}, this.headers)); } } From cc34f898dc6fdc229d3c88965f771540f9fff051 Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Thu, 25 Nov 2021 16:27:43 +0300 Subject: [PATCH 8/9] regenerate tests --- .../petstore/typescript/builds/composed-schemas/servers.ts | 2 +- .../client/petstore/typescript/builds/default/servers.ts | 2 +- .../openapi3/client/petstore/typescript/builds/deno/servers.ts | 2 +- .../client/petstore/typescript/builds/inversify/servers.ts | 2 +- .../client/petstore/typescript/builds/jquery/servers.ts | 2 +- .../client/petstore/typescript/builds/object_params/servers.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts index bdeff4af7ea1..89599310c157 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/servers.ts @@ -59,7 +59,7 @@ export class ServerConfiguration implements * */ public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); + return new RequestContext(this.getUrl() + endpoint, httpMethod, Object.assign({}, this.headers)); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts index e9b661f6a905..429413412cb2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts @@ -59,7 +59,7 @@ export class ServerConfiguration implements * */ public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); + return new RequestContext(this.getUrl() + endpoint, httpMethod, Object.assign({}, this.headers)); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts index a7cd7b01e268..40bd399617d4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts @@ -59,7 +59,7 @@ export class ServerConfiguration implements * */ public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); + return new RequestContext(this.getUrl() + endpoint, httpMethod, Object.assign({}, this.headers)); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts index e9b661f6a905..429413412cb2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts @@ -59,7 +59,7 @@ export class ServerConfiguration implements * */ public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); + return new RequestContext(this.getUrl() + endpoint, httpMethod, Object.assign({}, this.headers)); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts index e9b661f6a905..429413412cb2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts @@ -59,7 +59,7 @@ export class ServerConfiguration implements * */ public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); + return new RequestContext(this.getUrl() + endpoint, httpMethod, Object.assign({}, this.headers)); } } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts index e9b661f6a905..429413412cb2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts @@ -59,7 +59,7 @@ export class ServerConfiguration implements * */ public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext { - return new RequestContext(this.getUrl() + endpoint, httpMethod, this.headers); + return new RequestContext(this.getUrl() + endpoint, httpMethod, Object.assign({}, this.headers)); } } From 935fa84d0cf58bc027a37ab0758012eb9c1f5c25 Mon Sep 17 00:00:00 2001 From: ksvirkou Date: Fri, 26 Nov 2021 15:36:30 +0300 Subject: [PATCH 9/9] fix abstract class --- .../src/main/resources/typescript/services/http.mustache | 5 ++++- .../petstore/typescript/builds/inversify/services/http.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/services/http.mustache b/modules/openapi-generator/src/main/resources/typescript/services/http.mustache index f234886dfd84..66685f4196de 100644 --- a/modules/openapi-generator/src/main/resources/typescript/services/http.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/services/http.mustache @@ -1,7 +1,7 @@ {{#useRxJS}} import type { Observable } from "rxjs"; {{/useRxJS}} -import type { {{^useRxJS}}Promise{{/useRxJS}}HttpLibrary, HttpMethod, RequestContext, ResponseContext } from "../http/http"; +import type { {{^useRxJS}}Promise{{/useRxJS}}HttpLibrary, Headers, HttpMethod, RequestContext, ResponseContext } from "../http/http"; import type { {{^useRxJS}}Promise{{/useRxJS}}Middleware } from "../middleware"; import type { BaseServerConfiguration } from "../servers"; @@ -15,5 +15,8 @@ export abstract class AbstractMiddleware implements {{^useRxJS}}Promise{{/useRxJ } export abstract class AbstractServerConfiguration implements BaseServerConfiguration { + public abstract getHeaders(): Headers public abstract makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + public abstract addHeaders(headers: Headers): any; + public abstract setHeaderParam(key: string, value: string): void }; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/http.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/http.ts index 18c3713ace0b..33c91ba01ca9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/http.ts @@ -1,4 +1,4 @@ -import type { PromiseHttpLibrary, HttpMethod, RequestContext, ResponseContext } from "../http/http"; +import type { PromiseHttpLibrary, Headers, HttpMethod, RequestContext, ResponseContext } from "../http/http"; import type { PromiseMiddleware } from "../middleware"; import type { BaseServerConfiguration } from "../servers"; @@ -12,5 +12,8 @@ export abstract class AbstractMiddleware implements PromiseMiddleware { } export abstract class AbstractServerConfiguration implements BaseServerConfiguration { + public abstract getHeaders(): Headers public abstract makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext; + public abstract addHeaders(headers: Headers): any; + public abstract setHeaderParam(key: string, value: string): void };