Skip to content

[typescript-axios][client] Allow apiKey type Promise. #5953

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.

Sign up for GitHub

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

Merged
macjohnny merged 2 commits into from
Apr 16, 2020
Merged

[typescript-axios][client] Allow apiKey type Promise. #5953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d4e2f4
change apiKey type
tanmen Apr 16, 2020
db49c79
recreate sample
tanmen Apr 16, 2020
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
Prev Previous commit
recreate sample
  • Loading branch information
@tanmen
tanmen committed Apr 16, 2020
commit db49c796c5b4ed0508e54525220d4ef0122cbd1e
208 changes: 104 additions & 104 deletions samples/client/petstore/typescript-axios/builds/default/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-axios/builds/default/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


export interface ConfigurationParameters {
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
username?: string;
password?: string;
accessToken?: string | ((name?: string, scopes?: string[]) => string);
Expand All @@ -27,7 +27,7 @@ export class Configuration {
* @param name security name
* @memberof Configuration
*/
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
/**
* parameter for basic security
*
Expand Down
208 changes: 104 additions & 104 deletions samples/client/petstore/typescript-axios/builds/es6-target/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


export interface ConfigurationParameters {
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
username?: string;
password?: string;
accessToken?: string | ((name?: string, scopes?: string[]) => string);
Expand All @@ -27,7 +27,7 @@ export class Configuration {
* @param name security name
* @memberof Configuration
*/
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
/**
* parameter for basic security
*
Expand Down
208 changes: 104 additions & 104 deletions samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


export interface ConfigurationParameters {
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
username?: string;
password?: string;
accessToken?: string | ((name?: string, scopes?: string[]) => string);
Expand All @@ -27,7 +27,7 @@ export class Configuration {
* @param name security name
* @memberof Configuration
*/
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
/**
* parameter for basic security
*
Expand Down
208 changes: 104 additions & 104 deletions samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


export interface ConfigurationParameters {
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
username?: string;
password?: string;
accessToken?: string | ((name?: string, scopes?: string[]) => string);
Expand All @@ -27,7 +27,7 @@ export class Configuration {
* @param name security name
* @memberof Configuration
*/
apiKey?: string | ((name: string) => string);
apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
/**
* parameter for basic security
*
Expand Down
84 changes: 42 additions & 42 deletions ...pt-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions ...-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
deleteOrder(orderId: string, options: any = {}): RequestArgs {
deleteOrder: async (orderId: string, options: any = {}): Promise<RequestArgs> => {
// verify required parameter 'orderId' is not null or undefined
if (orderId === null || orderId === undefined) {
throw new RequiredError('orderId','Required parameter orderId was null or undefined when calling deleteOrder.');
Expand Down Expand Up @@ -68,7 +68,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getInventory(options: any = {}): RequestArgs {
getInventory: async (options: any = {}): Promise<RequestArgs> => {
const localVarPath = `/store/inventory`;
const localVarUrlObj = globalImportUrl.parse(localVarPath, true);
let baseOptions;
Expand All @@ -82,8 +82,8 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
// authentication api_key required
if (configuration && configuration.apiKey) {
const localVarApiKeyValue = typeof configuration.apiKey === 'function'
? configuration.apiKey("api_key")
: configuration.apiKey;
? await configuration.apiKey("api_key")
: await configuration.apiKey;
localVarHeaderParameter["api_key"] = localVarApiKeyValue;
}

Expand All @@ -107,7 +107,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getOrderById(orderId: number, options: any = {}): RequestArgs {
getOrderById: async (orderId: number, options: any = {}): Promise<RequestArgs> => {
// verify required parameter 'orderId' is not null or undefined
if (orderId === null || orderId === undefined) {
throw new RequiredError('orderId','Required parameter orderId was null or undefined when calling getOrderById.');
Expand Down Expand Up @@ -143,7 +143,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
placeOrder(body: Order, options: any = {}): RequestArgs {
placeOrder: async (body: Order, options: any = {}): Promise<RequestArgs> => {
// verify required parameter 'body' is not null or undefined
if (body === null || body === undefined) {
throw new RequiredError('body','Required parameter body was null or undefined when calling placeOrder.');
Expand Down Expand Up @@ -191,8 +191,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
deleteOrder(orderId: string, options?: any): (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void> {
const localVarAxiosArgs = StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options);
async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
Expand All @@ -204,8 +204,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getInventory(options?: any): (axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }> {
const localVarAxiosArgs = StoreApiAxiosParamCreator(configuration).getInventory(options);
async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
Expand All @@ -218,8 +218,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getOrderById(orderId: number, options?: any): (axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order> {
const localVarAxiosArgs = StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options);
async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
Expand All @@ -232,8 +232,8 @@ export const StoreApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
placeOrder(body: Order, options?: any): (axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order> {
const localVarAxiosArgs = StoreApiAxiosParamCreator(configuration).placeOrder(body, options);
async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Order>> {
const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
Expand All @@ -256,7 +256,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @throws {RequiredError}
*/
deleteOrder(orderId: string, options?: any): AxiosPromise<void> {
return StoreApiFp(configuration).deleteOrder(orderId, options)(axios, basePath);
return StoreApiFp(configuration).deleteOrder(orderId, options).then((request) => request(axios, basePath));
},
/**
* Returns a map of status codes to quantities
Expand All @@ -265,7 +265,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @throws {RequiredError}
*/
getInventory(options?: any): AxiosPromise<{ [key: string]: number; }> {
return StoreApiFp(configuration).getInventory(options)(axios, basePath);
return StoreApiFp(configuration).getInventory(options).then((request) => request(axios, basePath));
},
/**
* For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
Expand All @@ -275,7 +275,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @throws {RequiredError}
*/
getOrderById(orderId: number, options?: any): AxiosPromise<Order> {
return StoreApiFp(configuration).getOrderById(orderId, options)(axios, basePath);
return StoreApiFp(configuration).getOrderById(orderId, options).then((request) => request(axios, basePath));
},
/**
*
Expand All @@ -285,7 +285,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @throws {RequiredError}
*/
placeOrder(body: Order, options?: any): AxiosPromise<Order> {
return StoreApiFp(configuration).placeOrder(body, options)(axios, basePath);
return StoreApiFp(configuration).placeOrder(body, options).then((request) => request(axios, basePath));
},
};
};
Expand All @@ -306,7 +306,7 @@ export class StoreApi extends BaseAPI {
* @memberof StoreApi
*/
public deleteOrder(orderId: string, options?: any) {
return StoreApiFp(this.configuration).deleteOrder(orderId, options)(this.axios, this.basePath);
return StoreApiFp(this.configuration).deleteOrder(orderId, options).then((request) => request(this.axios, this.basePath));
}

/**
Expand All @@ -317,7 +317,7 @@ export class StoreApi extends BaseAPI {
* @memberof StoreApi
*/
public getInventory(options?: any) {
return StoreApiFp(this.configuration).getInventory(options)(this.axios, this.basePath);
return StoreApiFp(this.configuration).getInventory(options).then((request) => request(this.axios, this.basePath));
}

/**
Expand All @@ -329,7 +329,7 @@ export class StoreApi extends BaseAPI {
* @memberof StoreApi
*/
public getOrderById(orderId: number, options?: any) {
return StoreApiFp(this.configuration).getOrderById(orderId, options)(this.axios, this.basePath);
return StoreApiFp(this.configuration).getOrderById(orderId, options).then((request) => request(this.axios, this.basePath));
}

/**
Expand All @@ -341,7 +341,7 @@ export class StoreApi extends BaseAPI {
* @memberof StoreApi
*/
public placeOrder(body: Order, options?: any) {
return StoreApiFp(this.configuration).placeOrder(body, options)(this.axios, this.basePath);
return StoreApiFp(this.configuration).placeOrder(body, options).then((request) => request(this.axios, this.basePath));
}

}
Loading