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 4ccded577e47..0ca805593105 100644 --- a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache @@ -1,7 +1,7 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi{{extensionForDeno}}'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi{{extensionForDeno}}'; import {Configuration} from '../configuration{{extensionForDeno}}'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http{{extensionForDeno}}'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http{{extensionForDeno}}'; {{#platforms}} {{#node}} import * as FormData from "form-data"; @@ -11,6 +11,7 @@ import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer{{extensionForDeno}}'; import {ApiException} from './exception{{extensionForDeno}}'; import {canConsumeForm, isCodeInRange} from '../util{{extensionForDeno}}'; +import {SecurityAuthentication} from '../auth/auth'; {{#useInversify}} import { injectable } from "inversify"; @@ -151,15 +152,22 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { {{/bodyParam}} {{#hasAuthMethods}} - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; {{/hasAuthMethods}} {{#authMethods}} // Apply auth methods authMethod = _config.authMethods["{{name}}"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } {{/authMethods}} + + {{^useInversify}} + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } + {{/useInversify}} return requestContext; } diff --git a/modules/openapi-generator/src/main/resources/typescript/auth/auth.mustache b/modules/openapi-generator/src/main/resources/typescript/auth/auth.mustache index bfb303e741ed..09ff0ca2bb9a 100644 --- a/modules/openapi-generator/src/main/resources/typescript/auth/auth.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/auth/auth.mustache @@ -107,6 +107,9 @@ export class {{#lambda.pascalcase}}{{name}}{{/lambda.pascalcase}}Authentication {{/authMethods}} export type AuthMethods = { + {{^useInversify}} + "default"?: SecurityAuthentication, + {{/useInversify}} {{#authMethods}} "{{name}}"?: SecurityAuthentication{{^-last}},{{/-last}} {{/authMethods}} @@ -114,6 +117,9 @@ export type AuthMethods = { {{#useInversify}} export const authMethodServices = { + {{^useInversify}} + "default"?: SecurityAuthentication, + {{/useInversify}} {{#authMethods}} "{{name}}": {{#lambda.pascalcase}}{{name}}{{/lambda.pascalcase}}Authentication{{^-last}},{{/-last}} {{/authMethods}} @@ -126,6 +132,9 @@ export type HttpBearerConfiguration = { tokenProvider: TokenProvider }; export type OAuth2Configuration = { accessToken: string }; export type AuthMethodsConfiguration = { + {{^useInversify}} + "default"?: SecurityAuthentication, + {{/useInversify}} {{#authMethods}} "{{name}}"?: {{#isApiKey}}ApiKeyConfiguration{{/isApiKey}}{{#isBasicBasic}}HttpBasicConfiguration{{/isBasicBasic}}{{#isBasicBearer}}HttpBearerConfiguration{{/isBasicBearer}}{{#isOAuth}}OAuth2Configuration{{/isOAuth}}{{^-last}},{{/-last}} {{/authMethods}} @@ -141,6 +150,9 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine if (!config) { return authMethods; } + {{^useInversify}} + authMethods["default"] = config["default"] + {{/useInversify}} {{#authMethods}} if (config["{{name}}"]) { diff --git a/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache index d44164bd0191..9a6390337188 100644 --- a/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache @@ -47,7 +47,7 @@ export class Object{{classname}} { {{/summary}} * @param param the request object */ - public {{nickname}}(param: {{classname}}{{operationIdCamelCase}}Request, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{{returnType}}}{{^returnType}}void{{/returnType}}> { + public {{nickname}}(param: {{classname}}{{operationIdCamelCase}}Request{{^hasRequiredParams}} = {}{{/hasRequiredParams}}, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{{returnType}}}{{^returnType}}void{{/returnType}}> { return this.api.{{nickname}}({{#allParams}}param.{{paramName}}, {{/allParams}} options){{^useRxJS}}.toPromise(){{/useRxJS}}; } 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 59a3ac169736..a2c52ae901ea 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 @@ -1,10 +1,11 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { Cat } from '../models/Cat'; @@ -44,6 +45,11 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -74,6 +80,11 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -104,6 +115,11 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts index fa859aaa0981..49340932e11b 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/auth/auth.ts @@ -24,6 +24,7 @@ export interface TokenProvider { export type AuthMethods = { + "default"?: SecurityAuthentication, } export type ApiKeyConfiguration = string; @@ -32,6 +33,7 @@ export type HttpBearerConfiguration = { tokenProvider: TokenProvider }; export type OAuth2Configuration = { accessToken: string }; export type AuthMethodsConfiguration = { + "default"?: SecurityAuthentication, } /** @@ -44,6 +46,7 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine if (!config) { return authMethods; } + authMethods["default"] = config["default"] return authMethods; } \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts index d94a613229e6..84ebc7d8c699 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObjectParamAPI.ts @@ -50,21 +50,21 @@ export class ObjectDefaultApi { /** * @param param the request object */ - public filePost(param: DefaultApiFilePostRequest, options?: Configuration): Promise { + public filePost(param: DefaultApiFilePostRequest = {}, options?: Configuration): Promise { return this.api.filePost(param.inlineObject, options).toPromise(); } /** * @param param the request object */ - public petsFilteredPatch(param: DefaultApiPetsFilteredPatchRequest, options?: Configuration): Promise { + public petsFilteredPatch(param: DefaultApiPetsFilteredPatchRequest = {}, options?: Configuration): Promise { return this.api.petsFilteredPatch(param.petByAgePetByType, options).toPromise(); } /** * @param param the request object */ - public petsPatch(param: DefaultApiPetsPatchRequest, options?: Configuration): Promise { + public petsPatch(param: DefaultApiPetsPatchRequest = {}, options?: Configuration): Promise { return this.api.petsPatch(param.catDog, options).toPromise(); } 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 ff3b13bc8455..e85797baebc1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { ApiResponse } from '../models/ApiResponse'; @@ -51,11 +52,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -88,11 +94,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", "")); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -125,11 +136,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -162,11 +178,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -195,11 +216,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -239,11 +265,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -304,11 +335,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -371,11 +407,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; 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 46cf6d33efc7..821e181892ba 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { Order } from '../models/Order'; @@ -39,6 +40,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -58,11 +64,16 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -91,6 +102,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -127,6 +143,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } 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 99a7c43b2e5c..9a87f64e9c58 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { User } from '../models/User'; @@ -49,11 +50,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -91,11 +97,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -133,11 +144,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -166,11 +182,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -198,6 +219,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -240,6 +266,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -258,11 +289,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -309,11 +345,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; diff --git a/samples/openapi3/client/petstore/typescript/builds/default/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/default/auth/auth.ts index 1f1d1ecac678..a67ed0e90ccb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/auth/auth.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/auth/auth.ts @@ -66,6 +66,7 @@ export class PetstoreAuthAuthentication implements SecurityAuthentication { export type AuthMethods = { + "default"?: SecurityAuthentication, "api_key"?: SecurityAuthentication, "petstore_auth"?: SecurityAuthentication } @@ -76,6 +77,7 @@ export type HttpBearerConfiguration = { tokenProvider: TokenProvider }; export type OAuth2Configuration = { accessToken: string }; export type AuthMethodsConfiguration = { + "default"?: SecurityAuthentication, "api_key"?: ApiKeyConfiguration, "petstore_auth"?: OAuth2Configuration } @@ -90,6 +92,7 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine if (!config) { return authMethods; } + authMethods["default"] = config["default"] if (config["api_key"]) { authMethods["api_key"] = new ApiKeyAuthentication( diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts index 829c9d0363a8..a590e3ca4923 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts @@ -244,7 +244,7 @@ export class ObjectStoreApi { * Returns pet inventories by status * @param param the request object */ - public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> { + public getInventory(param: StoreApiGetInventoryRequest = {}, options?: Configuration): Promise<{ [key: string]: number; }> { return this.api.getInventory( options).toPromise(); } @@ -409,7 +409,7 @@ export class ObjectUserApi { * Logs out current logged in user session * @param param the request object */ - public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise { + public logoutUser(param: UserApiLogoutUserRequest = {}, options?: Configuration): Promise { return this.api.logoutUser( options).toPromise(); } 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 9ae92b9b2120..f11b208baf24 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts @@ -1,10 +1,11 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi.ts'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi.ts'; import {Configuration} from '../configuration.ts'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts'; import {ObjectSerializer} from '../models/ObjectSerializer.ts'; import {ApiException} from './exception.ts'; import {canConsumeForm, isCodeInRange} from '../util.ts'; +import {SecurityAuthentication} from '../auth/auth'; import { ApiResponse } from '../models/ApiResponse.ts'; @@ -49,11 +50,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -86,11 +92,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", "")); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -123,11 +134,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -160,11 +176,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -193,11 +214,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -237,11 +263,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -302,11 +333,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -369,11 +405,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; 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 767734aed21e..f83700b35cfb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts @@ -1,10 +1,11 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi.ts'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi.ts'; import {Configuration} from '../configuration.ts'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts'; import {ObjectSerializer} from '../models/ObjectSerializer.ts'; import {ApiException} from './exception.ts'; import {canConsumeForm, isCodeInRange} from '../util.ts'; +import {SecurityAuthentication} from '../auth/auth'; import { Order } from '../models/Order.ts'; @@ -37,6 +38,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -56,11 +62,16 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -89,6 +100,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -125,6 +141,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } 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 7caf789d015d..f2de9aeb598a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts @@ -1,10 +1,11 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi.ts'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi.ts'; import {Configuration} from '../configuration.ts'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts'; import {ObjectSerializer} from '../models/ObjectSerializer.ts'; import {ApiException} from './exception.ts'; import {canConsumeForm, isCodeInRange} from '../util.ts'; +import {SecurityAuthentication} from '../auth/auth'; import { User } from '../models/User.ts'; @@ -47,11 +48,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -89,11 +95,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -131,11 +142,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -164,11 +180,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -196,6 +217,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -238,6 +264,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -256,11 +287,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -307,11 +343,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/deno/auth/auth.ts index e7609dabbece..85086dde5fae 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/auth/auth.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/auth/auth.ts @@ -64,6 +64,7 @@ export class PetstoreAuthAuthentication implements SecurityAuthentication { export type AuthMethods = { + "default"?: SecurityAuthentication, "api_key"?: SecurityAuthentication, "petstore_auth"?: SecurityAuthentication } @@ -74,6 +75,7 @@ export type HttpBearerConfiguration = { tokenProvider: TokenProvider }; export type OAuth2Configuration = { accessToken: string }; export type AuthMethodsConfiguration = { + "default"?: SecurityAuthentication, "api_key"?: ApiKeyConfiguration, "petstore_auth"?: OAuth2Configuration } @@ -88,6 +90,7 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine if (!config) { return authMethods; } + authMethods["default"] = config["default"] if (config["api_key"]) { authMethods["api_key"] = new ApiKeyAuthentication( diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts index ebcd714f27c5..a6988e3ef191 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts @@ -244,7 +244,7 @@ export class ObjectStoreApi { * Returns pet inventories by status * @param param the request object */ - public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> { + public getInventory(param: StoreApiGetInventoryRequest = {}, options?: Configuration): Promise<{ [key: string]: number; }> { return this.api.getInventory( options).toPromise(); } @@ -409,7 +409,7 @@ export class ObjectUserApi { * Logs out current logged in user session * @param param the request object */ - public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise { + public logoutUser(param: UserApiLogoutUserRequest = {}, options?: Configuration): Promise { return this.api.logoutUser( options).toPromise(); } 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 9b8cd23af11e..81a75d96bcec 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { injectable } from "inversify"; @@ -53,12 +54,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -90,12 +92,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", "")); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -127,12 +130,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -164,12 +168,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -197,12 +202,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -241,12 +247,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -306,12 +313,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -373,12 +381,13 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } 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 356d2cfbc4d0..4115b9dc6d9e 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { injectable } from "inversify"; @@ -41,6 +42,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + return requestContext; } @@ -60,12 +62,13 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -93,6 +96,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + return requestContext; } @@ -129,6 +133,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + return requestContext; } 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 3991a33b383b..124034df9888 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { injectable } from "inversify"; @@ -51,12 +52,13 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -93,12 +95,13 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -135,12 +138,13 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -168,12 +172,13 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -200,6 +205,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + return requestContext; } @@ -242,6 +248,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } + return requestContext; } @@ -260,12 +267,13 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } @@ -311,12 +319,13 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); } + return requestContext; } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts index 829c9d0363a8..a590e3ca4923 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts @@ -244,7 +244,7 @@ export class ObjectStoreApi { * Returns pet inventories by status * @param param the request object */ - public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> { + public getInventory(param: StoreApiGetInventoryRequest = {}, options?: Configuration): Promise<{ [key: string]: number; }> { return this.api.getInventory( options).toPromise(); } @@ -409,7 +409,7 @@ export class ObjectUserApi { * Logs out current logged in user session * @param param the request object */ - public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise { + public logoutUser(param: UserApiLogoutUserRequest = {}, options?: Configuration): Promise { return this.api.logoutUser( options).toPromise(); } 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 a2b9813749e5..fe20e750a839 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts @@ -1,10 +1,11 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { ApiResponse } from '../models/ApiResponse'; @@ -49,11 +50,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -86,11 +92,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", "")); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -123,11 +134,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -160,11 +176,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -193,11 +214,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -237,11 +263,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -302,11 +333,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -369,11 +405,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; 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 a8bc438d420d..020bb0407068 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts @@ -1,10 +1,11 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { Order } from '../models/Order'; @@ -37,6 +38,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -56,11 +62,16 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -89,6 +100,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -125,6 +141,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } 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 3f493441c39d..75cb0453992e 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts @@ -1,10 +1,11 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { User } from '../models/User'; @@ -47,11 +48,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -89,11 +95,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -131,11 +142,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -164,11 +180,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -196,6 +217,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -238,6 +264,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -256,11 +287,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -307,11 +343,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/auth/auth.ts index d8924a4216c2..ed2aa2bfe6db 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/auth/auth.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/auth/auth.ts @@ -64,6 +64,7 @@ export class PetstoreAuthAuthentication implements SecurityAuthentication { export type AuthMethods = { + "default"?: SecurityAuthentication, "api_key"?: SecurityAuthentication, "petstore_auth"?: SecurityAuthentication } @@ -74,6 +75,7 @@ export type HttpBearerConfiguration = { tokenProvider: TokenProvider }; export type OAuth2Configuration = { accessToken: string }; export type AuthMethodsConfiguration = { + "default"?: SecurityAuthentication, "api_key"?: ApiKeyConfiguration, "petstore_auth"?: OAuth2Configuration } @@ -88,6 +90,7 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine if (!config) { return authMethods; } + authMethods["default"] = config["default"] if (config["api_key"]) { authMethods["api_key"] = new ApiKeyAuthentication( diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts index 829c9d0363a8..a590e3ca4923 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts @@ -244,7 +244,7 @@ export class ObjectStoreApi { * Returns pet inventories by status * @param param the request object */ - public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> { + public getInventory(param: StoreApiGetInventoryRequest = {}, options?: Configuration): Promise<{ [key: string]: number; }> { return this.api.getInventory( options).toPromise(); } @@ -409,7 +409,7 @@ export class ObjectUserApi { * Logs out current logged in user session * @param param the request object */ - public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise { + public logoutUser(param: UserApiLogoutUserRequest = {}, options?: Configuration): Promise { return this.api.logoutUser( options).toPromise(); } 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 ff3b13bc8455..e85797baebc1 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 @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { ApiResponse } from '../models/ApiResponse'; @@ -51,11 +52,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -88,11 +94,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", "")); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -125,11 +136,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -162,11 +178,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -195,11 +216,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -239,11 +265,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -304,11 +335,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -371,11 +407,16 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Content-Type", contentType); } - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["petstore_auth"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; 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 46cf6d33efc7..821e181892ba 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 @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { Order } from '../models/Order'; @@ -39,6 +40,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -58,11 +64,16 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -91,6 +102,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -127,6 +143,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } 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 99a7c43b2e5c..9a87f64e9c58 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 @@ -1,12 +1,13 @@ // TODO: better import syntax? -import { BaseAPIRequestFactory, RequiredError } from './baseapi'; +import {BaseAPIRequestFactory, RequiredError} from './baseapi'; import {Configuration} from '../configuration'; -import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; +import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http'; import * as FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; import {canConsumeForm, isCodeInRange} from '../util'; +import {SecurityAuthentication} from '../auth/auth'; import { User } from '../models/User'; @@ -49,11 +50,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -91,11 +97,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -133,11 +144,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -166,11 +182,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -198,6 +219,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -240,6 +266,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); + } return requestContext; } @@ -258,11 +289,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; @@ -309,11 +345,16 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - let authMethod = null; + let authMethod: SecurityAuthentication | undefined; // Apply auth methods authMethod = _config.authMethods["api_key"] - if (authMethod) { - await authMethod.applySecurityAuthentication(requestContext); + if (authMethod?.applySecurityAuthentication) { + await authMethod?.applySecurityAuthentication(requestContext); + } + + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default + if (defaultAuth?.applySecurityAuthentication) { + await defaultAuth?.applySecurityAuthentication(requestContext); } return requestContext; diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/auth/auth.ts index 1f1d1ecac678..a67ed0e90ccb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/auth/auth.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/auth/auth.ts @@ -66,6 +66,7 @@ export class PetstoreAuthAuthentication implements SecurityAuthentication { export type AuthMethods = { + "default"?: SecurityAuthentication, "api_key"?: SecurityAuthentication, "petstore_auth"?: SecurityAuthentication } @@ -76,6 +77,7 @@ export type HttpBearerConfiguration = { tokenProvider: TokenProvider }; export type OAuth2Configuration = { accessToken: string }; export type AuthMethodsConfiguration = { + "default"?: SecurityAuthentication, "api_key"?: ApiKeyConfiguration, "petstore_auth"?: OAuth2Configuration } @@ -90,6 +92,7 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine if (!config) { return authMethods; } + authMethods["default"] = config["default"] if (config["api_key"]) { authMethods["api_key"] = new ApiKeyAuthentication( diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts index 829c9d0363a8..a590e3ca4923 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts @@ -244,7 +244,7 @@ export class ObjectStoreApi { * Returns pet inventories by status * @param param the request object */ - public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> { + public getInventory(param: StoreApiGetInventoryRequest = {}, options?: Configuration): Promise<{ [key: string]: number; }> { return this.api.getInventory( options).toPromise(); } @@ -409,7 +409,7 @@ export class ObjectUserApi { * Logs out current logged in user session * @param param the request object */ - public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise { + public logoutUser(param: UserApiLogoutUserRequest = {}, options?: Configuration): Promise { return this.api.logoutUser( options).toPromise(); }