Skip to content

Commit

Permalink
Merge pull request #762 from thornbill/openapi-generator-7.7
Browse files Browse the repository at this point in the history 
Update openapi-generator to latest version
  • Loading branch information
@thornbill
thornbill authored Aug 6, 2024
2 parents 9abc042 + 350e761 commit 78ce47b
Show file tree
Hide file tree
Showing 225 changed files with 5,275 additions and 5,648 deletions.
2 changes: 1 addition & 1 deletion openapitools.json
View file
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.4.0",
"version": "7.7.0",
"generators": {
"axios": {
"generatorName": "typescript-axios",
Expand Down
3 changes: 2 additions & 1 deletion src/__tests__/api.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ vi.mock('axios', async () => {
return {
default: {
getUri: actual.getUri,
request: vi.fn()
request: vi.fn(),
defaults: {}
}
};
});
Expand Down
2 changes: 1 addition & 1 deletion src/generated-client/.openapi-generator/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.4.0
7.7.0
29 changes: 15 additions & 14 deletions src/generated-client/api/activity-log-api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@
*/


import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
import { Configuration } from '../configuration';
import type { Configuration } from '../configuration';
import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
import globalAxios from 'axios';
// Some imports not used depending on template conditions
// @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common';
// @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
// @ts-ignore
import { ActivityLogEntryQueryResult } from '../models';
import type { ActivityLogEntryQueryResult } from '../models';
/**
* ActivityLogApi - axios parameter creator
* @export
Expand All @@ -37,7 +38,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: AxiosRequestConfig = {}): Promise<RequestArgs> => {
getLogEntries: async (startIndex?: number, limit?: number, minDate?: string, hasUserId?: boolean, options: RawAxiosRequestConfig = {}): 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 @@ -102,9 +103,11 @@ 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?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ActivityLogEntryQueryResult>> {
async getLogEntries(startIndex?: number, limit?: number, minDate?: string, hasUserId?: boolean, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ActivityLogEntryQueryResult>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getLogEntries(startIndex, limit, minDate, hasUserId, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['ActivityLogApi.getLogEntries']?.[localVarOperationServerIndex]?.url;
return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
},
}
};
Expand All @@ -119,15 +122,12 @@ export const ActivityLogApiFactory = function (configuration?: Configuration, ba
/**
*
* @summary Gets activity log entries.
* @param {number} [startIndex] Optional. The record index to start at. All items with a lower index will be dropped from the results.
* @param {number} [limit] Optional. The maximum number of records to return.
* @param {string} [minDate] Optional. The minimum date. Format &#x3D; ISO.
* @param {boolean} [hasUserId] Optional. Filter log entries if it has user id, or not.
* @param {ActivityLogApiGetLogEntriesRequest} requestParameters Request parameters.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getLogEntries(startIndex?: number, limit?: number, minDate?: string, hasUserId?: boolean, options?: any): AxiosPromise<ActivityLogEntryQueryResult> {
return localVarFp.getLogEntries(startIndex, limit, minDate, hasUserId, options).then((request) => request(axios, basePath));
getLogEntries(requestParameters: ActivityLogApiGetLogEntriesRequest = {}, options?: RawAxiosRequestConfig): AxiosPromise<ActivityLogEntryQueryResult> {
return localVarFp.getLogEntries(requestParameters.startIndex, requestParameters.limit, requestParameters.minDate, requestParameters.hasUserId, options).then((request) => request(axios, basePath));
},
};
};
Expand Down Expand Up @@ -182,7 +182,8 @@ export class ActivityLogApi extends BaseAPI {
* @throws {RequiredError}
* @memberof ActivityLogApi
*/
public getLogEntries(requestParameters: ActivityLogApiGetLogEntriesRequest = {}, options?: AxiosRequestConfig) {
public getLogEntries(requestParameters: ActivityLogApiGetLogEntriesRequest = {}, options?: RawAxiosRequestConfig) {
return ActivityLogApiFp(this.configuration).getLogEntries(requestParameters.startIndex, requestParameters.limit, requestParameters.minDate, requestParameters.hasUserId, options).then((request) => request(this.axios, this.basePath));
}
}

54 changes: 31 additions & 23 deletions src/generated-client/api/api-key-api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@
*/


import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
import { Configuration } from '../configuration';
import type { Configuration } from '../configuration';
import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
import globalAxios from 'axios';
// Some imports not used depending on template conditions
// @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common';
// @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
// @ts-ignore
import { AuthenticationInfoQueryResult } from '../models';
import type { AuthenticationInfoQueryResult } from '../models';
/**
* ApiKeyApi - axios parameter creator
* @export
Expand All @@ -34,7 +35,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
createKey: async (app: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
createKey: async (app: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'app' is not null or undefined
assertParamExists('createKey', 'app', app)
const localVarPath = `/Auth/Keys`;
Expand Down Expand Up @@ -73,7 +74,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getKeys: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
getKeys: async (options: RawAxiosRequestConfig = {}): 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 Down Expand Up @@ -107,7 +108,7 @@ export const ApiKeyApiAxiosParamCreator = function (configuration?: Configuratio
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
revokeKey: async (key: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
revokeKey: async (key: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'key' is not null or undefined
assertParamExists('revokeKey', 'key', key)
const localVarPath = `/Auth/Keys/{key}`
Expand Down Expand Up @@ -154,19 +155,23 @@ export const ApiKeyApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async createKey(app: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
async createKey(app: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.createKey(app, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['ApiKeyApi.createKey']?.[localVarOperationServerIndex]?.url;
return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
},
/**
*
* @summary Get all keys.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async getKeys(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AuthenticationInfoQueryResult>> {
async getKeys(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AuthenticationInfoQueryResult>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getKeys(options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['ApiKeyApi.getKeys']?.[localVarOperationServerIndex]?.url;
return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
},
/**
*
Expand All @@ -175,9 +180,11 @@ export const ApiKeyApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async revokeKey(key: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
async revokeKey(key: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.revokeKey(key, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['ApiKeyApi.revokeKey']?.[localVarOperationServerIndex]?.url;
return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
},
}
};
Expand All @@ -192,31 +199,31 @@ export const ApiKeyApiFactory = function (configuration?: Configuration, basePat
/**
*
* @summary Create a new api key.
* @param {string} app Name of the app using the authentication key.
* @param {ApiKeyApiCreateKeyRequest} requestParameters Request parameters.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
createKey(app: string, options?: any): AxiosPromise<void> {
return localVarFp.createKey(app, options).then((request) => request(axios, basePath));
createKey(requestParameters: ApiKeyApiCreateKeyRequest, options?: RawAxiosRequestConfig): AxiosPromise<void> {
return localVarFp.createKey(requestParameters.app, options).then((request) => request(axios, basePath));
},
/**
*
* @summary Get all keys.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getKeys(options?: any): AxiosPromise<AuthenticationInfoQueryResult> {
getKeys(options?: RawAxiosRequestConfig): AxiosPromise<AuthenticationInfoQueryResult> {
return localVarFp.getKeys(options).then((request) => request(axios, basePath));
},
/**
*
* @summary Remove an api key.
* @param {string} key The access token to delete.
* @param {ApiKeyApiRevokeKeyRequest} requestParameters Request parameters.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
revokeKey(key: string, options?: any): AxiosPromise<void> {
return localVarFp.revokeKey(key, options).then((request) => request(axios, basePath));
revokeKey(requestParameters: ApiKeyApiRevokeKeyRequest, options?: RawAxiosRequestConfig): AxiosPromise<void> {
return localVarFp.revokeKey(requestParameters.key, options).then((request) => request(axios, basePath));
},
};
};
Expand Down Expand Up @@ -264,7 +271,7 @@ export class ApiKeyApi extends BaseAPI {
* @throws {RequiredError}
* @memberof ApiKeyApi
*/
public createKey(requestParameters: ApiKeyApiCreateKeyRequest, options?: AxiosRequestConfig) {
public createKey(requestParameters: ApiKeyApiCreateKeyRequest, options?: RawAxiosRequestConfig) {
return ApiKeyApiFp(this.configuration).createKey(requestParameters.app, options).then((request) => request(this.axios, this.basePath));
}

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

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

Loading

0 comments on commit 78ce47b

Please sign in to comment.