Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[typescript] Default auth method support and optional param object when all params optional #11321

Merged
merged 23 commits into from
Jan 22, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { URLSearchParams } from 'url';
{{/node}}
{{/platforms}}
import {ObjectSerializer} from '../models/ObjectSerializer{{extensionForDeno}}';
import { SecurityAuthentication } from '../auth/auth';
import {ApiException} from './exception{{extensionForDeno}}';
import {canConsumeForm, isCodeInRange} from '../util{{extensionForDeno}}';

Expand All @@ -28,6 +29,11 @@ import { {{classname}} } from '..{{filename}}{{extensionForDeno}}';
@injectable()
{{/useInversify}}
export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
private defaultSecurityAuthentication: SecurityAuthentication | undefined;
davidgamero marked this conversation as resolved.
Show resolved Hide resolved

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.defaultSecurityAuthentication = auth;
}

{{#operation}}
/**
Expand Down Expand Up @@ -151,11 +157,11 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
{{/bodyParam}}

{{#hasAuthMethods}}
let authMethod = null;
let authMethod: SecurityAuthentication | undefined;
{{/hasAuthMethods}}
{{#authMethods}}
// Apply auth methods
authMethod = _config.authMethods["{{name}}"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["{{name}}"]
davidgamero marked this conversation as resolved.
Show resolved Hide resolved
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export abstract class AbstractObject{{classname}} {
{{/summary}}
* @param param the request object
*/
public abstract {{nickname}}(param: req.{{classname}}{{operationIdCamelCase}}Request, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{{returnType}}}{{^returnType}}void{{/returnType}}>;
public abstract {{nickname}}(param: req.{{classname}}{{operationIdCamelCase}}Request {{^hasRequiredParams}} = {}{{/hasRequiredParams}}, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{{returnType}}}{{^returnType}}void{{/returnType}}>;

{{/operation}}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}};
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ResponseContext, RequestContext, HttpFile } from '../http/http{{extensionForDeno}}';
import * as models from '../models/all{{extensionForDeno}}';
import { Configuration} from '../configuration{{extensionForDeno}}'
import { SecurityAuthentication } from '../auth/auth';
import { Observable, of, from } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{extensionForDeno}}'{{/useRxJS}};
import {mergeMap, map} from {{#useRxJS}}'rxjs/operators'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{extensionForDeno}}'{{/useRxJS}};
{{#useInversify}}
Expand Down Expand Up @@ -50,6 +51,10 @@ export class Observable{{classname}} {
this.responseProcessor = responseProcessor || new {{classname}}ResponseProcessor();
}

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.requestFactory.setDefaultSecurityAuthentication(auth);
}

{{#operation}}
/**
{{#notes}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ResponseContext, RequestContext, HttpFile } from '../http/http{{extensionForDeno}}';
import * as models from '../models/all{{extensionForDeno}}';
import { Configuration} from '../configuration{{extensionForDeno}}'
import { SecurityAuthentication } from '../auth/auth';
{{#useInversify}}
import { injectable, inject, optional } from "inversify";
import { AbstractConfiguration } from "../services/configuration";
Expand Down Expand Up @@ -40,6 +41,10 @@ export class Promise{{classname}} {
this.api = new Observable{{classname}}(configuration, requestFactory, responseProcessor);
}

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.api.setDefaultSecurityAuthentication(auth);
}

{{#operation}}
/**
{{#notes}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { BaseAPIRequestFactory, RequiredError } from './baseapi';
import {Configuration} from '../configuration';
import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
import {ObjectSerializer} from '../models/ObjectSerializer';
import { SecurityAuthentication } from '../auth/auth';
import {ApiException} from './exception';
import {canConsumeForm, isCodeInRange} from '../util';

Expand All @@ -17,6 +18,11 @@ import { PetByType } from '../models/PetByType';
* no description
*/
export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
private defaultSecurityAuthentication: SecurityAuthentication | undefined;

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.defaultSecurityAuthentication = auth;
}

/**
* @param inlineObject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,21 @@ export class ObjectDefaultApi {
/**
* @param param the request object
*/
public filePost(param: DefaultApiFilePostRequest, options?: Configuration): Promise<void> {
public filePost(param: DefaultApiFilePostRequest = {}, options?: Configuration): Promise<void> {
return this.api.filePost(param.inlineObject, options).toPromise();
}

/**
* @param param the request object
*/
public petsFilteredPatch(param: DefaultApiPetsFilteredPatchRequest, options?: Configuration): Promise<void> {
public petsFilteredPatch(param: DefaultApiPetsFilteredPatchRequest = {}, options?: Configuration): Promise<void> {
return this.api.petsFilteredPatch(param.petByAgePetByType, options).toPromise();
}

/**
* @param param the request object
*/
public petsPatch(param: DefaultApiPetsPatchRequest, options?: Configuration): Promise<void> {
public petsPatch(param: DefaultApiPetsPatchRequest = {}, options?: Configuration): Promise<void> {
return this.api.petsPatch(param.catDog, options).toPromise();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ResponseContext, RequestContext, HttpFile } from '../http/http';
import * as models from '../models/all';
import { Configuration} from '../configuration'
import { SecurityAuthentication } from '../auth/auth';
import { Observable, of, from } from '../rxjsStub';
import {mergeMap, map} from '../rxjsStub';
import { Cat } from '../models/Cat';
Expand All @@ -27,6 +28,10 @@ export class ObservableDefaultApi {
this.responseProcessor = responseProcessor || new DefaultApiResponseProcessor();
}

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.requestFactory.setDefaultSecurityAuthentication(auth);
}

/**
* @param inlineObject
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ResponseContext, RequestContext, HttpFile } from '../http/http';
import * as models from '../models/all';
import { Configuration} from '../configuration'
import { SecurityAuthentication } from '../auth/auth';

import { Cat } from '../models/Cat';
import { CatAllOf } from '../models/CatAllOf';
Expand All @@ -23,6 +24,10 @@ export class PromiseDefaultApi {
this.api = new ObservableDefaultApi(configuration, requestFactory, responseProcessor);
}

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.api.setDefaultSecurityAuthentication(auth);
}

/**
* @param inlineObject
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/ht
import * as FormData from "form-data";
import { URLSearchParams } from 'url';
import {ObjectSerializer} from '../models/ObjectSerializer';
import { SecurityAuthentication } from '../auth/auth';
import {ApiException} from './exception';
import {canConsumeForm, isCodeInRange} from '../util';

Expand All @@ -16,6 +17,11 @@ import { Pet } from '../models/Pet';
* no description
*/
export class PetApiRequestFactory extends BaseAPIRequestFactory {
private defaultSecurityAuthentication: SecurityAuthentication | undefined;

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.defaultSecurityAuthentication = auth;
}

/**
* Add a new pet to the store
Expand Down Expand Up @@ -51,9 +57,9 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
);
requestContext.setBody(serializedBody);

let authMethod = null;
let authMethod: SecurityAuthentication | undefined;
// Apply auth methods
authMethod = _config.authMethods["petstore_auth"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["petstore_auth"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down Expand Up @@ -88,9 +94,9 @@ 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"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["petstore_auth"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down Expand Up @@ -125,9 +131,9 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
}


let authMethod = null;
let authMethod: SecurityAuthentication | undefined;
// Apply auth methods
authMethod = _config.authMethods["petstore_auth"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["petstore_auth"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down Expand Up @@ -162,9 +168,9 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
}


let authMethod = null;
let authMethod: SecurityAuthentication | undefined;
// Apply auth methods
authMethod = _config.authMethods["petstore_auth"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["petstore_auth"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down Expand Up @@ -195,9 +201,9 @@ 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"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["api_key"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down Expand Up @@ -239,9 +245,9 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
);
requestContext.setBody(serializedBody);

let authMethod = null;
let authMethod: SecurityAuthentication | undefined;
// Apply auth methods
authMethod = _config.authMethods["petstore_auth"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["petstore_auth"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down Expand Up @@ -304,9 +310,9 @@ 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"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["petstore_auth"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down Expand Up @@ -371,9 +377,9 @@ 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"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["petstore_auth"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/ht
import * as FormData from "form-data";
import { URLSearchParams } from 'url';
import {ObjectSerializer} from '../models/ObjectSerializer';
import { SecurityAuthentication } from '../auth/auth';
import {ApiException} from './exception';
import {canConsumeForm, isCodeInRange} from '../util';

Expand All @@ -15,6 +16,11 @@ import { Order } from '../models/Order';
* no description
*/
export class StoreApiRequestFactory extends BaseAPIRequestFactory {
private defaultSecurityAuthentication: SecurityAuthentication | undefined;

public setDefaultSecurityAuthentication(auth: SecurityAuthentication){
this.defaultSecurityAuthentication = auth;
}

/**
* For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
Expand Down Expand Up @@ -58,9 +64,9 @@ 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"]
authMethod = this.defaultSecurityAuthentication || _config.authMethods["api_key"]
if (authMethod) {
await authMethod.applySecurityAuthentication(requestContext);
}
Expand Down
Loading