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.

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

Update openapi generator #350

Merged
merged 3 commits into from
Dec 9, 2022
Merged

Update openapi generator #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa141fb
Update openapi tools version to latest 5.x release
thornbill Dec 7, 2022
59d9634
Rebuild generated client
thornbill Dec 7, 2022
d28c1c3
Fix getItemImageUrl param type
thornbill Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion openapitools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
"spaces": 2,
"generator-cli": {
"version": "5.2.1",
"version": "5.4.0",
"generators": {
"axios": {
"generatorName": "typescript-axios",
Expand Down
6 changes: 5 additions & 1 deletion src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ export class Api {
* @param params Additional request parameters.
* @returns The image URL.
*/
getItemImageUrl(itemId: string, imageType = ImageType.Primary, params: ImageRequestParameters = {}): string | undefined {
getItemImageUrl(
itemId: string,
imageType: ImageType = ImageType.Primary,
params: ImageRequestParameters = {}
): string | undefined {
// TODO: We could probably use ImageApiAxiosParamCreator to make this more robust
return globalInstance.create({
baseURL: this.basePath
Expand Down
2 changes: 1 addition & 1 deletion src/generated-client/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.1
5.4.0
10 changes: 5 additions & 5 deletions src/generated-client/api/activity-log-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/


import globalAxios, { AxiosPromise, AxiosInstance } from 'axios';
import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
import { Configuration } from '../configuration';
// Some imports not used depending on template conditions
// @ts-ignore
Expand All @@ -37,7 +37,7 @@ export const ActivityLogApiAxiosParamCreator = function (configuration?: Configu
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getLogEntries: async (startIndex?: number, limit?: number, minDate?: string, hasUserId?: boolean, options: any = {}): Promise<RequestArgs> => {
getLogEntries: async (startIndex?: number, limit?: number, minDate?: string, hasUserId?: boolean, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
const localVarPath = `/System/ActivityLog/Entries`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
Expand Down Expand Up @@ -73,7 +73,7 @@ export const ActivityLogApiAxiosParamCreator = function (configuration?: Configu



setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};

Expand Down Expand Up @@ -102,7 +102,7 @@ export const ActivityLogApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async getLogEntries(startIndex?: number, limit?: number, minDate?: string, hasUserId?: boolean, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ActivityLogEntryQueryResult>> {
async getLogEntries(startIndex?: number, limit?: number, minDate?: string, hasUserId?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ActivityLogEntryQueryResult>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getLogEntries(startIndex, limit, minDate, hasUserId, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
Expand Down Expand Up @@ -182,7 +182,7 @@ export class ActivityLogApi extends BaseAPI {
* @throws {RequiredError}
* @memberof ActivityLogApi
*/
public getLogEntries(requestParameters: ActivityLogApiGetLogEntriesRequest = {}, options?: any) {
public getLogEntries(requestParameters: ActivityLogApiGetLogEntriesRequest = {}, options?: AxiosRequestConfig) {
return ActivityLogApiFp(this.configuration).getLogEntries(requestParameters.startIndex, requestParameters.limit, requestParameters.minDate, requestParameters.hasUserId, options).then((request) => request(this.axios, this.basePath));
}
}
26 changes: 13 additions & 13 deletions src/generated-client/api/api-key-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/


import globalAxios, { AxiosPromise, AxiosInstance } from 'axios';
import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
import { Configuration } from '../configuration';
// Some imports not used depending on template conditions
// @ts-ignore
Expand All @@ -34,7 +34,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
createKey: async (app: string, options: any = {}): Promise<RequestArgs> => {
createKey: async (app: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'app' is not null or undefined
assertParamExists('createKey', 'app', app)
const localVarPath = `/Auth/Keys`;
Expand All @@ -58,7 +58,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio



setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};

Expand All @@ -73,7 +73,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getKeys: async (options: any = {}): Promise<RequestArgs> => {
getKeys: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
const localVarPath = `/Auth/Keys`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
Expand All @@ -91,7 +91,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio



setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};

Expand All @@ -107,7 +107,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
revokeKey: async (key: string, options: any = {}): Promise<RequestArgs> => {
revokeKey: async (key: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'key' is not null or undefined
assertParamExists('revokeKey', 'key', key)
const localVarPath = `/Auth/Keys/{key}`
Expand All @@ -128,7 +128,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio



setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};

Expand All @@ -154,7 +154,7 @@ export const ApiKeyApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async createKey(app: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
async createKey(app: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.createKey(app, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
Expand All @@ -164,7 +164,7 @@ export const ApiKeyApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async getKeys(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AuthenticationInfoQueryResult>> {
async getKeys(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AuthenticationInfoQueryResult>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getKeys(options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
Expand All @@ -175,7 +175,7 @@ export const ApiKeyApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async revokeKey(key: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
async revokeKey(key: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.revokeKey(key, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
Expand Down Expand Up @@ -264,7 +264,7 @@ export class ApiKeyApi extends BaseAPI {
* @throws {RequiredError}
* @memberof ApiKeyApi
*/
public createKey(requestParameters: ApiKeyApiCreateKeyRequest, options?: any) {
public createKey(requestParameters: ApiKeyApiCreateKeyRequest, options?: AxiosRequestConfig) {
return ApiKeyApiFp(this.configuration).createKey(requestParameters.app, options).then((request) => request(this.axios, this.basePath));
}

Expand All @@ -275,7 +275,7 @@ export class ApiKeyApi extends BaseAPI {
* @throws {RequiredError}
* @memberof ApiKeyApi
*/
public getKeys(options?: any) {
public getKeys(options?: AxiosRequestConfig) {
return ApiKeyApiFp(this.configuration).getKeys(options).then((request) => request(this.axios, this.basePath));
}

Expand All @@ -287,7 +287,7 @@ export class ApiKeyApi extends BaseAPI {
* @throws {RequiredError}
* @memberof ApiKeyApi
*/
public revokeKey(requestParameters: ApiKeyApiRevokeKeyRequest, options?: any) {
public revokeKey(requestParameters: ApiKeyApiRevokeKeyRequest, options?: AxiosRequestConfig) {
return ApiKeyApiFp(this.configuration).revokeKey(requestParameters.key, options).then((request) => request(this.axios, this.basePath));
}
}
Loading