diff --git a/cli/src/api/open-api/api.ts b/cli/src/api/open-api/api.ts index b00b0deb5f..9f4d765f2d 100644 --- a/cli/src/api/open-api/api.ts +++ b/cli/src/api/open-api/api.ts @@ -4528,9 +4528,9 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - createKey: async (aPIKeyCreateDto: APIKeyCreateDto, options: AxiosRequestConfig = {}): Promise => { + createApiKey: async (aPIKeyCreateDto: APIKeyCreateDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'aPIKeyCreateDto' is not null or undefined - assertParamExists('createKey', 'aPIKeyCreateDto', aPIKeyCreateDto) + assertParamExists('createApiKey', 'aPIKeyCreateDto', aPIKeyCreateDto) const localVarPath = `/api-key`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -4572,9 +4572,9 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deleteKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { + deleteApiKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined - assertParamExists('deleteKey', 'id', id) + assertParamExists('deleteApiKey', 'id', id) const localVarPath = `/api-key/{id}` .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. @@ -4614,9 +4614,9 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { + getApiKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined - assertParamExists('getKey', 'id', id) + assertParamExists('getApiKey', 'id', id) const localVarPath = `/api-key/{id}` .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. @@ -4655,7 +4655,7 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKeys: async (options: AxiosRequestConfig = {}): Promise => { + getApiKeys: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api-key`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -4695,11 +4695,11 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - updateKey: async (id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options: AxiosRequestConfig = {}): Promise => { + updateApiKey: async (id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined - assertParamExists('updateKey', 'id', id) + assertParamExists('updateApiKey', 'id', id) // verify required parameter 'aPIKeyUpdateDto' is not null or undefined - assertParamExists('updateKey', 'aPIKeyUpdateDto', aPIKeyUpdateDto) + assertParamExists('updateApiKey', 'aPIKeyUpdateDto', aPIKeyUpdateDto) const localVarPath = `/api-key/{id}` .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. @@ -4752,8 +4752,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async createKey(aPIKeyCreateDto: APIKeyCreateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.createKey(aPIKeyCreateDto, options); + async createApiKey(aPIKeyCreateDto: APIKeyCreateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.createApiKey(aPIKeyCreateDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4762,8 +4762,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async deleteKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.deleteKey(id, options); + async deleteApiKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.deleteApiKey(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4772,8 +4772,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getKey(id, options); + async getApiKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getApiKey(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4781,8 +4781,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getKeys(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getKeys(options); + async getApiKeys(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getApiKeys(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4792,8 +4792,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async updateKey(id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.updateKey(id, aPIKeyUpdateDto, options); + async updateApiKey(id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.updateApiKey(id, aPIKeyUpdateDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -4808,110 +4808,110 @@ export const APIKeyApiFactory = function (configuration?: Configuration, basePat return { /** * - * @param {APIKeyApiCreateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiCreateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - createKey(requestParameters: APIKeyApiCreateKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.createKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(axios, basePath)); + createApiKey(requestParameters: APIKeyApiCreateApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.createApiKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(axios, basePath)); }, /** * - * @param {APIKeyApiDeleteKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiDeleteApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deleteKey(requestParameters: APIKeyApiDeleteKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.deleteKey(requestParameters.id, options).then((request) => request(axios, basePath)); + deleteApiKey(requestParameters: APIKeyApiDeleteApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.deleteApiKey(requestParameters.id, options).then((request) => request(axios, basePath)); }, /** * - * @param {APIKeyApiGetKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiGetApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKey(requestParameters: APIKeyApiGetKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getKey(requestParameters.id, options).then((request) => request(axios, basePath)); + getApiKey(requestParameters: APIKeyApiGetApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getApiKey(requestParameters.id, options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKeys(options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getKeys(options).then((request) => request(axios, basePath)); + getApiKeys(options?: AxiosRequestConfig): AxiosPromise> { + return localVarFp.getApiKeys(options).then((request) => request(axios, basePath)); }, /** * - * @param {APIKeyApiUpdateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiUpdateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - updateKey(requestParameters: APIKeyApiUpdateKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.updateKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(axios, basePath)); + updateApiKey(requestParameters: APIKeyApiUpdateApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.updateApiKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(axios, basePath)); }, }; }; /** - * Request parameters for createKey operation in APIKeyApi. + * Request parameters for createApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiCreateKeyRequest + * @interface APIKeyApiCreateApiKeyRequest */ -export interface APIKeyApiCreateKeyRequest { +export interface APIKeyApiCreateApiKeyRequest { /** * * @type {APIKeyCreateDto} - * @memberof APIKeyApiCreateKey + * @memberof APIKeyApiCreateApiKey */ readonly aPIKeyCreateDto: APIKeyCreateDto } /** - * Request parameters for deleteKey operation in APIKeyApi. + * Request parameters for deleteApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiDeleteKeyRequest + * @interface APIKeyApiDeleteApiKeyRequest */ -export interface APIKeyApiDeleteKeyRequest { +export interface APIKeyApiDeleteApiKeyRequest { /** * * @type {string} - * @memberof APIKeyApiDeleteKey + * @memberof APIKeyApiDeleteApiKey */ readonly id: string } /** - * Request parameters for getKey operation in APIKeyApi. + * Request parameters for getApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiGetKeyRequest + * @interface APIKeyApiGetApiKeyRequest */ -export interface APIKeyApiGetKeyRequest { +export interface APIKeyApiGetApiKeyRequest { /** * * @type {string} - * @memberof APIKeyApiGetKey + * @memberof APIKeyApiGetApiKey */ readonly id: string } /** - * Request parameters for updateKey operation in APIKeyApi. + * Request parameters for updateApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiUpdateKeyRequest + * @interface APIKeyApiUpdateApiKeyRequest */ -export interface APIKeyApiUpdateKeyRequest { +export interface APIKeyApiUpdateApiKeyRequest { /** * * @type {string} - * @memberof APIKeyApiUpdateKey + * @memberof APIKeyApiUpdateApiKey */ readonly id: string /** * * @type {APIKeyUpdateDto} - * @memberof APIKeyApiUpdateKey + * @memberof APIKeyApiUpdateApiKey */ readonly aPIKeyUpdateDto: APIKeyUpdateDto } @@ -4925,35 +4925,35 @@ export interface APIKeyApiUpdateKeyRequest { export class APIKeyApi extends BaseAPI { /** * - * @param {APIKeyApiCreateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiCreateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public createKey(requestParameters: APIKeyApiCreateKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).createKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(this.axios, this.basePath)); + public createApiKey(requestParameters: APIKeyApiCreateApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).createApiKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {APIKeyApiDeleteKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiDeleteApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public deleteKey(requestParameters: APIKeyApiDeleteKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).deleteKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); + public deleteApiKey(requestParameters: APIKeyApiDeleteApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).deleteApiKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {APIKeyApiGetKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiGetApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public getKey(requestParameters: APIKeyApiGetKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).getKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); + public getApiKey(requestParameters: APIKeyApiGetApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).getApiKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** @@ -4962,19 +4962,19 @@ export class APIKeyApi extends BaseAPI { * @throws {RequiredError} * @memberof APIKeyApi */ - public getKeys(options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).getKeys(options).then((request) => request(this.axios, this.basePath)); + public getApiKeys(options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).getApiKeys(options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {APIKeyApiUpdateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiUpdateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public updateKey(requestParameters: APIKeyApiUpdateKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).updateKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(this.axios, this.basePath)); + public updateApiKey(requestParameters: APIKeyApiUpdateApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).updateApiKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -6433,9 +6433,9 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - bulkUploadCheck: async (assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options: AxiosRequestConfig = {}): Promise => { + checkBulkUpload: async (assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'assetBulkUploadCheckDto' is not null or undefined - assertParamExists('bulkUploadCheck', 'assetBulkUploadCheckDto', assetBulkUploadCheckDto) + assertParamExists('checkBulkUpload', 'assetBulkUploadCheckDto', assetBulkUploadCheckDto) const localVarPath = `/asset/bulk-upload-check`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6856,7 +6856,7 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetStats: async (isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options: AxiosRequestConfig = {}): Promise => { + getAssetStatistics: async (isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/asset/statistics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6944,98 +6944,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {TimeBucketSize} size - * @param {string} timeBucket - * @param {string} [userId] - * @param {string} [albumId] - * @param {string} [personId] - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] - * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getByTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'size' is not null or undefined - assertParamExists('getByTimeBucket', 'size', size) - // verify required parameter 'timeBucket' is not null or undefined - assertParamExists('getByTimeBucket', 'timeBucket', timeBucket) - const localVarPath = `/asset/time-bucket`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - // authentication cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - if (size !== undefined) { - localVarQueryParameter['size'] = size; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; - } - - if (albumId !== undefined) { - localVarQueryParameter['albumId'] = albumId; - } - - if (personId !== undefined) { - localVarQueryParameter['personId'] = personId; - } - - if (isArchived !== undefined) { - localVarQueryParameter['isArchived'] = isArchived; - } - - if (isFavorite !== undefined) { - localVarQueryParameter['isFavorite'] = isFavorite; - } - - if (isTrashed !== undefined) { - localVarQueryParameter['isTrashed'] = isTrashed; - } - - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; - } - - if (timeBucket !== undefined) { - localVarQueryParameter['timeBucket'] = timeBucket; - } - - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - - - setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -7318,6 +7226,98 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {TimeBucketSize} size + * @param {string} timeBucket + * @param {string} [userId] + * @param {string} [albumId] + * @param {string} [personId] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] + * @param {boolean} [isTrashed] + * @param {boolean} [withStacked] + * @param {string} [key] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'size' is not null or undefined + assertParamExists('getTimeBucket', 'size', size) + // verify required parameter 'timeBucket' is not null or undefined + assertParamExists('getTimeBucket', 'timeBucket', timeBucket) + const localVarPath = `/asset/time-bucket`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication cookie required + + // authentication api_key required + await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) + + // authentication bearer required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) + + if (size !== undefined) { + localVarQueryParameter['size'] = size; + } + + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; + } + + if (albumId !== undefined) { + localVarQueryParameter['albumId'] = albumId; + } + + if (personId !== undefined) { + localVarQueryParameter['personId'] = personId; + } + + if (isArchived !== undefined) { + localVarQueryParameter['isArchived'] = isArchived; + } + + if (isFavorite !== undefined) { + localVarQueryParameter['isFavorite'] = isFavorite; + } + + if (isTrashed !== undefined) { + localVarQueryParameter['isTrashed'] = isTrashed; + } + + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; + } + + if (timeBucket !== undefined) { + localVarQueryParameter['timeBucket'] = timeBucket; + } + + if (key !== undefined) { + localVarQueryParameter['key'] = key; + } + + + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -8011,8 +8011,8 @@ export const AssetApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async bulkUploadCheck(assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.bulkUploadCheck(assetBulkUploadCheckDto, options); + async checkBulkUpload(assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.checkBulkUpload(assetBulkUploadCheckDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8109,8 +8109,8 @@ export const AssetApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAssetStats(isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetStats(isArchived, isFavorite, isTrashed, options); + async getAssetStatistics(isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetStatistics(isArchived, isFavorite, isTrashed, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8125,25 +8125,6 @@ export const AssetApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetThumbnail(id, format, key, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {TimeBucketSize} size - * @param {string} timeBucket - * @param {string} [userId] - * @param {string} [albumId] - * @param {string} [personId] - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] - * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async getByTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {*} [options] Override http request option. @@ -8207,6 +8188,25 @@ export const AssetApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.getRandom(count, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {TimeBucketSize} size + * @param {string} timeBucket + * @param {string} [userId] + * @param {string} [albumId] + * @param {string} [personId] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] + * @param {boolean} [isTrashed] + * @param {boolean} [withStacked] + * @param {string} [key] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async getTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {TimeBucketSize} size @@ -8365,12 +8365,12 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath return { /** * Checks if assets exist by checksums - * @param {AssetApiBulkUploadCheckRequest} requestParameters Request parameters. + * @param {AssetApiCheckBulkUploadRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - bulkUploadCheck(requestParameters: AssetApiBulkUploadCheckRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(axios, basePath)); + checkBulkUpload(requestParameters: AssetApiCheckBulkUploadRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.checkBulkUpload(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(axios, basePath)); }, /** * Checks if multiple assets exist on the server and returns all existing - used by background backup @@ -8444,12 +8444,12 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }, /** * - * @param {AssetApiGetAssetStatsRequest} requestParameters Request parameters. + * @param {AssetApiGetAssetStatisticsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetStats(requestParameters: AssetApiGetAssetStatsRequest = {}, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getAssetStats(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(axios, basePath)); + getAssetStatistics(requestParameters: AssetApiGetAssetStatisticsRequest = {}, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getAssetStatistics(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(axios, basePath)); }, /** * @@ -8460,15 +8460,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath getAssetThumbnail(requestParameters: AssetApiGetAssetThumbnailRequest, options?: AxiosRequestConfig): AxiosPromise { return localVarFp.getAssetThumbnail(requestParameters.id, requestParameters.format, requestParameters.key, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {AssetApiGetByTimeBucketRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getByTimeBucket(requestParameters: AssetApiGetByTimeBucketRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getByTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(axios, basePath)); - }, /** * * @param {*} [options] Override http request option. @@ -8521,6 +8512,15 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath getRandom(requestParameters: AssetApiGetRandomRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { return localVarFp.getRandom(requestParameters.count, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {AssetApiGetTimeBucketRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig): AxiosPromise> { + return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(axios, basePath)); + }, /** * * @param {AssetApiGetTimeBucketsRequest} requestParameters Request parameters. @@ -8632,15 +8632,15 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }; /** - * Request parameters for bulkUploadCheck operation in AssetApi. + * Request parameters for checkBulkUpload operation in AssetApi. * @export - * @interface AssetApiBulkUploadCheckRequest + * @interface AssetApiCheckBulkUploadRequest */ -export interface AssetApiBulkUploadCheckRequest { +export interface AssetApiCheckBulkUploadRequest { /** * * @type {AssetBulkUploadCheckDto} - * @memberof AssetApiBulkUploadCheck + * @memberof AssetApiCheckBulkUpload */ readonly assetBulkUploadCheckDto: AssetBulkUploadCheckDto } @@ -8786,29 +8786,29 @@ export interface AssetApiGetAssetByIdRequest { } /** - * Request parameters for getAssetStats operation in AssetApi. + * Request parameters for getAssetStatistics operation in AssetApi. * @export - * @interface AssetApiGetAssetStatsRequest + * @interface AssetApiGetAssetStatisticsRequest */ -export interface AssetApiGetAssetStatsRequest { +export interface AssetApiGetAssetStatisticsRequest { /** * * @type {boolean} - * @memberof AssetApiGetAssetStats + * @memberof AssetApiGetAssetStatistics */ readonly isArchived?: boolean /** * * @type {boolean} - * @memberof AssetApiGetAssetStats + * @memberof AssetApiGetAssetStatistics */ readonly isFavorite?: boolean /** * * @type {boolean} - * @memberof AssetApiGetAssetStats + * @memberof AssetApiGetAssetStatistics */ readonly isTrashed?: boolean } @@ -8841,83 +8841,6 @@ export interface AssetApiGetAssetThumbnailRequest { readonly key?: string } -/** - * Request parameters for getByTimeBucket operation in AssetApi. - * @export - * @interface AssetApiGetByTimeBucketRequest - */ -export interface AssetApiGetByTimeBucketRequest { - /** - * - * @type {TimeBucketSize} - * @memberof AssetApiGetByTimeBucket - */ - readonly size: TimeBucketSize - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly timeBucket: string - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly userId?: string - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly albumId?: string - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly personId?: string - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly isArchived?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly isFavorite?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly isTrashed?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly withStacked?: boolean - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly key?: string -} - /** * Request parameters for getDownloadInfo operation in AssetApi. * @export @@ -9009,6 +8932,83 @@ export interface AssetApiGetRandomRequest { readonly count?: number } +/** + * Request parameters for getTimeBucket operation in AssetApi. + * @export + * @interface AssetApiGetTimeBucketRequest + */ +export interface AssetApiGetTimeBucketRequest { + /** + * + * @type {TimeBucketSize} + * @memberof AssetApiGetTimeBucket + */ + readonly size: TimeBucketSize + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly timeBucket: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly userId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly albumId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly personId?: string + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly isArchived?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly isFavorite?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly isTrashed?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly withStacked?: boolean + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly key?: string +} + /** * Request parameters for getTimeBuckets operation in AssetApi. * @export @@ -9361,13 +9361,13 @@ export interface AssetApiUploadFileRequest { export class AssetApi extends BaseAPI { /** * Checks if assets exist by checksums - * @param {AssetApiBulkUploadCheckRequest} requestParameters Request parameters. + * @param {AssetApiCheckBulkUploadRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public bulkUploadCheck(requestParameters: AssetApiBulkUploadCheckRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath)); + public checkBulkUpload(requestParameters: AssetApiCheckBulkUploadRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).checkBulkUpload(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -9458,13 +9458,13 @@ export class AssetApi extends BaseAPI { /** * - * @param {AssetApiGetAssetStatsRequest} requestParameters Request parameters. + * @param {AssetApiGetAssetStatisticsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getAssetStats(requestParameters: AssetApiGetAssetStatsRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetStats(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(this.axios, this.basePath)); + public getAssetStatistics(requestParameters: AssetApiGetAssetStatisticsRequest = {}, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getAssetStatistics(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(this.axios, this.basePath)); } /** @@ -9478,17 +9478,6 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).getAssetThumbnail(requestParameters.id, requestParameters.format, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {AssetApiGetByTimeBucketRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public getByTimeBucket(requestParameters: AssetApiGetByTimeBucketRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getByTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {*} [options] Override http request option. @@ -9553,6 +9542,17 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).getRandom(requestParameters.count, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {AssetApiGetTimeBucketRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof AssetApi + */ + public getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {AssetApiGetTimeBucketsRequest} requestParameters Request parameters. @@ -10090,41 +10090,6 @@ export class AuditApi extends BaseAPI { */ export const AuthenticationApiAxiosParamCreator = function (configuration?: Configuration) { return { - /** - * - * @param {SignUpDto} signUpDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - adminSignUp: async (signUpDto: SignUpDto, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'signUpDto' is not null or undefined - assertParamExists('adminSignUp', 'signUpDto', signUpDto) - const localVarPath = `/auth/admin-sign-up`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(signUpDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {ChangePasswordDto} changePasswordDto @@ -10360,6 +10325,41 @@ export const AuthenticationApiAxiosParamCreator = function (configuration?: Conf options: localVarRequestOptions, }; }, + /** + * + * @param {SignUpDto} signUpDto + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + signUpAdmin: async (signUpDto: SignUpDto, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'signUpDto' is not null or undefined + assertParamExists('signUpAdmin', 'signUpDto', signUpDto) + const localVarPath = `/auth/admin-sign-up`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(signUpDto, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, /** * * @param {*} [options] Override http request option. @@ -10408,16 +10408,6 @@ export const AuthenticationApiAxiosParamCreator = function (configuration?: Conf export const AuthenticationApiFp = function(configuration?: Configuration) { const localVarAxiosParamCreator = AuthenticationApiAxiosParamCreator(configuration) return { - /** - * - * @param {SignUpDto} signUpDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async adminSignUp(signUpDto: SignUpDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.adminSignUp(signUpDto, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {ChangePasswordDto} changePasswordDto @@ -10475,6 +10465,16 @@ export const AuthenticationApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.logoutAuthDevices(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {SignUpDto} signUpDto + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async signUpAdmin(signUpDto: SignUpDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.signUpAdmin(signUpDto, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {*} [options] Override http request option. @@ -10494,15 +10494,6 @@ export const AuthenticationApiFp = function(configuration?: Configuration) { export const AuthenticationApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) { const localVarFp = AuthenticationApiFp(configuration) return { - /** - * - * @param {AuthenticationApiAdminSignUpRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - adminSignUp(requestParameters: AuthenticationApiAdminSignUpRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.adminSignUp(requestParameters.signUpDto, options).then((request) => request(axios, basePath)); - }, /** * * @param {AuthenticationApiChangePasswordRequest} requestParameters Request parameters. @@ -10554,6 +10545,15 @@ export const AuthenticationApiFactory = function (configuration?: Configuration, logoutAuthDevices(options?: AxiosRequestConfig): AxiosPromise { return localVarFp.logoutAuthDevices(options).then((request) => request(axios, basePath)); }, + /** + * + * @param {AuthenticationApiSignUpAdminRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + signUpAdmin(requestParameters: AuthenticationApiSignUpAdminRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.signUpAdmin(requestParameters.signUpDto, options).then((request) => request(axios, basePath)); + }, /** * * @param {*} [options] Override http request option. @@ -10565,20 +10565,6 @@ export const AuthenticationApiFactory = function (configuration?: Configuration, }; }; -/** - * Request parameters for adminSignUp operation in AuthenticationApi. - * @export - * @interface AuthenticationApiAdminSignUpRequest - */ -export interface AuthenticationApiAdminSignUpRequest { - /** - * - * @type {SignUpDto} - * @memberof AuthenticationApiAdminSignUp - */ - readonly signUpDto: SignUpDto -} - /** * Request parameters for changePassword operation in AuthenticationApi. * @export @@ -10621,6 +10607,20 @@ export interface AuthenticationApiLogoutAuthDeviceRequest { readonly id: string } +/** + * Request parameters for signUpAdmin operation in AuthenticationApi. + * @export + * @interface AuthenticationApiSignUpAdminRequest + */ +export interface AuthenticationApiSignUpAdminRequest { + /** + * + * @type {SignUpDto} + * @memberof AuthenticationApiSignUpAdmin + */ + readonly signUpDto: SignUpDto +} + /** * AuthenticationApi - object-oriented interface * @export @@ -10628,17 +10628,6 @@ export interface AuthenticationApiLogoutAuthDeviceRequest { * @extends {BaseAPI} */ export class AuthenticationApi extends BaseAPI { - /** - * - * @param {AuthenticationApiAdminSignUpRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AuthenticationApi - */ - public adminSignUp(requestParameters: AuthenticationApiAdminSignUpRequest, options?: AxiosRequestConfig) { - return AuthenticationApiFp(this.configuration).adminSignUp(requestParameters.signUpDto, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {AuthenticationApiChangePasswordRequest} requestParameters Request parameters. @@ -10702,6 +10691,17 @@ export class AuthenticationApi extends BaseAPI { return AuthenticationApiFp(this.configuration).logoutAuthDevices(options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {AuthenticationApiSignUpAdminRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof AuthenticationApi + */ + public signUpAdmin(requestParameters: AuthenticationApiSignUpAdminRequest, options?: AxiosRequestConfig) { + return AuthenticationApiFp(this.configuration).signUpAdmin(requestParameters.signUpDto, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {*} [options] Override http request option. @@ -11014,7 +11014,7 @@ export const LibraryApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllForUser: async (options: AxiosRequestConfig = {}): Promise => { + getLibraries: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/library`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11304,8 +11304,8 @@ export const LibraryApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAllForUser(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAllForUser(options); + async getLibraries(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getLibraries(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11393,8 +11393,8 @@ export const LibraryApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllForUser(options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getAllForUser(options).then((request) => request(axios, basePath)); + getLibraries(options?: AxiosRequestConfig): AxiosPromise> { + return localVarFp.getLibraries(options).then((request) => request(axios, basePath)); }, /** * @@ -11591,8 +11591,8 @@ export class LibraryApi extends BaseAPI { * @throws {RequiredError} * @memberof LibraryApi */ - public getAllForUser(options?: AxiosRequestConfig) { - return LibraryApiFp(this.configuration).getAllForUser(options).then((request) => request(this.axios, this.basePath)); + public getLibraries(options?: AxiosRequestConfig) { + return LibraryApiFp(this.configuration).getLibraries(options).then((request) => request(this.axios, this.basePath)); } /** @@ -11658,50 +11658,15 @@ export class LibraryApi extends BaseAPI { */ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration) { return { - /** - * - * @param {OAuthConfigDto} oAuthConfigDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - authorizeOAuth: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'oAuthConfigDto' is not null or undefined - assertParamExists('authorizeOAuth', 'oAuthConfigDto', oAuthConfigDto) - const localVarPath = `/oauth/authorize`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(oAuthConfigDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {OAuthCallbackDto} oAuthCallbackDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - callback: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { + finishOAuth: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'oAuthCallbackDto' is not null or undefined - assertParamExists('callback', 'oAuthCallbackDto', oAuthCallbackDto) + assertParamExists('finishOAuth', 'oAuthCallbackDto', oAuthCallbackDto) const localVarPath = `/oauth/callback`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11735,9 +11700,9 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration * @deprecated * @throws {RequiredError} */ - generateConfig: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { + generateOAuthConfig: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'oAuthConfigDto' is not null or undefined - assertParamExists('generateConfig', 'oAuthConfigDto', oAuthConfigDto) + assertParamExists('generateOAuthConfig', 'oAuthConfigDto', oAuthConfigDto) const localVarPath = `/oauth/config`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11770,9 +11735,9 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - link: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { + linkOAuthAccount: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'oAuthCallbackDto' is not null or undefined - assertParamExists('link', 'oAuthCallbackDto', oAuthCallbackDto) + assertParamExists('linkOAuthAccount', 'oAuthCallbackDto', oAuthCallbackDto) const localVarPath = `/oauth/link`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11813,7 +11778,7 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - mobileRedirect: async (options: AxiosRequestConfig = {}): Promise => { + redirectOAuthToMobile: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/oauth/mobile-redirect`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11839,10 +11804,45 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration }, /** * + * @param {OAuthConfigDto} oAuthConfigDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - unlink: async (options: AxiosRequestConfig = {}): Promise => { + startOAuth: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'oAuthConfigDto' is not null or undefined + assertParamExists('startOAuth', 'oAuthConfigDto', oAuthConfigDto) + const localVarPath = `/oauth/authorize`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(oAuthConfigDto, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + unlinkOAuthAccount: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/oauth/unlink`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11885,24 +11885,14 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration export const OAuthApiFp = function(configuration?: Configuration) { const localVarAxiosParamCreator = OAuthApiAxiosParamCreator(configuration) return { - /** - * - * @param {OAuthConfigDto} oAuthConfigDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async authorizeOAuth(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.authorizeOAuth(oAuthConfigDto, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {OAuthCallbackDto} oAuthCallbackDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async callback(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.callback(oAuthCallbackDto, options); + async finishOAuth(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.finishOAuth(oAuthCallbackDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11912,8 +11902,8 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @deprecated * @throws {RequiredError} */ - async generateConfig(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.generateConfig(oAuthConfigDto, options); + async generateOAuthConfig(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.generateOAuthConfig(oAuthConfigDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11922,8 +11912,8 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async link(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.link(oAuthCallbackDto, options); + async linkOAuthAccount(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.linkOAuthAccount(oAuthCallbackDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11931,8 +11921,18 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async mobileRedirect(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.mobileRedirect(options); + async redirectOAuthToMobile(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.redirectOAuthToMobile(options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, + /** + * + * @param {OAuthConfigDto} oAuthConfigDto + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async startOAuth(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.startOAuth(oAuthConfigDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11940,8 +11940,8 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async unlink(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.unlink(options); + async unlinkOAuthAccount(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.unlinkOAuthAccount(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -11956,116 +11956,116 @@ export const OAuthApiFactory = function (configuration?: Configuration, basePath return { /** * - * @param {OAuthApiAuthorizeOAuthRequest} requestParameters Request parameters. + * @param {OAuthApiFinishOAuthRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - authorizeOAuth(requestParameters: OAuthApiAuthorizeOAuthRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.authorizeOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); - }, - /** - * - * @param {OAuthApiCallbackRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - callback(requestParameters: OAuthApiCallbackRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.callback(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); + finishOAuth(requestParameters: OAuthApiFinishOAuthRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.finishOAuth(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); }, /** * @deprecated use feature flags and /oauth/authorize - * @param {OAuthApiGenerateConfigRequest} requestParameters Request parameters. + * @param {OAuthApiGenerateOAuthConfigRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @deprecated * @throws {RequiredError} */ - generateConfig(requestParameters: OAuthApiGenerateConfigRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.generateConfig(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); + generateOAuthConfig(requestParameters: OAuthApiGenerateOAuthConfigRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.generateOAuthConfig(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); }, /** * - * @param {OAuthApiLinkRequest} requestParameters Request parameters. + * @param {OAuthApiLinkOAuthAccountRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - link(requestParameters: OAuthApiLinkRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.link(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); + linkOAuthAccount(requestParameters: OAuthApiLinkOAuthAccountRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.linkOAuthAccount(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - mobileRedirect(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.mobileRedirect(options).then((request) => request(axios, basePath)); + redirectOAuthToMobile(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.redirectOAuthToMobile(options).then((request) => request(axios, basePath)); + }, + /** + * + * @param {OAuthApiStartOAuthRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + startOAuth(requestParameters: OAuthApiStartOAuthRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.startOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - unlink(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.unlink(options).then((request) => request(axios, basePath)); + unlinkOAuthAccount(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.unlinkOAuthAccount(options).then((request) => request(axios, basePath)); }, }; }; /** - * Request parameters for authorizeOAuth operation in OAuthApi. + * Request parameters for finishOAuth operation in OAuthApi. * @export - * @interface OAuthApiAuthorizeOAuthRequest + * @interface OAuthApiFinishOAuthRequest */ -export interface OAuthApiAuthorizeOAuthRequest { - /** - * - * @type {OAuthConfigDto} - * @memberof OAuthApiAuthorizeOAuth - */ - readonly oAuthConfigDto: OAuthConfigDto -} - -/** - * Request parameters for callback operation in OAuthApi. - * @export - * @interface OAuthApiCallbackRequest - */ -export interface OAuthApiCallbackRequest { +export interface OAuthApiFinishOAuthRequest { /** * * @type {OAuthCallbackDto} - * @memberof OAuthApiCallback + * @memberof OAuthApiFinishOAuth */ readonly oAuthCallbackDto: OAuthCallbackDto } /** - * Request parameters for generateConfig operation in OAuthApi. + * Request parameters for generateOAuthConfig operation in OAuthApi. * @export - * @interface OAuthApiGenerateConfigRequest + * @interface OAuthApiGenerateOAuthConfigRequest */ -export interface OAuthApiGenerateConfigRequest { +export interface OAuthApiGenerateOAuthConfigRequest { /** * * @type {OAuthConfigDto} - * @memberof OAuthApiGenerateConfig + * @memberof OAuthApiGenerateOAuthConfig */ readonly oAuthConfigDto: OAuthConfigDto } /** - * Request parameters for link operation in OAuthApi. + * Request parameters for linkOAuthAccount operation in OAuthApi. * @export - * @interface OAuthApiLinkRequest + * @interface OAuthApiLinkOAuthAccountRequest */ -export interface OAuthApiLinkRequest { +export interface OAuthApiLinkOAuthAccountRequest { /** * * @type {OAuthCallbackDto} - * @memberof OAuthApiLink + * @memberof OAuthApiLinkOAuthAccount */ readonly oAuthCallbackDto: OAuthCallbackDto } +/** + * Request parameters for startOAuth operation in OAuthApi. + * @export + * @interface OAuthApiStartOAuthRequest + */ +export interface OAuthApiStartOAuthRequest { + /** + * + * @type {OAuthConfigDto} + * @memberof OAuthApiStartOAuth + */ + readonly oAuthConfigDto: OAuthConfigDto +} + /** * OAuthApi - object-oriented interface * @export @@ -12075,47 +12075,36 @@ export interface OAuthApiLinkRequest { export class OAuthApi extends BaseAPI { /** * - * @param {OAuthApiAuthorizeOAuthRequest} requestParameters Request parameters. + * @param {OAuthApiFinishOAuthRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof OAuthApi */ - public authorizeOAuth(requestParameters: OAuthApiAuthorizeOAuthRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).authorizeOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); - } - - /** - * - * @param {OAuthApiCallbackRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof OAuthApi - */ - public callback(requestParameters: OAuthApiCallbackRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).callback(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); + public finishOAuth(requestParameters: OAuthApiFinishOAuthRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).finishOAuth(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); } /** * @deprecated use feature flags and /oauth/authorize - * @param {OAuthApiGenerateConfigRequest} requestParameters Request parameters. + * @param {OAuthApiGenerateOAuthConfigRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @deprecated * @throws {RequiredError} * @memberof OAuthApi */ - public generateConfig(requestParameters: OAuthApiGenerateConfigRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).generateConfig(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); + public generateOAuthConfig(requestParameters: OAuthApiGenerateOAuthConfigRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).generateOAuthConfig(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {OAuthApiLinkRequest} requestParameters Request parameters. + * @param {OAuthApiLinkOAuthAccountRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof OAuthApi */ - public link(requestParameters: OAuthApiLinkRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).link(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); + public linkOAuthAccount(requestParameters: OAuthApiLinkOAuthAccountRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).linkOAuthAccount(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -12124,8 +12113,19 @@ export class OAuthApi extends BaseAPI { * @throws {RequiredError} * @memberof OAuthApi */ - public mobileRedirect(options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).mobileRedirect(options).then((request) => request(this.axios, this.basePath)); + public redirectOAuthToMobile(options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).redirectOAuthToMobile(options).then((request) => request(this.axios, this.basePath)); + } + + /** + * + * @param {OAuthApiStartOAuthRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof OAuthApi + */ + public startOAuth(requestParameters: OAuthApiStartOAuthRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).startOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -12134,8 +12134,8 @@ export class OAuthApi extends BaseAPI { * @throws {RequiredError} * @memberof OAuthApi */ - public unlink(options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).unlink(options).then((request) => request(this.axios, this.basePath)); + public unlinkOAuthAccount(options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).unlinkOAuthAccount(options).then((request) => request(this.axios, this.basePath)); } } @@ -13790,37 +13790,8 @@ export const ServerInfoApiAxiosParamCreator = function (configuration?: Configur * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getServerVersion: async (options: AxiosRequestConfig = {}): Promise => { - const localVarPath = `/server-info/version`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getStats: async (options: AxiosRequestConfig = {}): Promise => { - const localVarPath = `/server-info/stats`; + getServerStatistics: async (options: AxiosRequestConfig = {}): Promise => { + const localVarPath = `/server-info/statistics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -13843,6 +13814,35 @@ export const ServerInfoApiAxiosParamCreator = function (configuration?: Configur + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getServerVersion: async (options: AxiosRequestConfig = {}): Promise => { + const localVarPath = `/server-info/version`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -13981,8 +13981,8 @@ export const ServerInfoApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getServerVersion(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getServerVersion(options); + async getServerStatistics(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getServerStatistics(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -13990,8 +13990,8 @@ export const ServerInfoApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getStats(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getStats(options); + async getServerVersion(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getServerVersion(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -14060,16 +14060,16 @@ export const ServerInfoApiFactory = function (configuration?: Configuration, bas * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getServerVersion(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getServerVersion(options).then((request) => request(axios, basePath)); + getServerStatistics(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getServerStatistics(options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getStats(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getStats(options).then((request) => request(axios, basePath)); + getServerVersion(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getServerVersion(options).then((request) => request(axios, basePath)); }, /** * @@ -14141,8 +14141,8 @@ export class ServerInfoApi extends BaseAPI { * @throws {RequiredError} * @memberof ServerInfoApi */ - public getServerVersion(options?: AxiosRequestConfig) { - return ServerInfoApiFp(this.configuration).getServerVersion(options).then((request) => request(this.axios, this.basePath)); + public getServerStatistics(options?: AxiosRequestConfig) { + return ServerInfoApiFp(this.configuration).getServerStatistics(options).then((request) => request(this.axios, this.basePath)); } /** @@ -14151,8 +14151,8 @@ export class ServerInfoApi extends BaseAPI { * @throws {RequiredError} * @memberof ServerInfoApi */ - public getStats(options?: AxiosRequestConfig) { - return ServerInfoApiFp(this.configuration).getStats(options).then((request) => request(this.axios, this.basePath)); + public getServerVersion(options?: AxiosRequestConfig) { + return ServerInfoApiFp(this.configuration).getServerVersion(options).then((request) => request(this.axios, this.basePath)); } /** @@ -15038,7 +15038,7 @@ export const SystemConfigApiAxiosParamCreator = function (configuration?: Config * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getDefaults: async (options: AxiosRequestConfig = {}): Promise => { + getConfigDefaults: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/system-config/defaults`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -15177,8 +15177,8 @@ export const SystemConfigApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getDefaults(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getDefaults(options); + async getConfigDefaults(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getConfigDefaults(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -15223,8 +15223,8 @@ export const SystemConfigApiFactory = function (configuration?: Configuration, b * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getDefaults(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getDefaults(options).then((request) => request(axios, basePath)); + getConfigDefaults(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getConfigDefaults(options).then((request) => request(axios, basePath)); }, /** * @@ -15283,8 +15283,8 @@ export class SystemConfigApi extends BaseAPI { * @throws {RequiredError} * @memberof SystemConfigApi */ - public getDefaults(options?: AxiosRequestConfig) { - return SystemConfigApiFp(this.configuration).getDefaults(options).then((request) => request(this.axios, this.basePath)); + public getConfigDefaults(options?: AxiosRequestConfig) { + return SystemConfigApiFp(this.configuration).getConfigDefaults(options).then((request) => request(this.axios, this.basePath)); } /** diff --git a/mobile/lib/modules/login/services/oauth.service.dart b/mobile/lib/modules/login/services/oauth.service.dart index e8b516d35a..e7fd433446 100644 --- a/mobile/lib/modules/login/services/oauth.service.dart +++ b/mobile/lib/modules/login/services/oauth.service.dart @@ -17,7 +17,7 @@ class OAuthService { // Resolve API server endpoint from user provided serverUrl await _apiService.resolveAndSetEndpoint(serverUrl); - return await _apiService.oAuthApi.generateConfig( + return await _apiService.oAuthApi.generateOAuthConfig( OAuthConfigDto(redirectUri: '$callbackUrlScheme:/'), ); } @@ -29,7 +29,7 @@ class OAuthService { callbackUrlScheme: callbackUrlScheme, ); - return await _apiService.oAuthApi.callback( + return await _apiService.oAuthApi.finishOAuth( OAuthCallbackDto( url: result, ), diff --git a/mobile/lib/modules/login/ui/login_form.dart b/mobile/lib/modules/login/ui/login_form.dart index 7622b0b53f..58c7feec22 100644 --- a/mobile/lib/modules/login/ui/login_form.dart +++ b/mobile/lib/modules/login/ui/login_form.dart @@ -65,7 +65,7 @@ class LoginForm extends HookConsumerWidget { isLoadingServer.value = true; final endpoint = await apiService.resolveAndSetEndpoint(serverUrl); - final loginConfig = await apiService.oAuthApi.generateConfig( + final loginConfig = await apiService.oAuthApi.generateOAuthConfig( OAuthConfigDto(redirectUri: serverUrl), ); diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md index f4d32ac30f..70ef217a50 100644 --- a/mobile/openapi/README.md +++ b/mobile/openapi/README.md @@ -58,10 +58,10 @@ final api_instance = APIKeyApi(); final aPIKeyCreateDto = APIKeyCreateDto(); // APIKeyCreateDto | try { - final result = api_instance.createKey(aPIKeyCreateDto); + final result = api_instance.createApiKey(aPIKeyCreateDto); print(result); } catch (e) { - print('Exception when calling APIKeyApi->createKey: $e\n'); + print('Exception when calling APIKeyApi->createApiKey: $e\n'); } ``` @@ -72,11 +72,11 @@ All URIs are relative to */api* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*APIKeyApi* | [**createKey**](doc//APIKeyApi.md#createkey) | **POST** /api-key | -*APIKeyApi* | [**deleteKey**](doc//APIKeyApi.md#deletekey) | **DELETE** /api-key/{id} | -*APIKeyApi* | [**getKey**](doc//APIKeyApi.md#getkey) | **GET** /api-key/{id} | -*APIKeyApi* | [**getKeys**](doc//APIKeyApi.md#getkeys) | **GET** /api-key | -*APIKeyApi* | [**updateKey**](doc//APIKeyApi.md#updatekey) | **PUT** /api-key/{id} | +*APIKeyApi* | [**createApiKey**](doc//APIKeyApi.md#createapikey) | **POST** /api-key | +*APIKeyApi* | [**deleteApiKey**](doc//APIKeyApi.md#deleteapikey) | **DELETE** /api-key/{id} | +*APIKeyApi* | [**getApiKey**](doc//APIKeyApi.md#getapikey) | **GET** /api-key/{id} | +*APIKeyApi* | [**getApiKeys**](doc//APIKeyApi.md#getapikeys) | **GET** /api-key | +*APIKeyApi* | [**updateApiKey**](doc//APIKeyApi.md#updateapikey) | **PUT** /api-key/{id} | *ActivityApi* | [**createActivity**](doc//ActivityApi.md#createactivity) | **POST** /activity | *ActivityApi* | [**deleteActivity**](doc//ActivityApi.md#deleteactivity) | **DELETE** /activity/{id} | *ActivityApi* | [**getActivities**](doc//ActivityApi.md#getactivities) | **GET** /activity | @@ -91,7 +91,7 @@ Class | Method | HTTP request | Description *AlbumApi* | [**removeAssetFromAlbum**](doc//AlbumApi.md#removeassetfromalbum) | **DELETE** /album/{id}/assets | *AlbumApi* | [**removeUserFromAlbum**](doc//AlbumApi.md#removeuserfromalbum) | **DELETE** /album/{id}/user/{userId} | *AlbumApi* | [**updateAlbumInfo**](doc//AlbumApi.md#updatealbuminfo) | **PATCH** /album/{id} | -*AssetApi* | [**bulkUploadCheck**](doc//AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check | +*AssetApi* | [**checkBulkUpload**](doc//AssetApi.md#checkbulkupload) | **POST** /asset/bulk-upload-check | *AssetApi* | [**checkExistingAssets**](doc//AssetApi.md#checkexistingassets) | **POST** /asset/exist | *AssetApi* | [**deleteAssets**](doc//AssetApi.md#deleteassets) | **DELETE** /asset | *AssetApi* | [**downloadArchive**](doc//AssetApi.md#downloadarchive) | **POST** /asset/download/archive | @@ -100,15 +100,15 @@ Class | Method | HTTP request | Description *AssetApi* | [**getAllAssets**](doc//AssetApi.md#getallassets) | **GET** /asset | *AssetApi* | [**getAssetById**](doc//AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | *AssetApi* | [**getAssetSearchTerms**](doc//AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | -*AssetApi* | [**getAssetStats**](doc//AssetApi.md#getassetstats) | **GET** /asset/statistics | +*AssetApi* | [**getAssetStatistics**](doc//AssetApi.md#getassetstatistics) | **GET** /asset/statistics | *AssetApi* | [**getAssetThumbnail**](doc//AssetApi.md#getassetthumbnail) | **GET** /asset/thumbnail/{id} | -*AssetApi* | [**getByTimeBucket**](doc//AssetApi.md#getbytimebucket) | **GET** /asset/time-bucket | *AssetApi* | [**getCuratedLocations**](doc//AssetApi.md#getcuratedlocations) | **GET** /asset/curated-locations | *AssetApi* | [**getCuratedObjects**](doc//AssetApi.md#getcuratedobjects) | **GET** /asset/curated-objects | *AssetApi* | [**getDownloadInfo**](doc//AssetApi.md#getdownloadinfo) | **POST** /asset/download/info | *AssetApi* | [**getMapMarkers**](doc//AssetApi.md#getmapmarkers) | **GET** /asset/map-marker | *AssetApi* | [**getMemoryLane**](doc//AssetApi.md#getmemorylane) | **GET** /asset/memory-lane | *AssetApi* | [**getRandom**](doc//AssetApi.md#getrandom) | **GET** /asset/random | +*AssetApi* | [**getTimeBucket**](doc//AssetApi.md#gettimebucket) | **GET** /asset/time-bucket | *AssetApi* | [**getTimeBuckets**](doc//AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | *AssetApi* | [**getUserAssetsByDeviceId**](doc//AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} | *AssetApi* | [**importFile**](doc//AssetApi.md#importfile) | **POST** /asset/import | @@ -125,30 +125,30 @@ Class | Method | HTTP request | Description *AuditApi* | [**getAuditDeletes**](doc//AuditApi.md#getauditdeletes) | **GET** /audit/deletes | *AuditApi* | [**getAuditFiles**](doc//AuditApi.md#getauditfiles) | **GET** /audit/file-report | *AuditApi* | [**getFileChecksums**](doc//AuditApi.md#getfilechecksums) | **POST** /audit/file-report/checksum | -*AuthenticationApi* | [**adminSignUp**](doc//AuthenticationApi.md#adminsignup) | **POST** /auth/admin-sign-up | *AuthenticationApi* | [**changePassword**](doc//AuthenticationApi.md#changepassword) | **POST** /auth/change-password | *AuthenticationApi* | [**getAuthDevices**](doc//AuthenticationApi.md#getauthdevices) | **GET** /auth/devices | *AuthenticationApi* | [**login**](doc//AuthenticationApi.md#login) | **POST** /auth/login | *AuthenticationApi* | [**logout**](doc//AuthenticationApi.md#logout) | **POST** /auth/logout | *AuthenticationApi* | [**logoutAuthDevice**](doc//AuthenticationApi.md#logoutauthdevice) | **DELETE** /auth/devices/{id} | *AuthenticationApi* | [**logoutAuthDevices**](doc//AuthenticationApi.md#logoutauthdevices) | **DELETE** /auth/devices | +*AuthenticationApi* | [**signUpAdmin**](doc//AuthenticationApi.md#signupadmin) | **POST** /auth/admin-sign-up | *AuthenticationApi* | [**validateAccessToken**](doc//AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | *JobApi* | [**getAllJobsStatus**](doc//JobApi.md#getalljobsstatus) | **GET** /jobs | *JobApi* | [**sendJobCommand**](doc//JobApi.md#sendjobcommand) | **PUT** /jobs/{id} | *LibraryApi* | [**createLibrary**](doc//LibraryApi.md#createlibrary) | **POST** /library | *LibraryApi* | [**deleteLibrary**](doc//LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | -*LibraryApi* | [**getAllForUser**](doc//LibraryApi.md#getallforuser) | **GET** /library | +*LibraryApi* | [**getLibraries**](doc//LibraryApi.md#getlibraries) | **GET** /library | *LibraryApi* | [**getLibraryInfo**](doc//LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | *LibraryApi* | [**getLibraryStatistics**](doc//LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | *LibraryApi* | [**removeOfflineFiles**](doc//LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | *LibraryApi* | [**scanLibrary**](doc//LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | *LibraryApi* | [**updateLibrary**](doc//LibraryApi.md#updatelibrary) | **PUT** /library/{id} | -*OAuthApi* | [**authorizeOAuth**](doc//OAuthApi.md#authorizeoauth) | **POST** /oauth/authorize | -*OAuthApi* | [**callback**](doc//OAuthApi.md#callback) | **POST** /oauth/callback | -*OAuthApi* | [**generateConfig**](doc//OAuthApi.md#generateconfig) | **POST** /oauth/config | -*OAuthApi* | [**link**](doc//OAuthApi.md#link) | **POST** /oauth/link | -*OAuthApi* | [**mobileRedirect**](doc//OAuthApi.md#mobileredirect) | **GET** /oauth/mobile-redirect | -*OAuthApi* | [**unlink**](doc//OAuthApi.md#unlink) | **POST** /oauth/unlink | +*OAuthApi* | [**finishOAuth**](doc//OAuthApi.md#finishoauth) | **POST** /oauth/callback | +*OAuthApi* | [**generateOAuthConfig**](doc//OAuthApi.md#generateoauthconfig) | **POST** /oauth/config | +*OAuthApi* | [**linkOAuthAccount**](doc//OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | +*OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | +*OAuthApi* | [**startOAuth**](doc//OAuthApi.md#startoauth) | **POST** /oauth/authorize | +*OAuthApi* | [**unlinkOAuthAccount**](doc//OAuthApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | *PartnerApi* | [**createPartner**](doc//PartnerApi.md#createpartner) | **POST** /partner/{id} | *PartnerApi* | [**getPartners**](doc//PartnerApi.md#getpartners) | **GET** /partner | *PartnerApi* | [**removePartner**](doc//PartnerApi.md#removepartner) | **DELETE** /partner/{id} | @@ -166,8 +166,8 @@ Class | Method | HTTP request | Description *ServerInfoApi* | [**getServerConfig**](doc//ServerInfoApi.md#getserverconfig) | **GET** /server-info/config | *ServerInfoApi* | [**getServerFeatures**](doc//ServerInfoApi.md#getserverfeatures) | **GET** /server-info/features | *ServerInfoApi* | [**getServerInfo**](doc//ServerInfoApi.md#getserverinfo) | **GET** /server-info | +*ServerInfoApi* | [**getServerStatistics**](doc//ServerInfoApi.md#getserverstatistics) | **GET** /server-info/statistics | *ServerInfoApi* | [**getServerVersion**](doc//ServerInfoApi.md#getserverversion) | **GET** /server-info/version | -*ServerInfoApi* | [**getStats**](doc//ServerInfoApi.md#getstats) | **GET** /server-info/stats | *ServerInfoApi* | [**getSupportedMediaTypes**](doc//ServerInfoApi.md#getsupportedmediatypes) | **GET** /server-info/media-types | *ServerInfoApi* | [**getTheme**](doc//ServerInfoApi.md#gettheme) | **GET** /server-info/theme | *ServerInfoApi* | [**pingServer**](doc//ServerInfoApi.md#pingserver) | **GET** /server-info/ping | @@ -180,7 +180,7 @@ Class | Method | HTTP request | Description *SharedLinkApi* | [**removeSharedLinkAssets**](doc//SharedLinkApi.md#removesharedlinkassets) | **DELETE** /shared-link/{id}/assets | *SharedLinkApi* | [**updateSharedLink**](doc//SharedLinkApi.md#updatesharedlink) | **PATCH** /shared-link/{id} | *SystemConfigApi* | [**getConfig**](doc//SystemConfigApi.md#getconfig) | **GET** /system-config | -*SystemConfigApi* | [**getDefaults**](doc//SystemConfigApi.md#getdefaults) | **GET** /system-config/defaults | +*SystemConfigApi* | [**getConfigDefaults**](doc//SystemConfigApi.md#getconfigdefaults) | **GET** /system-config/defaults | *SystemConfigApi* | [**getStorageTemplateOptions**](doc//SystemConfigApi.md#getstoragetemplateoptions) | **GET** /system-config/storage-template-options | *SystemConfigApi* | [**updateConfig**](doc//SystemConfigApi.md#updateconfig) | **PUT** /system-config | *TagApi* | [**createTag**](doc//TagApi.md#createtag) | **POST** /tag | diff --git a/mobile/openapi/doc/APIKeyApi.md b/mobile/openapi/doc/APIKeyApi.md index 807cb5317e..69b0917bb2 100644 --- a/mobile/openapi/doc/APIKeyApi.md +++ b/mobile/openapi/doc/APIKeyApi.md @@ -9,15 +9,15 @@ All URIs are relative to */api* Method | HTTP request | Description ------------- | ------------- | ------------- -[**createKey**](APIKeyApi.md#createkey) | **POST** /api-key | -[**deleteKey**](APIKeyApi.md#deletekey) | **DELETE** /api-key/{id} | -[**getKey**](APIKeyApi.md#getkey) | **GET** /api-key/{id} | -[**getKeys**](APIKeyApi.md#getkeys) | **GET** /api-key | -[**updateKey**](APIKeyApi.md#updatekey) | **PUT** /api-key/{id} | +[**createApiKey**](APIKeyApi.md#createapikey) | **POST** /api-key | +[**deleteApiKey**](APIKeyApi.md#deleteapikey) | **DELETE** /api-key/{id} | +[**getApiKey**](APIKeyApi.md#getapikey) | **GET** /api-key/{id} | +[**getApiKeys**](APIKeyApi.md#getapikeys) | **GET** /api-key | +[**updateApiKey**](APIKeyApi.md#updateapikey) | **PUT** /api-key/{id} | -# **createKey** -> APIKeyCreateResponseDto createKey(aPIKeyCreateDto) +# **createApiKey** +> APIKeyCreateResponseDto createApiKey(aPIKeyCreateDto) @@ -43,10 +43,10 @@ final api_instance = APIKeyApi(); final aPIKeyCreateDto = APIKeyCreateDto(); // APIKeyCreateDto | try { - final result = api_instance.createKey(aPIKeyCreateDto); + final result = api_instance.createApiKey(aPIKeyCreateDto); print(result); } catch (e) { - print('Exception when calling APIKeyApi->createKey: $e\n'); + print('Exception when calling APIKeyApi->createApiKey: $e\n'); } ``` @@ -71,8 +71,8 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **deleteKey** -> deleteKey(id) +# **deleteApiKey** +> deleteApiKey(id) @@ -98,9 +98,9 @@ final api_instance = APIKeyApi(); final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | try { - api_instance.deleteKey(id); + api_instance.deleteApiKey(id); } catch (e) { - print('Exception when calling APIKeyApi->deleteKey: $e\n'); + print('Exception when calling APIKeyApi->deleteApiKey: $e\n'); } ``` @@ -125,8 +125,8 @@ void (empty response body) [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getKey** -> APIKeyResponseDto getKey(id) +# **getApiKey** +> APIKeyResponseDto getApiKey(id) @@ -152,10 +152,10 @@ final api_instance = APIKeyApi(); final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | try { - final result = api_instance.getKey(id); + final result = api_instance.getApiKey(id); print(result); } catch (e) { - print('Exception when calling APIKeyApi->getKey: $e\n'); + print('Exception when calling APIKeyApi->getApiKey: $e\n'); } ``` @@ -180,8 +180,8 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getKeys** -> List getKeys() +# **getApiKeys** +> List getApiKeys() @@ -206,10 +206,10 @@ import 'package:openapi/api.dart'; final api_instance = APIKeyApi(); try { - final result = api_instance.getKeys(); + final result = api_instance.getApiKeys(); print(result); } catch (e) { - print('Exception when calling APIKeyApi->getKeys: $e\n'); + print('Exception when calling APIKeyApi->getApiKeys: $e\n'); } ``` @@ -231,8 +231,8 @@ This endpoint does not need any parameter. [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **updateKey** -> APIKeyResponseDto updateKey(id, aPIKeyUpdateDto) +# **updateApiKey** +> APIKeyResponseDto updateApiKey(id, aPIKeyUpdateDto) @@ -259,10 +259,10 @@ final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | final aPIKeyUpdateDto = APIKeyUpdateDto(); // APIKeyUpdateDto | try { - final result = api_instance.updateKey(id, aPIKeyUpdateDto); + final result = api_instance.updateApiKey(id, aPIKeyUpdateDto); print(result); } catch (e) { - print('Exception when calling APIKeyApi->updateKey: $e\n'); + print('Exception when calling APIKeyApi->updateApiKey: $e\n'); } ``` diff --git a/mobile/openapi/doc/AssetApi.md b/mobile/openapi/doc/AssetApi.md index d606e540f7..cf50f659df 100644 --- a/mobile/openapi/doc/AssetApi.md +++ b/mobile/openapi/doc/AssetApi.md @@ -9,7 +9,7 @@ All URIs are relative to */api* Method | HTTP request | Description ------------- | ------------- | ------------- -[**bulkUploadCheck**](AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check | +[**checkBulkUpload**](AssetApi.md#checkbulkupload) | **POST** /asset/bulk-upload-check | [**checkExistingAssets**](AssetApi.md#checkexistingassets) | **POST** /asset/exist | [**deleteAssets**](AssetApi.md#deleteassets) | **DELETE** /asset | [**downloadArchive**](AssetApi.md#downloadarchive) | **POST** /asset/download/archive | @@ -18,15 +18,15 @@ Method | HTTP request | Description [**getAllAssets**](AssetApi.md#getallassets) | **GET** /asset | [**getAssetById**](AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | [**getAssetSearchTerms**](AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | -[**getAssetStats**](AssetApi.md#getassetstats) | **GET** /asset/statistics | +[**getAssetStatistics**](AssetApi.md#getassetstatistics) | **GET** /asset/statistics | [**getAssetThumbnail**](AssetApi.md#getassetthumbnail) | **GET** /asset/thumbnail/{id} | -[**getByTimeBucket**](AssetApi.md#getbytimebucket) | **GET** /asset/time-bucket | [**getCuratedLocations**](AssetApi.md#getcuratedlocations) | **GET** /asset/curated-locations | [**getCuratedObjects**](AssetApi.md#getcuratedobjects) | **GET** /asset/curated-objects | [**getDownloadInfo**](AssetApi.md#getdownloadinfo) | **POST** /asset/download/info | [**getMapMarkers**](AssetApi.md#getmapmarkers) | **GET** /asset/map-marker | [**getMemoryLane**](AssetApi.md#getmemorylane) | **GET** /asset/memory-lane | [**getRandom**](AssetApi.md#getrandom) | **GET** /asset/random | +[**getTimeBucket**](AssetApi.md#gettimebucket) | **GET** /asset/time-bucket | [**getTimeBuckets**](AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | [**getUserAssetsByDeviceId**](AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} | [**importFile**](AssetApi.md#importfile) | **POST** /asset/import | @@ -41,8 +41,8 @@ Method | HTTP request | Description [**uploadFile**](AssetApi.md#uploadfile) | **POST** /asset/upload | -# **bulkUploadCheck** -> AssetBulkUploadCheckResponseDto bulkUploadCheck(assetBulkUploadCheckDto) +# **checkBulkUpload** +> AssetBulkUploadCheckResponseDto checkBulkUpload(assetBulkUploadCheckDto) @@ -70,10 +70,10 @@ final api_instance = AssetApi(); final assetBulkUploadCheckDto = AssetBulkUploadCheckDto(); // AssetBulkUploadCheckDto | try { - final result = api_instance.bulkUploadCheck(assetBulkUploadCheckDto); + final result = api_instance.checkBulkUpload(assetBulkUploadCheckDto); print(result); } catch (e) { - print('Exception when calling AssetApi->bulkUploadCheck: $e\n'); + print('Exception when calling AssetApi->checkBulkUpload: $e\n'); } ``` @@ -550,8 +550,8 @@ This endpoint does not need any parameter. [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getAssetStats** -> AssetStatsResponseDto getAssetStats(isArchived, isFavorite, isTrashed) +# **getAssetStatistics** +> AssetStatsResponseDto getAssetStatistics(isArchived, isFavorite, isTrashed) @@ -579,10 +579,10 @@ final isFavorite = true; // bool | final isTrashed = true; // bool | try { - final result = api_instance.getAssetStats(isArchived, isFavorite, isTrashed); + final result = api_instance.getAssetStatistics(isArchived, isFavorite, isTrashed); print(result); } catch (e) { - print('Exception when calling AssetApi->getAssetStats: $e\n'); + print('Exception when calling AssetApi->getAssetStatistics: $e\n'); } ``` @@ -668,79 +668,6 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getByTimeBucket** -> List getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key) - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); -final size = ; // TimeBucketSize | -final timeBucket = timeBucket_example; // String | -final userId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | -final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | -final personId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | -final isArchived = true; // bool | -final isFavorite = true; // bool | -final isTrashed = true; // bool | -final withStacked = true; // bool | -final key = key_example; // String | - -try { - final result = api_instance.getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key); - print(result); -} catch (e) { - print('Exception when calling AssetApi->getByTimeBucket: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **size** | [**TimeBucketSize**](.md)| | - **timeBucket** | **String**| | - **userId** | **String**| | [optional] - **albumId** | **String**| | [optional] - **personId** | **String**| | [optional] - **isArchived** | **bool**| | [optional] - **isFavorite** | **bool**| | [optional] - **isTrashed** | **bool**| | [optional] - **withStacked** | **bool**| | [optional] - **key** | **String**| | [optional] - -### Return type - -[**List**](AssetResponseDto.md) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **getCuratedLocations** > List getCuratedLocations() @@ -1073,6 +1000,79 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) +# **getTimeBucket** +> List getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key) + + + +### Example +```dart +import 'package:openapi/api.dart'; +// TODO Configure API key authorization: cookie +//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; +// uncomment below to setup prefix (e.g. Bearer) for API key, if needed +//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; +// TODO Configure API key authorization: api_key +//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; +// uncomment below to setup prefix (e.g. Bearer) for API key, if needed +//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; +// TODO Configure HTTP Bearer authorization: bearer +// Case 1. Use String Token +//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); +// Case 2. Use Function which generate token. +// String yourTokenGeneratorFunction() { ... } +//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); + +final api_instance = AssetApi(); +final size = ; // TimeBucketSize | +final timeBucket = timeBucket_example; // String | +final userId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | +final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | +final personId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | +final isArchived = true; // bool | +final isFavorite = true; // bool | +final isTrashed = true; // bool | +final withStacked = true; // bool | +final key = key_example; // String | + +try { + final result = api_instance.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key); + print(result); +} catch (e) { + print('Exception when calling AssetApi->getTimeBucket: $e\n'); +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **size** | [**TimeBucketSize**](.md)| | + **timeBucket** | **String**| | + **userId** | **String**| | [optional] + **albumId** | **String**| | [optional] + **personId** | **String**| | [optional] + **isArchived** | **bool**| | [optional] + **isFavorite** | **bool**| | [optional] + **isTrashed** | **bool**| | [optional] + **withStacked** | **bool**| | [optional] + **key** | **String**| | [optional] + +### Return type + +[**List**](AssetResponseDto.md) + +### Authorization + +[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + # **getTimeBuckets** > List getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key) diff --git a/mobile/openapi/doc/AuthenticationApi.md b/mobile/openapi/doc/AuthenticationApi.md index 67de700967..c56f88228f 100644 --- a/mobile/openapi/doc/AuthenticationApi.md +++ b/mobile/openapi/doc/AuthenticationApi.md @@ -9,57 +9,16 @@ All URIs are relative to */api* Method | HTTP request | Description ------------- | ------------- | ------------- -[**adminSignUp**](AuthenticationApi.md#adminsignup) | **POST** /auth/admin-sign-up | [**changePassword**](AuthenticationApi.md#changepassword) | **POST** /auth/change-password | [**getAuthDevices**](AuthenticationApi.md#getauthdevices) | **GET** /auth/devices | [**login**](AuthenticationApi.md#login) | **POST** /auth/login | [**logout**](AuthenticationApi.md#logout) | **POST** /auth/logout | [**logoutAuthDevice**](AuthenticationApi.md#logoutauthdevice) | **DELETE** /auth/devices/{id} | [**logoutAuthDevices**](AuthenticationApi.md#logoutauthdevices) | **DELETE** /auth/devices | +[**signUpAdmin**](AuthenticationApi.md#signupadmin) | **POST** /auth/admin-sign-up | [**validateAccessToken**](AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | -# **adminSignUp** -> AdminSignupResponseDto adminSignUp(signUpDto) - - - -### Example -```dart -import 'package:openapi/api.dart'; - -final api_instance = AuthenticationApi(); -final signUpDto = SignUpDto(); // SignUpDto | - -try { - final result = api_instance.adminSignUp(signUpDto); - print(result); -} catch (e) { - print('Exception when calling AuthenticationApi->adminSignUp: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **signUpDto** | [**SignUpDto**](SignUpDto.md)| | - -### Return type - -[**AdminSignupResponseDto**](AdminSignupResponseDto.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **changePassword** > UserResponseDto changePassword(changePasswordDto) @@ -362,6 +321,47 @@ void (empty response body) [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) +# **signUpAdmin** +> AdminSignupResponseDto signUpAdmin(signUpDto) + + + +### Example +```dart +import 'package:openapi/api.dart'; + +final api_instance = AuthenticationApi(); +final signUpDto = SignUpDto(); // SignUpDto | + +try { + final result = api_instance.signUpAdmin(signUpDto); + print(result); +} catch (e) { + print('Exception when calling AuthenticationApi->signUpAdmin: $e\n'); +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **signUpDto** | [**SignUpDto**](SignUpDto.md)| | + +### Return type + +[**AdminSignupResponseDto**](AdminSignupResponseDto.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + # **validateAccessToken** > ValidateAccessTokenResponseDto validateAccessToken() diff --git a/mobile/openapi/doc/LibraryApi.md b/mobile/openapi/doc/LibraryApi.md index 2362dfaeac..5ecd46503a 100644 --- a/mobile/openapi/doc/LibraryApi.md +++ b/mobile/openapi/doc/LibraryApi.md @@ -11,7 +11,7 @@ Method | HTTP request | Description ------------- | ------------- | ------------- [**createLibrary**](LibraryApi.md#createlibrary) | **POST** /library | [**deleteLibrary**](LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | -[**getAllForUser**](LibraryApi.md#getallforuser) | **GET** /library | +[**getLibraries**](LibraryApi.md#getlibraries) | **GET** /library | [**getLibraryInfo**](LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | [**getLibraryStatistics**](LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | [**removeOfflineFiles**](LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | @@ -128,8 +128,8 @@ void (empty response body) [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getAllForUser** -> List getAllForUser() +# **getLibraries** +> List getLibraries() @@ -154,10 +154,10 @@ import 'package:openapi/api.dart'; final api_instance = LibraryApi(); try { - final result = api_instance.getAllForUser(); + final result = api_instance.getLibraries(); print(result); } catch (e) { - print('Exception when calling LibraryApi->getAllForUser: $e\n'); + print('Exception when calling LibraryApi->getLibraries: $e\n'); } ``` diff --git a/mobile/openapi/doc/OAuthApi.md b/mobile/openapi/doc/OAuthApi.md index 5a5afc2a15..fa6b19df53 100644 --- a/mobile/openapi/doc/OAuthApi.md +++ b/mobile/openapi/doc/OAuthApi.md @@ -9,57 +9,16 @@ All URIs are relative to */api* Method | HTTP request | Description ------------- | ------------- | ------------- -[**authorizeOAuth**](OAuthApi.md#authorizeoauth) | **POST** /oauth/authorize | -[**callback**](OAuthApi.md#callback) | **POST** /oauth/callback | -[**generateConfig**](OAuthApi.md#generateconfig) | **POST** /oauth/config | -[**link**](OAuthApi.md#link) | **POST** /oauth/link | -[**mobileRedirect**](OAuthApi.md#mobileredirect) | **GET** /oauth/mobile-redirect | -[**unlink**](OAuthApi.md#unlink) | **POST** /oauth/unlink | +[**finishOAuth**](OAuthApi.md#finishoauth) | **POST** /oauth/callback | +[**generateOAuthConfig**](OAuthApi.md#generateoauthconfig) | **POST** /oauth/config | +[**linkOAuthAccount**](OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | +[**redirectOAuthToMobile**](OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | +[**startOAuth**](OAuthApi.md#startoauth) | **POST** /oauth/authorize | +[**unlinkOAuthAccount**](OAuthApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | -# **authorizeOAuth** -> OAuthAuthorizeResponseDto authorizeOAuth(oAuthConfigDto) - - - -### Example -```dart -import 'package:openapi/api.dart'; - -final api_instance = OAuthApi(); -final oAuthConfigDto = OAuthConfigDto(); // OAuthConfigDto | - -try { - final result = api_instance.authorizeOAuth(oAuthConfigDto); - print(result); -} catch (e) { - print('Exception when calling OAuthApi->authorizeOAuth: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **oAuthConfigDto** | [**OAuthConfigDto**](OAuthConfigDto.md)| | - -### Return type - -[**OAuthAuthorizeResponseDto**](OAuthAuthorizeResponseDto.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **callback** -> LoginResponseDto callback(oAuthCallbackDto) +# **finishOAuth** +> LoginResponseDto finishOAuth(oAuthCallbackDto) @@ -71,10 +30,10 @@ final api_instance = OAuthApi(); final oAuthCallbackDto = OAuthCallbackDto(); // OAuthCallbackDto | try { - final result = api_instance.callback(oAuthCallbackDto); + final result = api_instance.finishOAuth(oAuthCallbackDto); print(result); } catch (e) { - print('Exception when calling OAuthApi->callback: $e\n'); + print('Exception when calling OAuthApi->finishOAuth: $e\n'); } ``` @@ -99,8 +58,8 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **generateConfig** -> OAuthConfigResponseDto generateConfig(oAuthConfigDto) +# **generateOAuthConfig** +> OAuthConfigResponseDto generateOAuthConfig(oAuthConfigDto) @@ -114,10 +73,10 @@ final api_instance = OAuthApi(); final oAuthConfigDto = OAuthConfigDto(); // OAuthConfigDto | try { - final result = api_instance.generateConfig(oAuthConfigDto); + final result = api_instance.generateOAuthConfig(oAuthConfigDto); print(result); } catch (e) { - print('Exception when calling OAuthApi->generateConfig: $e\n'); + print('Exception when calling OAuthApi->generateOAuthConfig: $e\n'); } ``` @@ -142,8 +101,8 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **link** -> UserResponseDto link(oAuthCallbackDto) +# **linkOAuthAccount** +> UserResponseDto linkOAuthAccount(oAuthCallbackDto) @@ -169,10 +128,10 @@ final api_instance = OAuthApi(); final oAuthCallbackDto = OAuthCallbackDto(); // OAuthCallbackDto | try { - final result = api_instance.link(oAuthCallbackDto); + final result = api_instance.linkOAuthAccount(oAuthCallbackDto); print(result); } catch (e) { - print('Exception when calling OAuthApi->link: $e\n'); + print('Exception when calling OAuthApi->linkOAuthAccount: $e\n'); } ``` @@ -197,8 +156,8 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **mobileRedirect** -> mobileRedirect() +# **redirectOAuthToMobile** +> redirectOAuthToMobile() @@ -209,9 +168,9 @@ import 'package:openapi/api.dart'; final api_instance = OAuthApi(); try { - api_instance.mobileRedirect(); + api_instance.redirectOAuthToMobile(); } catch (e) { - print('Exception when calling OAuthApi->mobileRedirect: $e\n'); + print('Exception when calling OAuthApi->redirectOAuthToMobile: $e\n'); } ``` @@ -233,8 +192,49 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **unlink** -> UserResponseDto unlink() +# **startOAuth** +> OAuthAuthorizeResponseDto startOAuth(oAuthConfigDto) + + + +### Example +```dart +import 'package:openapi/api.dart'; + +final api_instance = OAuthApi(); +final oAuthConfigDto = OAuthConfigDto(); // OAuthConfigDto | + +try { + final result = api_instance.startOAuth(oAuthConfigDto); + print(result); +} catch (e) { + print('Exception when calling OAuthApi->startOAuth: $e\n'); +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **oAuthConfigDto** | [**OAuthConfigDto**](OAuthConfigDto.md)| | + +### Return type + +[**OAuthAuthorizeResponseDto**](OAuthAuthorizeResponseDto.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + +# **unlinkOAuthAccount** +> UserResponseDto unlinkOAuthAccount() @@ -259,10 +259,10 @@ import 'package:openapi/api.dart'; final api_instance = OAuthApi(); try { - final result = api_instance.unlink(); + final result = api_instance.unlinkOAuthAccount(); print(result); } catch (e) { - print('Exception when calling OAuthApi->unlink: $e\n'); + print('Exception when calling OAuthApi->unlinkOAuthAccount: $e\n'); } ``` diff --git a/mobile/openapi/doc/ServerInfoApi.md b/mobile/openapi/doc/ServerInfoApi.md index 64a373cc03..e8121a8001 100644 --- a/mobile/openapi/doc/ServerInfoApi.md +++ b/mobile/openapi/doc/ServerInfoApi.md @@ -12,8 +12,8 @@ Method | HTTP request | Description [**getServerConfig**](ServerInfoApi.md#getserverconfig) | **GET** /server-info/config | [**getServerFeatures**](ServerInfoApi.md#getserverfeatures) | **GET** /server-info/features | [**getServerInfo**](ServerInfoApi.md#getserverinfo) | **GET** /server-info | +[**getServerStatistics**](ServerInfoApi.md#getserverstatistics) | **GET** /server-info/statistics | [**getServerVersion**](ServerInfoApi.md#getserverversion) | **GET** /server-info/version | -[**getStats**](ServerInfoApi.md#getstats) | **GET** /server-info/stats | [**getSupportedMediaTypes**](ServerInfoApi.md#getsupportedmediatypes) | **GET** /server-info/media-types | [**getTheme**](ServerInfoApi.md#gettheme) | **GET** /server-info/theme | [**pingServer**](ServerInfoApi.md#pingserver) | **GET** /server-info/ping | @@ -144,6 +144,57 @@ This endpoint does not need any parameter. [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) +# **getServerStatistics** +> ServerStatsResponseDto getServerStatistics() + + + +### Example +```dart +import 'package:openapi/api.dart'; +// TODO Configure API key authorization: cookie +//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; +// uncomment below to setup prefix (e.g. Bearer) for API key, if needed +//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; +// TODO Configure API key authorization: api_key +//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; +// uncomment below to setup prefix (e.g. Bearer) for API key, if needed +//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; +// TODO Configure HTTP Bearer authorization: bearer +// Case 1. Use String Token +//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); +// Case 2. Use Function which generate token. +// String yourTokenGeneratorFunction() { ... } +//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); + +final api_instance = ServerInfoApi(); + +try { + final result = api_instance.getServerStatistics(); + print(result); +} catch (e) { + print('Exception when calling ServerInfoApi->getServerStatistics: $e\n'); +} +``` + +### Parameters +This endpoint does not need any parameter. + +### Return type + +[**ServerStatsResponseDto**](ServerStatsResponseDto.md) + +### Authorization + +[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + # **getServerVersion** > ServerVersionResponseDto getServerVersion() @@ -181,57 +232,6 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getStats** -> ServerStatsResponseDto getStats() - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = ServerInfoApi(); - -try { - final result = api_instance.getStats(); - print(result); -} catch (e) { - print('Exception when calling ServerInfoApi->getStats: $e\n'); -} -``` - -### Parameters -This endpoint does not need any parameter. - -### Return type - -[**ServerStatsResponseDto**](ServerStatsResponseDto.md) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **getSupportedMediaTypes** > ServerMediaTypesResponseDto getSupportedMediaTypes() diff --git a/mobile/openapi/doc/SystemConfigApi.md b/mobile/openapi/doc/SystemConfigApi.md index 5767f7bb5c..9377b6e0bb 100644 --- a/mobile/openapi/doc/SystemConfigApi.md +++ b/mobile/openapi/doc/SystemConfigApi.md @@ -10,7 +10,7 @@ All URIs are relative to */api* Method | HTTP request | Description ------------- | ------------- | ------------- [**getConfig**](SystemConfigApi.md#getconfig) | **GET** /system-config | -[**getDefaults**](SystemConfigApi.md#getdefaults) | **GET** /system-config/defaults | +[**getConfigDefaults**](SystemConfigApi.md#getconfigdefaults) | **GET** /system-config/defaults | [**getStorageTemplateOptions**](SystemConfigApi.md#getstoragetemplateoptions) | **GET** /system-config/storage-template-options | [**updateConfig**](SystemConfigApi.md#updateconfig) | **PUT** /system-config | @@ -66,8 +66,8 @@ This endpoint does not need any parameter. [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getDefaults** -> SystemConfigDto getDefaults() +# **getConfigDefaults** +> SystemConfigDto getConfigDefaults() @@ -92,10 +92,10 @@ import 'package:openapi/api.dart'; final api_instance = SystemConfigApi(); try { - final result = api_instance.getDefaults(); + final result = api_instance.getConfigDefaults(); print(result); } catch (e) { - print('Exception when calling SystemConfigApi->getDefaults: $e\n'); + print('Exception when calling SystemConfigApi->getConfigDefaults: $e\n'); } ``` diff --git a/mobile/openapi/lib/api/api_key_api.dart b/mobile/openapi/lib/api/api_key_api.dart index fb6cc9941d..de3bec0ca7 100644 --- a/mobile/openapi/lib/api/api_key_api.dart +++ b/mobile/openapi/lib/api/api_key_api.dart @@ -20,7 +20,7 @@ class APIKeyApi { /// Parameters: /// /// * [APIKeyCreateDto] aPIKeyCreateDto (required): - Future createKeyWithHttpInfo(APIKeyCreateDto aPIKeyCreateDto,) async { + Future createApiKeyWithHttpInfo(APIKeyCreateDto aPIKeyCreateDto,) async { // ignore: prefer_const_declarations final path = r'/api-key'; @@ -48,8 +48,8 @@ class APIKeyApi { /// Parameters: /// /// * [APIKeyCreateDto] aPIKeyCreateDto (required): - Future createKey(APIKeyCreateDto aPIKeyCreateDto,) async { - final response = await createKeyWithHttpInfo(aPIKeyCreateDto,); + Future createApiKey(APIKeyCreateDto aPIKeyCreateDto,) async { + final response = await createApiKeyWithHttpInfo(aPIKeyCreateDto,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -67,7 +67,7 @@ class APIKeyApi { /// Parameters: /// /// * [String] id (required): - Future deleteKeyWithHttpInfo(String id,) async { + Future deleteApiKeyWithHttpInfo(String id,) async { // ignore: prefer_const_declarations final path = r'/api-key/{id}' .replaceAll('{id}', id); @@ -96,8 +96,8 @@ class APIKeyApi { /// Parameters: /// /// * [String] id (required): - Future deleteKey(String id,) async { - final response = await deleteKeyWithHttpInfo(id,); + Future deleteApiKey(String id,) async { + final response = await deleteApiKeyWithHttpInfo(id,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -107,7 +107,7 @@ class APIKeyApi { /// Parameters: /// /// * [String] id (required): - Future getKeyWithHttpInfo(String id,) async { + Future getApiKeyWithHttpInfo(String id,) async { // ignore: prefer_const_declarations final path = r'/api-key/{id}' .replaceAll('{id}', id); @@ -136,8 +136,8 @@ class APIKeyApi { /// Parameters: /// /// * [String] id (required): - Future getKey(String id,) async { - final response = await getKeyWithHttpInfo(id,); + Future getApiKey(String id,) async { + final response = await getApiKeyWithHttpInfo(id,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -152,7 +152,7 @@ class APIKeyApi { } /// Performs an HTTP 'GET /api-key' operation and returns the [Response]. - Future getKeysWithHttpInfo() async { + Future getApiKeysWithHttpInfo() async { // ignore: prefer_const_declarations final path = r'/api-key'; @@ -177,8 +177,8 @@ class APIKeyApi { ); } - Future?> getKeys() async { - final response = await getKeysWithHttpInfo(); + Future?> getApiKeys() async { + final response = await getApiKeysWithHttpInfo(); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -201,7 +201,7 @@ class APIKeyApi { /// * [String] id (required): /// /// * [APIKeyUpdateDto] aPIKeyUpdateDto (required): - Future updateKeyWithHttpInfo(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async { + Future updateApiKeyWithHttpInfo(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async { // ignore: prefer_const_declarations final path = r'/api-key/{id}' .replaceAll('{id}', id); @@ -232,8 +232,8 @@ class APIKeyApi { /// * [String] id (required): /// /// * [APIKeyUpdateDto] aPIKeyUpdateDto (required): - Future updateKey(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async { - final response = await updateKeyWithHttpInfo(id, aPIKeyUpdateDto,); + Future updateApiKey(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async { + final response = await updateApiKeyWithHttpInfo(id, aPIKeyUpdateDto,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } diff --git a/mobile/openapi/lib/api/asset_api.dart b/mobile/openapi/lib/api/asset_api.dart index 866d11a373..b0e9c822d2 100644 --- a/mobile/openapi/lib/api/asset_api.dart +++ b/mobile/openapi/lib/api/asset_api.dart @@ -23,7 +23,7 @@ class AssetApi { /// Parameters: /// /// * [AssetBulkUploadCheckDto] assetBulkUploadCheckDto (required): - Future bulkUploadCheckWithHttpInfo(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async { + Future checkBulkUploadWithHttpInfo(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async { // ignore: prefer_const_declarations final path = r'/asset/bulk-upload-check'; @@ -53,8 +53,8 @@ class AssetApi { /// Parameters: /// /// * [AssetBulkUploadCheckDto] assetBulkUploadCheckDto (required): - Future bulkUploadCheck(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async { - final response = await bulkUploadCheckWithHttpInfo(assetBulkUploadCheckDto,); + Future checkBulkUpload(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async { + final response = await checkBulkUploadWithHttpInfo(assetBulkUploadCheckDto,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -513,7 +513,7 @@ class AssetApi { /// * [bool] isFavorite: /// /// * [bool] isTrashed: - Future getAssetStatsWithHttpInfo({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async { + Future getAssetStatisticsWithHttpInfo({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async { // ignore: prefer_const_declarations final path = r'/asset/statistics'; @@ -555,8 +555,8 @@ class AssetApi { /// * [bool] isFavorite: /// /// * [bool] isTrashed: - Future getAssetStats({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async { - final response = await getAssetStatsWithHttpInfo( isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, ); + Future getAssetStatistics({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async { + final response = await getAssetStatisticsWithHttpInfo( isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, ); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -633,119 +633,6 @@ class AssetApi { return null; } - /// Performs an HTTP 'GET /asset/time-bucket' operation and returns the [Response]. - /// Parameters: - /// - /// * [TimeBucketSize] size (required): - /// - /// * [String] timeBucket (required): - /// - /// * [String] userId: - /// - /// * [String] albumId: - /// - /// * [String] personId: - /// - /// * [bool] isArchived: - /// - /// * [bool] isFavorite: - /// - /// * [bool] isTrashed: - /// - /// * [bool] withStacked: - /// - /// * [String] key: - Future getByTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async { - // ignore: prefer_const_declarations - final path = r'/asset/time-bucket'; - - // ignore: prefer_final_locals - Object? postBody; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - queryParams.addAll(_queryParams('', 'size', size)); - if (userId != null) { - queryParams.addAll(_queryParams('', 'userId', userId)); - } - if (albumId != null) { - queryParams.addAll(_queryParams('', 'albumId', albumId)); - } - if (personId != null) { - queryParams.addAll(_queryParams('', 'personId', personId)); - } - if (isArchived != null) { - queryParams.addAll(_queryParams('', 'isArchived', isArchived)); - } - if (isFavorite != null) { - queryParams.addAll(_queryParams('', 'isFavorite', isFavorite)); - } - if (isTrashed != null) { - queryParams.addAll(_queryParams('', 'isTrashed', isTrashed)); - } - if (withStacked != null) { - queryParams.addAll(_queryParams('', 'withStacked', withStacked)); - } - queryParams.addAll(_queryParams('', 'timeBucket', timeBucket)); - if (key != null) { - queryParams.addAll(_queryParams('', 'key', key)); - } - - const contentTypes = []; - - - return apiClient.invokeAPI( - path, - 'GET', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Parameters: - /// - /// * [TimeBucketSize] size (required): - /// - /// * [String] timeBucket (required): - /// - /// * [String] userId: - /// - /// * [String] albumId: - /// - /// * [String] personId: - /// - /// * [bool] isArchived: - /// - /// * [bool] isFavorite: - /// - /// * [bool] isTrashed: - /// - /// * [bool] withStacked: - /// - /// * [String] key: - Future?> getByTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async { - final response = await getByTimeBucketWithHttpInfo(size, timeBucket, userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, key: key, ); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - final responseBody = await _decodeBodyBytes(response); - return (await apiClient.deserializeAsync(responseBody, 'List') as List) - .cast() - .toList(); - - } - return null; - } - /// Performs an HTTP 'GET /asset/curated-locations' operation and returns the [Response]. Future getCuratedLocationsWithHttpInfo() async { // ignore: prefer_const_declarations @@ -1075,6 +962,119 @@ class AssetApi { return null; } + /// Performs an HTTP 'GET /asset/time-bucket' operation and returns the [Response]. + /// Parameters: + /// + /// * [TimeBucketSize] size (required): + /// + /// * [String] timeBucket (required): + /// + /// * [String] userId: + /// + /// * [String] albumId: + /// + /// * [String] personId: + /// + /// * [bool] isArchived: + /// + /// * [bool] isFavorite: + /// + /// * [bool] isTrashed: + /// + /// * [bool] withStacked: + /// + /// * [String] key: + Future getTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async { + // ignore: prefer_const_declarations + final path = r'/asset/time-bucket'; + + // ignore: prefer_final_locals + Object? postBody; + + final queryParams = []; + final headerParams = {}; + final formParams = {}; + + queryParams.addAll(_queryParams('', 'size', size)); + if (userId != null) { + queryParams.addAll(_queryParams('', 'userId', userId)); + } + if (albumId != null) { + queryParams.addAll(_queryParams('', 'albumId', albumId)); + } + if (personId != null) { + queryParams.addAll(_queryParams('', 'personId', personId)); + } + if (isArchived != null) { + queryParams.addAll(_queryParams('', 'isArchived', isArchived)); + } + if (isFavorite != null) { + queryParams.addAll(_queryParams('', 'isFavorite', isFavorite)); + } + if (isTrashed != null) { + queryParams.addAll(_queryParams('', 'isTrashed', isTrashed)); + } + if (withStacked != null) { + queryParams.addAll(_queryParams('', 'withStacked', withStacked)); + } + queryParams.addAll(_queryParams('', 'timeBucket', timeBucket)); + if (key != null) { + queryParams.addAll(_queryParams('', 'key', key)); + } + + const contentTypes = []; + + + return apiClient.invokeAPI( + path, + 'GET', + queryParams, + postBody, + headerParams, + formParams, + contentTypes.isEmpty ? null : contentTypes.first, + ); + } + + /// Parameters: + /// + /// * [TimeBucketSize] size (required): + /// + /// * [String] timeBucket (required): + /// + /// * [String] userId: + /// + /// * [String] albumId: + /// + /// * [String] personId: + /// + /// * [bool] isArchived: + /// + /// * [bool] isFavorite: + /// + /// * [bool] isTrashed: + /// + /// * [bool] withStacked: + /// + /// * [String] key: + Future?> getTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async { + final response = await getTimeBucketWithHttpInfo(size, timeBucket, userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, key: key, ); + if (response.statusCode >= HttpStatus.badRequest) { + throw ApiException(response.statusCode, await _decodeBodyBytes(response)); + } + // When a remote server returns no body with a status of 204, we shall not decode it. + // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" + // FormatException when trying to decode an empty string. + if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { + final responseBody = await _decodeBodyBytes(response); + return (await apiClient.deserializeAsync(responseBody, 'List') as List) + .cast() + .toList(); + + } + return null; + } + /// Performs an HTTP 'GET /asset/time-buckets' operation and returns the [Response]. /// Parameters: /// diff --git a/mobile/openapi/lib/api/authentication_api.dart b/mobile/openapi/lib/api/authentication_api.dart index 5035d51558..3b986d34d2 100644 --- a/mobile/openapi/lib/api/authentication_api.dart +++ b/mobile/openapi/lib/api/authentication_api.dart @@ -16,53 +16,6 @@ class AuthenticationApi { final ApiClient apiClient; - /// Performs an HTTP 'POST /auth/admin-sign-up' operation and returns the [Response]. - /// Parameters: - /// - /// * [SignUpDto] signUpDto (required): - Future adminSignUpWithHttpInfo(SignUpDto signUpDto,) async { - // ignore: prefer_const_declarations - final path = r'/auth/admin-sign-up'; - - // ignore: prefer_final_locals - Object? postBody = signUpDto; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - const contentTypes = ['application/json']; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Parameters: - /// - /// * [SignUpDto] signUpDto (required): - Future adminSignUp(SignUpDto signUpDto,) async { - final response = await adminSignUpWithHttpInfo(signUpDto,); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AdminSignupResponseDto',) as AdminSignupResponseDto; - - } - return null; - } - /// Performs an HTTP 'POST /auth/change-password' operation and returns the [Response]. /// Parameters: /// @@ -315,6 +268,53 @@ class AuthenticationApi { } } + /// Performs an HTTP 'POST /auth/admin-sign-up' operation and returns the [Response]. + /// Parameters: + /// + /// * [SignUpDto] signUpDto (required): + Future signUpAdminWithHttpInfo(SignUpDto signUpDto,) async { + // ignore: prefer_const_declarations + final path = r'/auth/admin-sign-up'; + + // ignore: prefer_final_locals + Object? postBody = signUpDto; + + final queryParams = []; + final headerParams = {}; + final formParams = {}; + + const contentTypes = ['application/json']; + + + return apiClient.invokeAPI( + path, + 'POST', + queryParams, + postBody, + headerParams, + formParams, + contentTypes.isEmpty ? null : contentTypes.first, + ); + } + + /// Parameters: + /// + /// * [SignUpDto] signUpDto (required): + Future signUpAdmin(SignUpDto signUpDto,) async { + final response = await signUpAdminWithHttpInfo(signUpDto,); + if (response.statusCode >= HttpStatus.badRequest) { + throw ApiException(response.statusCode, await _decodeBodyBytes(response)); + } + // When a remote server returns no body with a status of 204, we shall not decode it. + // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" + // FormatException when trying to decode an empty string. + if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { + return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AdminSignupResponseDto',) as AdminSignupResponseDto; + + } + return null; + } + /// Performs an HTTP 'POST /auth/validateToken' operation and returns the [Response]. Future validateAccessTokenWithHttpInfo() async { // ignore: prefer_const_declarations diff --git a/mobile/openapi/lib/api/library_api.dart b/mobile/openapi/lib/api/library_api.dart index ec08a646de..a5273dbb0b 100644 --- a/mobile/openapi/lib/api/library_api.dart +++ b/mobile/openapi/lib/api/library_api.dart @@ -104,7 +104,7 @@ class LibraryApi { } /// Performs an HTTP 'GET /library' operation and returns the [Response]. - Future getAllForUserWithHttpInfo() async { + Future getLibrariesWithHttpInfo() async { // ignore: prefer_const_declarations final path = r'/library'; @@ -129,8 +129,8 @@ class LibraryApi { ); } - Future?> getAllForUser() async { - final response = await getAllForUserWithHttpInfo(); + Future?> getLibraries() async { + final response = await getLibrariesWithHttpInfo(); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } diff --git a/mobile/openapi/lib/api/o_auth_api.dart b/mobile/openapi/lib/api/o_auth_api.dart index 0f2e72e2fa..c0d6bc06e0 100644 --- a/mobile/openapi/lib/api/o_auth_api.dart +++ b/mobile/openapi/lib/api/o_auth_api.dart @@ -16,58 +16,11 @@ class OAuthApi { final ApiClient apiClient; - /// Performs an HTTP 'POST /oauth/authorize' operation and returns the [Response]. - /// Parameters: - /// - /// * [OAuthConfigDto] oAuthConfigDto (required): - Future authorizeOAuthWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async { - // ignore: prefer_const_declarations - final path = r'/oauth/authorize'; - - // ignore: prefer_final_locals - Object? postBody = oAuthConfigDto; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - const contentTypes = ['application/json']; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Parameters: - /// - /// * [OAuthConfigDto] oAuthConfigDto (required): - Future authorizeOAuth(OAuthConfigDto oAuthConfigDto,) async { - final response = await authorizeOAuthWithHttpInfo(oAuthConfigDto,); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'OAuthAuthorizeResponseDto',) as OAuthAuthorizeResponseDto; - - } - return null; - } - /// Performs an HTTP 'POST /oauth/callback' operation and returns the [Response]. /// Parameters: /// /// * [OAuthCallbackDto] oAuthCallbackDto (required): - Future callbackWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async { + Future finishOAuthWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async { // ignore: prefer_const_declarations final path = r'/oauth/callback'; @@ -95,8 +48,8 @@ class OAuthApi { /// Parameters: /// /// * [OAuthCallbackDto] oAuthCallbackDto (required): - Future callback(OAuthCallbackDto oAuthCallbackDto,) async { - final response = await callbackWithHttpInfo(oAuthCallbackDto,); + Future finishOAuth(OAuthCallbackDto oAuthCallbackDto,) async { + final response = await finishOAuthWithHttpInfo(oAuthCallbackDto,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -117,7 +70,7 @@ class OAuthApi { /// Parameters: /// /// * [OAuthConfigDto] oAuthConfigDto (required): - Future generateConfigWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async { + Future generateOAuthConfigWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async { // ignore: prefer_const_declarations final path = r'/oauth/config'; @@ -147,8 +100,8 @@ class OAuthApi { /// Parameters: /// /// * [OAuthConfigDto] oAuthConfigDto (required): - Future generateConfig(OAuthConfigDto oAuthConfigDto,) async { - final response = await generateConfigWithHttpInfo(oAuthConfigDto,); + Future generateOAuthConfig(OAuthConfigDto oAuthConfigDto,) async { + final response = await generateOAuthConfigWithHttpInfo(oAuthConfigDto,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -166,7 +119,7 @@ class OAuthApi { /// Parameters: /// /// * [OAuthCallbackDto] oAuthCallbackDto (required): - Future linkWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async { + Future linkOAuthAccountWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async { // ignore: prefer_const_declarations final path = r'/oauth/link'; @@ -194,8 +147,8 @@ class OAuthApi { /// Parameters: /// /// * [OAuthCallbackDto] oAuthCallbackDto (required): - Future link(OAuthCallbackDto oAuthCallbackDto,) async { - final response = await linkWithHttpInfo(oAuthCallbackDto,); + Future linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto,) async { + final response = await linkOAuthAccountWithHttpInfo(oAuthCallbackDto,); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } @@ -210,7 +163,7 @@ class OAuthApi { } /// Performs an HTTP 'GET /oauth/mobile-redirect' operation and returns the [Response]. - Future mobileRedirectWithHttpInfo() async { + Future redirectOAuthToMobileWithHttpInfo() async { // ignore: prefer_const_declarations final path = r'/oauth/mobile-redirect'; @@ -235,15 +188,62 @@ class OAuthApi { ); } - Future mobileRedirect() async { - final response = await mobileRedirectWithHttpInfo(); + Future redirectOAuthToMobile() async { + final response = await redirectOAuthToMobileWithHttpInfo(); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } } + /// Performs an HTTP 'POST /oauth/authorize' operation and returns the [Response]. + /// Parameters: + /// + /// * [OAuthConfigDto] oAuthConfigDto (required): + Future startOAuthWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async { + // ignore: prefer_const_declarations + final path = r'/oauth/authorize'; + + // ignore: prefer_final_locals + Object? postBody = oAuthConfigDto; + + final queryParams = []; + final headerParams = {}; + final formParams = {}; + + const contentTypes = ['application/json']; + + + return apiClient.invokeAPI( + path, + 'POST', + queryParams, + postBody, + headerParams, + formParams, + contentTypes.isEmpty ? null : contentTypes.first, + ); + } + + /// Parameters: + /// + /// * [OAuthConfigDto] oAuthConfigDto (required): + Future startOAuth(OAuthConfigDto oAuthConfigDto,) async { + final response = await startOAuthWithHttpInfo(oAuthConfigDto,); + if (response.statusCode >= HttpStatus.badRequest) { + throw ApiException(response.statusCode, await _decodeBodyBytes(response)); + } + // When a remote server returns no body with a status of 204, we shall not decode it. + // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" + // FormatException when trying to decode an empty string. + if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { + return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'OAuthAuthorizeResponseDto',) as OAuthAuthorizeResponseDto; + + } + return null; + } + /// Performs an HTTP 'POST /oauth/unlink' operation and returns the [Response]. - Future unlinkWithHttpInfo() async { + Future unlinkOAuthAccountWithHttpInfo() async { // ignore: prefer_const_declarations final path = r'/oauth/unlink'; @@ -268,8 +268,8 @@ class OAuthApi { ); } - Future unlink() async { - final response = await unlinkWithHttpInfo(); + Future unlinkOAuthAccount() async { + final response = await unlinkOAuthAccountWithHttpInfo(); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } diff --git a/mobile/openapi/lib/api/server_info_api.dart b/mobile/openapi/lib/api/server_info_api.dart index b8ea50ba8e..b67045add1 100644 --- a/mobile/openapi/lib/api/server_info_api.dart +++ b/mobile/openapi/lib/api/server_info_api.dart @@ -139,6 +139,47 @@ class ServerInfoApi { return null; } + /// Performs an HTTP 'GET /server-info/statistics' operation and returns the [Response]. + Future getServerStatisticsWithHttpInfo() async { + // ignore: prefer_const_declarations + final path = r'/server-info/statistics'; + + // ignore: prefer_final_locals + Object? postBody; + + final queryParams = []; + final headerParams = {}; + final formParams = {}; + + const contentTypes = []; + + + return apiClient.invokeAPI( + path, + 'GET', + queryParams, + postBody, + headerParams, + formParams, + contentTypes.isEmpty ? null : contentTypes.first, + ); + } + + Future getServerStatistics() async { + final response = await getServerStatisticsWithHttpInfo(); + if (response.statusCode >= HttpStatus.badRequest) { + throw ApiException(response.statusCode, await _decodeBodyBytes(response)); + } + // When a remote server returns no body with a status of 204, we shall not decode it. + // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" + // FormatException when trying to decode an empty string. + if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { + return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'ServerStatsResponseDto',) as ServerStatsResponseDto; + + } + return null; + } + /// Performs an HTTP 'GET /server-info/version' operation and returns the [Response]. Future getServerVersionWithHttpInfo() async { // ignore: prefer_const_declarations @@ -180,47 +221,6 @@ class ServerInfoApi { return null; } - /// Performs an HTTP 'GET /server-info/stats' operation and returns the [Response]. - Future getStatsWithHttpInfo() async { - // ignore: prefer_const_declarations - final path = r'/server-info/stats'; - - // ignore: prefer_final_locals - Object? postBody; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - const contentTypes = []; - - - return apiClient.invokeAPI( - path, - 'GET', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - Future getStats() async { - final response = await getStatsWithHttpInfo(); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'ServerStatsResponseDto',) as ServerStatsResponseDto; - - } - return null; - } - /// Performs an HTTP 'GET /server-info/media-types' operation and returns the [Response]. Future getSupportedMediaTypesWithHttpInfo() async { // ignore: prefer_const_declarations diff --git a/mobile/openapi/lib/api/system_config_api.dart b/mobile/openapi/lib/api/system_config_api.dart index d2d0ac5ba5..c8b0c58ec3 100644 --- a/mobile/openapi/lib/api/system_config_api.dart +++ b/mobile/openapi/lib/api/system_config_api.dart @@ -58,7 +58,7 @@ class SystemConfigApi { } /// Performs an HTTP 'GET /system-config/defaults' operation and returns the [Response]. - Future getDefaultsWithHttpInfo() async { + Future getConfigDefaultsWithHttpInfo() async { // ignore: prefer_const_declarations final path = r'/system-config/defaults'; @@ -83,8 +83,8 @@ class SystemConfigApi { ); } - Future getDefaults() async { - final response = await getDefaultsWithHttpInfo(); + Future getConfigDefaults() async { + final response = await getConfigDefaultsWithHttpInfo(); if (response.statusCode >= HttpStatus.badRequest) { throw ApiException(response.statusCode, await _decodeBodyBytes(response)); } diff --git a/mobile/openapi/test/api_key_api_test.dart b/mobile/openapi/test/api_key_api_test.dart index 2e02bae722..679abffbd4 100644 --- a/mobile/openapi/test/api_key_api_test.dart +++ b/mobile/openapi/test/api_key_api_test.dart @@ -17,28 +17,28 @@ void main() { // final instance = APIKeyApi(); group('tests for APIKeyApi', () { - //Future createKey(APIKeyCreateDto aPIKeyCreateDto) async - test('test createKey', () async { + //Future createApiKey(APIKeyCreateDto aPIKeyCreateDto) async + test('test createApiKey', () async { // TODO }); - //Future deleteKey(String id) async - test('test deleteKey', () async { + //Future deleteApiKey(String id) async + test('test deleteApiKey', () async { // TODO }); - //Future getKey(String id) async - test('test getKey', () async { + //Future getApiKey(String id) async + test('test getApiKey', () async { // TODO }); - //Future> getKeys() async - test('test getKeys', () async { + //Future> getApiKeys() async + test('test getApiKeys', () async { // TODO }); - //Future updateKey(String id, APIKeyUpdateDto aPIKeyUpdateDto) async - test('test updateKey', () async { + //Future updateApiKey(String id, APIKeyUpdateDto aPIKeyUpdateDto) async + test('test updateApiKey', () async { // TODO }); diff --git a/mobile/openapi/test/asset_api_test.dart b/mobile/openapi/test/asset_api_test.dart index c2a07323c5..453982cf1e 100644 --- a/mobile/openapi/test/asset_api_test.dart +++ b/mobile/openapi/test/asset_api_test.dart @@ -19,8 +19,8 @@ void main() { group('tests for AssetApi', () { // Checks if assets exist by checksums // - //Future bulkUploadCheck(AssetBulkUploadCheckDto assetBulkUploadCheckDto) async - test('test bulkUploadCheck', () async { + //Future checkBulkUpload(AssetBulkUploadCheckDto assetBulkUploadCheckDto) async + test('test checkBulkUpload', () async { // TODO }); @@ -70,8 +70,8 @@ void main() { // TODO }); - //Future getAssetStats({ bool isArchived, bool isFavorite, bool isTrashed }) async - test('test getAssetStats', () async { + //Future getAssetStatistics({ bool isArchived, bool isFavorite, bool isTrashed }) async + test('test getAssetStatistics', () async { // TODO }); @@ -80,11 +80,6 @@ void main() { // TODO }); - //Future> getByTimeBucket(TimeBucketSize size, String timeBucket, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, bool withStacked, String key }) async - test('test getByTimeBucket', () async { - // TODO - }); - //Future> getCuratedLocations() async test('test getCuratedLocations', () async { // TODO @@ -115,6 +110,11 @@ void main() { // TODO }); + //Future> getTimeBucket(TimeBucketSize size, String timeBucket, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, bool withStacked, String key }) async + test('test getTimeBucket', () async { + // TODO + }); + //Future> getTimeBuckets(TimeBucketSize size, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, bool withStacked, String key }) async test('test getTimeBuckets', () async { // TODO diff --git a/mobile/openapi/test/authentication_api_test.dart b/mobile/openapi/test/authentication_api_test.dart index 9fed80d71c..22eb7550ff 100644 --- a/mobile/openapi/test/authentication_api_test.dart +++ b/mobile/openapi/test/authentication_api_test.dart @@ -17,11 +17,6 @@ void main() { // final instance = AuthenticationApi(); group('tests for AuthenticationApi', () { - //Future adminSignUp(SignUpDto signUpDto) async - test('test adminSignUp', () async { - // TODO - }); - //Future changePassword(ChangePasswordDto changePasswordDto) async test('test changePassword', () async { // TODO @@ -52,6 +47,11 @@ void main() { // TODO }); + //Future signUpAdmin(SignUpDto signUpDto) async + test('test signUpAdmin', () async { + // TODO + }); + //Future validateAccessToken() async test('test validateAccessToken', () async { // TODO diff --git a/mobile/openapi/test/library_api_test.dart b/mobile/openapi/test/library_api_test.dart index 485ecb4b4f..85882edbd1 100644 --- a/mobile/openapi/test/library_api_test.dart +++ b/mobile/openapi/test/library_api_test.dart @@ -27,8 +27,8 @@ void main() { // TODO }); - //Future> getAllForUser() async - test('test getAllForUser', () async { + //Future> getLibraries() async + test('test getLibraries', () async { // TODO }); diff --git a/mobile/openapi/test/o_auth_api_test.dart b/mobile/openapi/test/o_auth_api_test.dart index 7a3ee0a9fb..52326d423f 100644 --- a/mobile/openapi/test/o_auth_api_test.dart +++ b/mobile/openapi/test/o_auth_api_test.dart @@ -17,35 +17,35 @@ void main() { // final instance = OAuthApi(); group('tests for OAuthApi', () { - //Future authorizeOAuth(OAuthConfigDto oAuthConfigDto) async - test('test authorizeOAuth', () async { - // TODO - }); - - //Future callback(OAuthCallbackDto oAuthCallbackDto) async - test('test callback', () async { + //Future finishOAuth(OAuthCallbackDto oAuthCallbackDto) async + test('test finishOAuth', () async { // TODO }); // @deprecated use feature flags and /oauth/authorize // - //Future generateConfig(OAuthConfigDto oAuthConfigDto) async - test('test generateConfig', () async { + //Future generateOAuthConfig(OAuthConfigDto oAuthConfigDto) async + test('test generateOAuthConfig', () async { // TODO }); - //Future link(OAuthCallbackDto oAuthCallbackDto) async - test('test link', () async { + //Future linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto) async + test('test linkOAuthAccount', () async { // TODO }); - //Future mobileRedirect() async - test('test mobileRedirect', () async { + //Future redirectOAuthToMobile() async + test('test redirectOAuthToMobile', () async { // TODO }); - //Future unlink() async - test('test unlink', () async { + //Future startOAuth(OAuthConfigDto oAuthConfigDto) async + test('test startOAuth', () async { + // TODO + }); + + //Future unlinkOAuthAccount() async + test('test unlinkOAuthAccount', () async { // TODO }); diff --git a/mobile/openapi/test/server_info_api_test.dart b/mobile/openapi/test/server_info_api_test.dart index f431f521b0..dac465116e 100644 --- a/mobile/openapi/test/server_info_api_test.dart +++ b/mobile/openapi/test/server_info_api_test.dart @@ -32,13 +32,13 @@ void main() { // TODO }); - //Future getServerVersion() async - test('test getServerVersion', () async { + //Future getServerStatistics() async + test('test getServerStatistics', () async { // TODO }); - //Future getStats() async - test('test getStats', () async { + //Future getServerVersion() async + test('test getServerVersion', () async { // TODO }); diff --git a/mobile/openapi/test/system_config_api_test.dart b/mobile/openapi/test/system_config_api_test.dart index 6cb7aa79d1..b8e57aaaee 100644 --- a/mobile/openapi/test/system_config_api_test.dart +++ b/mobile/openapi/test/system_config_api_test.dart @@ -22,8 +22,8 @@ void main() { // TODO }); - //Future getDefaults() async - test('test getDefaults', () async { + //Future getConfigDefaults() async + test('test getConfigDefaults', () async { // TODO }); diff --git a/server/immich-openapi-specs.json b/server/immich-openapi-specs.json index 822513720b..75a57043f0 100644 --- a/server/immich-openapi-specs.json +++ b/server/immich-openapi-specs.json @@ -678,7 +678,7 @@ }, "/api-key": { "get": { - "operationId": "getKeys", + "operationId": "getApiKeys", "parameters": [], "responses": { "200": { @@ -711,7 +711,7 @@ ] }, "post": { - "operationId": "createKey", + "operationId": "createApiKey", "parameters": [], "requestBody": { "content": { @@ -753,7 +753,7 @@ }, "/api-key/{id}": { "delete": { - "operationId": "deleteKey", + "operationId": "deleteApiKey", "parameters": [ { "name": "id", @@ -786,7 +786,7 @@ ] }, "get": { - "operationId": "getKey", + "operationId": "getApiKey", "parameters": [ { "name": "id", @@ -826,7 +826,7 @@ ] }, "put": { - "operationId": "updateKey", + "operationId": "updateApiKey", "parameters": [ { "name": "id", @@ -1084,7 +1084,7 @@ "/asset/bulk-upload-check": { "post": { "description": "Checks if assets exist by checksums", - "operationId": "bulkUploadCheck", + "operationId": "checkBulkUpload", "parameters": [], "requestBody": { "content": { @@ -1855,7 +1855,7 @@ }, "/asset/statistics": { "get": { - "operationId": "getAssetStats", + "operationId": "getAssetStatistics", "parameters": [ { "name": "isArchived", @@ -1977,7 +1977,7 @@ }, "/asset/time-bucket": { "get": { - "operationId": "getByTimeBucket", + "operationId": "getTimeBucket", "parameters": [ { "name": "size", @@ -2596,7 +2596,7 @@ }, "/auth/admin-sign-up": { "post": { - "operationId": "adminSignUp", + "operationId": "signUpAdmin", "parameters": [], "requestBody": { "content": { @@ -2943,7 +2943,7 @@ }, "/library": { "get": { - "operationId": "getAllForUser", + "operationId": "getLibraries", "parameters": [], "responses": { "200": { @@ -3265,7 +3265,7 @@ }, "/oauth/authorize": { "post": { - "operationId": "authorizeOAuth", + "operationId": "startOAuth", "parameters": [], "requestBody": { "content": { @@ -3296,7 +3296,7 @@ }, "/oauth/callback": { "post": { - "operationId": "callback", + "operationId": "finishOAuth", "parameters": [], "requestBody": { "content": { @@ -3329,7 +3329,7 @@ "post": { "deprecated": true, "description": "@deprecated use feature flags and /oauth/authorize", - "operationId": "generateConfig", + "operationId": "generateOAuthConfig", "parameters": [], "requestBody": { "content": { @@ -3360,7 +3360,7 @@ }, "/oauth/link": { "post": { - "operationId": "link", + "operationId": "linkOAuthAccount", "parameters": [], "requestBody": { "content": { @@ -3402,7 +3402,7 @@ }, "/oauth/mobile-redirect": { "get": { - "operationId": "mobileRedirect", + "operationId": "redirectOAuthToMobile", "parameters": [], "responses": { "200": { @@ -3416,7 +3416,7 @@ }, "/oauth/unlink": { "post": { - "operationId": "unlink", + "operationId": "unlinkOAuthAccount", "parameters": [], "responses": { "201": { @@ -4307,9 +4307,9 @@ ] } }, - "/server-info/stats": { + "/server-info/statistics": { "get": { - "operationId": "getStats", + "operationId": "getServerStatistics", "parameters": [], "responses": { "200": { @@ -4837,7 +4837,7 @@ }, "/system-config/defaults": { "get": { - "operationId": "getDefaults", + "operationId": "getConfigDefaults", "parameters": [], "responses": { "200": { diff --git a/server/src/domain/asset/asset.service.spec.ts b/server/src/domain/asset/asset.service.spec.ts index 663769d9c1..7b93935f62 100644 --- a/server/src/domain/asset/asset.service.spec.ts +++ b/server/src/domain/asset/asset.service.spec.ts @@ -331,17 +331,17 @@ describe(AssetService.name, () => { }); }); - describe('getByTimeBucket', () => { + describe('getTimeBucket', () => { it('should return the assets for a album time bucket if user has album.read', async () => { accessMock.album.hasOwnerAccess.mockResolvedValue(true); - assetMock.getByTimeBucket.mockResolvedValue([assetStub.image]); + assetMock.getTimeBucket.mockResolvedValue([assetStub.image]); await expect( - sut.getByTimeBucket(authStub.admin, { size: TimeBucketSize.DAY, timeBucket: 'bucket', albumId: 'album-id' }), + sut.getTimeBucket(authStub.admin, { size: TimeBucketSize.DAY, timeBucket: 'bucket', albumId: 'album-id' }), ).resolves.toEqual(expect.arrayContaining([expect.objectContaining({ id: 'asset-id' })])); expect(accessMock.album.hasOwnerAccess).toHaveBeenCalledWith(authStub.admin.id, 'album-id'); - expect(assetMock.getByTimeBucket).toBeCalledWith('bucket', { + expect(assetMock.getTimeBucket).toBeCalledWith('bucket', { size: TimeBucketSize.DAY, timeBucket: 'bucket', albumId: 'album-id', @@ -349,17 +349,17 @@ describe(AssetService.name, () => { }); it('should return the assets for a archive time bucket if user has archive.read', async () => { - assetMock.getByTimeBucket.mockResolvedValue([assetStub.image]); + assetMock.getTimeBucket.mockResolvedValue([assetStub.image]); await expect( - sut.getByTimeBucket(authStub.admin, { + sut.getTimeBucket(authStub.admin, { size: TimeBucketSize.DAY, timeBucket: 'bucket', isArchived: true, userId: authStub.admin.id, }), ).resolves.toEqual(expect.arrayContaining([expect.objectContaining({ id: 'asset-id' })])); - expect(assetMock.getByTimeBucket).toBeCalledWith('bucket', { + expect(assetMock.getTimeBucket).toBeCalledWith('bucket', { size: TimeBucketSize.DAY, timeBucket: 'bucket', isArchived: true, @@ -368,16 +368,16 @@ describe(AssetService.name, () => { }); it('should return the assets for a library time bucket if user has library.read', async () => { - assetMock.getByTimeBucket.mockResolvedValue([assetStub.image]); + assetMock.getTimeBucket.mockResolvedValue([assetStub.image]); await expect( - sut.getByTimeBucket(authStub.admin, { + sut.getTimeBucket(authStub.admin, { size: TimeBucketSize.DAY, timeBucket: 'bucket', userId: authStub.admin.id, }), ).resolves.toEqual(expect.arrayContaining([expect.objectContaining({ id: 'asset-id' })])); - expect(assetMock.getByTimeBucket).toBeCalledWith('bucket', { + expect(assetMock.getTimeBucket).toBeCalledWith('bucket', { size: TimeBucketSize.DAY, timeBucket: 'bucket', userId: authStub.admin.id, diff --git a/server/src/domain/asset/asset.service.ts b/server/src/domain/asset/asset.service.ts index 9b6322dacd..34da786806 100644 --- a/server/src/domain/asset/asset.service.ts +++ b/server/src/domain/asset/asset.service.ts @@ -194,12 +194,12 @@ export class AssetService { return this.assetRepository.getTimeBuckets(dto); } - async getByTimeBucket( + async getTimeBucket( authUser: AuthUserDto, dto: TimeBucketAssetDto, ): Promise { await this.timeBucketChecks(authUser, dto); - const assets = await this.assetRepository.getByTimeBucket(dto.timeBucket, dto); + const assets = await this.assetRepository.getTimeBucket(dto.timeBucket, dto); if (authUser.isShowMetadata) { return assets.map((asset) => mapAsset(asset, { withStack: true })); } else { diff --git a/server/src/domain/auth/auth.service.ts b/server/src/domain/auth/auth.service.ts index 5b65909fa4..289f50bfb2 100644 --- a/server/src/domain/auth/auth.service.ts +++ b/server/src/domain/auth/auth.service.ts @@ -315,13 +315,8 @@ export class AuthService { const redirectUri = this.normalize(config, url.split('?')[0]); const client = await this.getOAuthClient(config); const params = client.callbackParams(url); - try { - const tokens = await client.callback(redirectUri, params, { state: params.state }); - return client.userinfo(tokens.access_token || ''); - } catch (error: Error | any) { - this.logger.error(`Unable to complete OAuth login: ${error}`, error?.stack); - throw new InternalServerErrorException(`Unable to complete OAuth login: ${error}`, { cause: error }); - } + const tokens = await client.callback(redirectUri, params, { state: params.state }); + return client.userinfo(tokens.access_token || ''); } private async getOAuthClient(config: SystemConfig) { diff --git a/server/src/domain/repositories/asset.repository.ts b/server/src/domain/repositories/asset.repository.ts index 086b9ba1ad..bdbdd78f2f 100644 --- a/server/src/domain/repositories/asset.repository.ts +++ b/server/src/domain/repositories/asset.repository.ts @@ -123,6 +123,6 @@ export interface IAssetRepository { getMapMarkers(ownerId: string, options?: MapMarkerSearchOptions): Promise; getStatistics(ownerId: string, options: AssetStatsOptions): Promise; getTimeBuckets(options: TimeBucketOptions): Promise; - getByTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise; + getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise; upsertExif(exif: Partial): Promise; } diff --git a/server/src/domain/server-info/server-info.service.spec.ts b/server/src/domain/server-info/server-info.service.spec.ts index 4f6b24680d..f4025a331b 100644 --- a/server/src/domain/server-info/server-info.service.spec.ts +++ b/server/src/domain/server-info/server-info.service.spec.ts @@ -220,7 +220,7 @@ describe(ServerInfoService.name, () => { }, ]); - await expect(sut.getStats()).resolves.toEqual({ + await expect(sut.getStatistics()).resolves.toEqual({ photos: 120, videos: 31, usage: 1123455, diff --git a/server/src/domain/server-info/server-info.service.ts b/server/src/domain/server-info/server-info.service.ts index f2d3123432..dc2efd4160 100644 --- a/server/src/domain/server-info/server-info.service.ts +++ b/server/src/domain/server-info/server-info.service.ts @@ -92,7 +92,7 @@ export class ServerInfoService { }; } - async getStats(): Promise { + async getStatistics(): Promise { const userStats: UserStatsQueryResponse[] = await this.userRepository.getUserStats(); const serverStats = new ServerStatsResponseDto(); diff --git a/server/src/domain/user/user.core.ts b/server/src/domain/user/user.core.ts index 2d1d468381..431caa8e1f 100644 --- a/server/src/domain/user/user.core.ts +++ b/server/src/domain/user/user.core.ts @@ -1,5 +1,5 @@ import { LibraryType, UserEntity } from '@app/infra/entities'; -import { BadRequestException, ForbiddenException, InternalServerErrorException, Logger } from '@nestjs/common'; +import { BadRequestException, ForbiddenException } from '@nestjs/common'; import path from 'path'; import sanitize from 'sanitize-filename'; import { AuthUserDto } from '../auth'; @@ -61,26 +61,21 @@ export class UserCore { } } - try { - if (dto.password) { - dto.password = await this.cryptoRepository.hashBcrypt(dto.password, SALT_ROUNDS); - } - - if (dto.storageLabel === '') { - dto.storageLabel = null; - } - - if (dto.externalPath === '') { - dto.externalPath = null; - } else if (dto.externalPath) { - dto.externalPath = path.normalize(dto.externalPath); - } - - return this.userRepository.update(id, dto); - } catch (e) { - Logger.error(e, 'Failed to update user info'); - throw new InternalServerErrorException('Failed to update user info'); + if (dto.password) { + dto.password = await this.cryptoRepository.hashBcrypt(dto.password, SALT_ROUNDS); } + + if (dto.storageLabel === '') { + dto.storageLabel = null; + } + + if (dto.externalPath === '') { + dto.externalPath = null; + } else if (dto.externalPath) { + dto.externalPath = path.normalize(dto.externalPath); + } + + return this.userRepository.update(id, dto); } async createUser(dto: Partial & { email: string }): Promise { @@ -96,30 +91,25 @@ export class UserCore { } } - try { - const payload: Partial = { ...dto }; - if (payload.password) { - payload.password = await this.cryptoRepository.hashBcrypt(payload.password, SALT_ROUNDS); - } - if (payload.storageLabel) { - payload.storageLabel = sanitize(payload.storageLabel); - } - - const userEntity = await this.userRepository.create(payload); - await this.libraryRepository.create({ - owner: { id: userEntity.id } as UserEntity, - name: 'Default Library', - assets: [], - type: LibraryType.UPLOAD, - importPaths: [], - exclusionPatterns: [], - isVisible: true, - }); - - return userEntity; - } catch (e) { - Logger.error(e, 'Create new user'); - throw new InternalServerErrorException('Failed to register new user'); + const payload: Partial = { ...dto }; + if (payload.password) { + payload.password = await this.cryptoRepository.hashBcrypt(payload.password, SALT_ROUNDS); } + if (payload.storageLabel) { + payload.storageLabel = sanitize(payload.storageLabel); + } + + const userEntity = await this.userRepository.create(payload); + await this.libraryRepository.create({ + owner: { id: userEntity.id } as UserEntity, + name: 'Default Library', + assets: [], + type: LibraryType.UPLOAD, + importPaths: [], + exclusionPatterns: [], + isVisible: true, + }); + + return userEntity; } } diff --git a/server/src/immich/api-v1/asset/asset.controller.ts b/server/src/immich/api-v1/asset/asset.controller.ts index ed50e3becc..24127e873a 100644 --- a/server/src/immich/api-v1/asset/asset.controller.ts +++ b/server/src/immich/api-v1/asset/asset.controller.ts @@ -17,8 +17,8 @@ import { import { ApiBody, ApiConsumes, ApiHeader, ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { Response as Res } from 'express'; import { AuthUser, Authenticated, SharedLinkRoute } from '../../app.guard'; -import { FileUploadInterceptor, ImmichFile, Route, mapToUploadFile } from '../../app.interceptor'; import { UUIDParamDto } from '../../controllers/dto/uuid-param.dto'; +import { FileUploadInterceptor, ImmichFile, Route, mapToUploadFile } from '../../interceptors'; import FileNotEmptyValidator from '../validation/file-not-empty-validator'; import { AssetService } from './asset.service'; import { AssetBulkUploadCheckDto } from './dto/asset-check.dto'; @@ -204,7 +204,7 @@ export class AssetController { */ @Post('/bulk-upload-check') @HttpCode(HttpStatus.OK) - bulkUploadCheck( + checkBulkUpload( @AuthUser() authUser: AuthUserDto, @Body(ValidationPipe) dto: AssetBulkUploadCheckDto, ): Promise { diff --git a/server/src/immich/app.module.ts b/server/src/immich/app.module.ts index cf537c6b92..cf95eb2368 100644 --- a/server/src/immich/app.module.ts +++ b/server/src/immich/app.module.ts @@ -2,14 +2,13 @@ import { DomainModule } from '@app/domain'; import { InfraModule } from '@app/infra'; import { AssetEntity } from '@app/infra/entities'; import { Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common'; -import { APP_GUARD } from '@nestjs/core'; +import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core'; import { ScheduleModule } from '@nestjs/schedule'; import { TypeOrmModule } from '@nestjs/typeorm'; import { AssetRepository, IAssetRepository } from './api-v1/asset/asset-repository'; import { AssetController as AssetControllerV1 } from './api-v1/asset/asset.controller'; import { AssetService } from './api-v1/asset/asset.service'; import { AppGuard } from './app.guard'; -import { FileUploadInterceptor } from './app.interceptor'; import { AppService } from './app.service'; import { APIKeyController, @@ -31,6 +30,7 @@ import { TagController, UserController, } from './controllers'; +import { ErrorInterceptor, FileUploadInterceptor } from './interceptors'; @Module({ imports: [ @@ -61,10 +61,9 @@ import { PersonController, ], providers: [ - // - { provide: APP_GUARD, useExisting: AppGuard }, + { provide: APP_INTERCEPTOR, useClass: ErrorInterceptor }, + { provide: APP_GUARD, useClass: AppGuard }, { provide: IAssetRepository, useClass: AssetRepository }, - AppGuard, AppService, AssetService, FileUploadInterceptor, diff --git a/server/src/immich/app.utils.ts b/server/src/immich/app.utils.ts index 1a27b6f30b..a7584cb1ae 100644 --- a/server/src/immich/app.utils.ts +++ b/server/src/immich/app.utils.ts @@ -47,6 +47,9 @@ function sortKeys(obj: T): T { return result as T; } +export const routeToErrorMessage = (methodName: string) => + 'Failed to ' + methodName.replace(/[A-Z]+/g, (letter) => ` ${letter.toLowerCase()}`); + const patchOpenAPI = (document: OpenAPIObject) => { document.paths = sortKeys(document.paths); if (document.components?.schemas) { @@ -78,6 +81,10 @@ const patchOpenAPI = (document: OpenAPIObject) => { delete operation.summary; } + if (operation.operationId) { + // console.log(`${routeToErrorMessage(operation.operationId).padEnd(40)} (${operation.operationId})`); + } + if (operation.description === '') { delete operation.description; } diff --git a/server/src/immich/controllers/api-key.controller.ts b/server/src/immich/controllers/api-key.controller.ts index dc995ddf77..10e0394cf5 100644 --- a/server/src/immich/controllers/api-key.controller.ts +++ b/server/src/immich/controllers/api-key.controller.ts @@ -20,22 +20,22 @@ export class APIKeyController { constructor(private service: APIKeyService) {} @Post() - createKey(@AuthUser() authUser: AuthUserDto, @Body() dto: APIKeyCreateDto): Promise { + createApiKey(@AuthUser() authUser: AuthUserDto, @Body() dto: APIKeyCreateDto): Promise { return this.service.create(authUser, dto); } @Get() - getKeys(@AuthUser() authUser: AuthUserDto): Promise { + getApiKeys(@AuthUser() authUser: AuthUserDto): Promise { return this.service.getAll(authUser); } @Get(':id') - getKey(@AuthUser() authUser: AuthUserDto, @Param() { id }: UUIDParamDto): Promise { + getApiKey(@AuthUser() authUser: AuthUserDto, @Param() { id }: UUIDParamDto): Promise { return this.service.getById(authUser, id); } @Put(':id') - updateKey( + updateApiKey( @AuthUser() authUser: AuthUserDto, @Param() { id }: UUIDParamDto, @Body() dto: APIKeyUpdateDto, @@ -44,7 +44,7 @@ export class APIKeyController { } @Delete(':id') - deleteKey(@AuthUser() authUser: AuthUserDto, @Param() { id }: UUIDParamDto): Promise { + deleteApiKey(@AuthUser() authUser: AuthUserDto, @Param() { id }: UUIDParamDto): Promise { return this.service.delete(authUser, id); } } diff --git a/server/src/immich/controllers/asset.controller.ts b/server/src/immich/controllers/asset.controller.ts index 6a91bad30e..d0f294d1ee 100644 --- a/server/src/immich/controllers/asset.controller.ts +++ b/server/src/immich/controllers/asset.controller.ts @@ -39,10 +39,11 @@ import { import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { AuthUser, Authenticated, SharedLinkRoute } from '../app.guard'; import { UseValidation, asStreamableFile } from '../app.utils'; +import { Route } from '../interceptors'; import { UUIDParamDto } from './dto/uuid-param.dto'; @ApiTags('Asset') -@Controller('asset') +@Controller(Route.ASSET) @Authenticated() @UseValidation() export class AssetController { @@ -86,7 +87,7 @@ export class AssetController { } @Get('statistics') - getAssetStats(@AuthUser() authUser: AuthUserDto, @Query() dto: AssetStatsDto): Promise { + getAssetStatistics(@AuthUser() authUser: AuthUserDto, @Query() dto: AssetStatsDto): Promise { return this.service.getStatistics(authUser, dto); } @@ -98,8 +99,8 @@ export class AssetController { @Authenticated({ isShared: true }) @Get('time-bucket') - getByTimeBucket(@AuthUser() authUser: AuthUserDto, @Query() dto: TimeBucketAssetDto): Promise { - return this.service.getByTimeBucket(authUser, dto) as Promise; + getTimeBucket(@AuthUser() authUser: AuthUserDto, @Query() dto: TimeBucketAssetDto): Promise { + return this.service.getTimeBucket(authUser, dto) as Promise; } @Post('jobs') diff --git a/server/src/immich/controllers/auth.controller.ts b/server/src/immich/controllers/auth.controller.ts index 2124cc8b80..83e4b51457 100644 --- a/server/src/immich/controllers/auth.controller.ts +++ b/server/src/immich/controllers/auth.controller.ts @@ -43,7 +43,7 @@ export class AuthController { @PublicRoute() @Post('admin-sign-up') @ApiBadRequestResponse({ description: 'The server already has an admin' }) - adminSignUp(@Body() signUpCredential: SignUpDto): Promise { + signUpAdmin(@Body() signUpCredential: SignUpDto): Promise { return this.service.adminSignUp(signUpCredential); } diff --git a/server/src/immich/controllers/library.controller.ts b/server/src/immich/controllers/library.controller.ts index 23b1ec7fcc..ad1676ee0a 100644 --- a/server/src/immich/controllers/library.controller.ts +++ b/server/src/immich/controllers/library.controller.ts @@ -21,7 +21,7 @@ export class LibraryController { constructor(private service: LibraryService) {} @Get() - getAllForUser(@AuthUser() authUser: AuthUserDto): Promise { + getLibraries(@AuthUser() authUser: AuthUserDto): Promise { return this.service.getAllForUser(authUser); } diff --git a/server/src/immich/controllers/oauth.controller.ts b/server/src/immich/controllers/oauth.controller.ts index 176ce62bc6..a55cc03ce0 100644 --- a/server/src/immich/controllers/oauth.controller.ts +++ b/server/src/immich/controllers/oauth.controller.ts @@ -25,7 +25,7 @@ export class OAuthController { @PublicRoute() @Get('mobile-redirect') @Redirect() - mobileRedirect(@Req() req: Request) { + redirectOAuthToMobile(@Req() req: Request) { return { url: this.service.getMobileRedirect(req.url), statusCode: HttpStatus.TEMPORARY_REDIRECT, @@ -35,19 +35,19 @@ export class OAuthController { /** @deprecated use feature flags and /oauth/authorize */ @PublicRoute() @Post('config') - generateConfig(@Body() dto: OAuthConfigDto): Promise { + generateOAuthConfig(@Body() dto: OAuthConfigDto): Promise { return this.service.generateConfig(dto); } @PublicRoute() @Post('authorize') - authorizeOAuth(@Body() dto: OAuthConfigDto): Promise { + startOAuth(@Body() dto: OAuthConfigDto): Promise { return this.service.authorize(dto); } @PublicRoute() @Post('callback') - async callback( + async finishOAuth( @Res({ passthrough: true }) res: Response, @Body() dto: OAuthCallbackDto, @GetLoginDetails() loginDetails: LoginDetails, @@ -58,12 +58,12 @@ export class OAuthController { } @Post('link') - link(@AuthUser() authUser: AuthUserDto, @Body() dto: OAuthCallbackDto): Promise { + linkOAuthAccount(@AuthUser() authUser: AuthUserDto, @Body() dto: OAuthCallbackDto): Promise { return this.service.link(authUser, dto); } @Post('unlink') - unlink(@AuthUser() authUser: AuthUserDto): Promise { + unlinkOAuthAccount(@AuthUser() authUser: AuthUserDto): Promise { return this.service.unlink(authUser); } } diff --git a/server/src/immich/controllers/server-info.controller.ts b/server/src/immich/controllers/server-info.controller.ts index 7355583acd..52e9ea8d26 100644 --- a/server/src/immich/controllers/server-info.controller.ts +++ b/server/src/immich/controllers/server-info.controller.ts @@ -57,9 +57,9 @@ export class ServerInfoController { } @AdminRoute() - @Get('stats') - getStats(): Promise { - return this.service.getStats(); + @Get('statistics') + getServerStatistics(): Promise { + return this.service.getStatistics(); } @PublicRoute() diff --git a/server/src/immich/controllers/system-config.controller.ts b/server/src/immich/controllers/system-config.controller.ts index 646c9a629c..aa44c7acd0 100644 --- a/server/src/immich/controllers/system-config.controller.ts +++ b/server/src/immich/controllers/system-config.controller.ts @@ -17,7 +17,7 @@ export class SystemConfigController { } @Get('defaults') - getDefaults(): SystemConfigDto { + getConfigDefaults(): SystemConfigDto { return this.service.getDefaults(); } diff --git a/server/src/immich/controllers/user.controller.ts b/server/src/immich/controllers/user.controller.ts index 7ca8b1c6e2..92b3fdcc0c 100644 --- a/server/src/immich/controllers/user.controller.ts +++ b/server/src/immich/controllers/user.controller.ts @@ -22,8 +22,8 @@ import { } from '@nestjs/common'; import { ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger'; import { AdminRoute, AuthUser, Authenticated } from '../app.guard'; -import { FileUploadInterceptor, Route } from '../app.interceptor'; import { UseValidation, asStreamableFile } from '../app.utils'; +import { FileUploadInterceptor, Route } from '../interceptors'; import { UUIDParamDto } from './dto/uuid-param.dto'; @ApiTags('User') diff --git a/server/src/immich/interceptors/error.interceptor.ts b/server/src/immich/interceptors/error.interceptor.ts new file mode 100644 index 0000000000..5e18684fd7 --- /dev/null +++ b/server/src/immich/interceptors/error.interceptor.ts @@ -0,0 +1,32 @@ +import { + CallHandler, + ExecutionContext, + HttpException, + Injectable, + InternalServerErrorException, + Logger, + NestInterceptor, +} from '@nestjs/common'; +import { Observable, catchError, throwError } from 'rxjs'; +import { routeToErrorMessage } from '../app.utils'; + +@Injectable() +export class ErrorInterceptor implements NestInterceptor { + private logger = new Logger(ErrorInterceptor.name); + + async intercept(context: ExecutionContext, next: CallHandler): Promise> { + return next.handle().pipe( + catchError((error) => + throwError(() => { + if (error instanceof HttpException === false) { + const errorMessage = routeToErrorMessage(context.getHandler().name); + this.logger.error(errorMessage, error, error?.errors); + return new InternalServerErrorException(errorMessage); + } else { + return error; + } + }), + ), + ); + } +} diff --git a/server/src/immich/app.interceptor.ts b/server/src/immich/interceptors/file.interceptor.ts similarity index 99% rename from server/src/immich/app.interceptor.ts rename to server/src/immich/interceptors/file.interceptor.ts index 67a09ca73b..7388df457e 100644 --- a/server/src/immich/app.interceptor.ts +++ b/server/src/immich/interceptors/file.interceptor.ts @@ -7,7 +7,7 @@ import { createHash } from 'crypto'; import { NextFunction, RequestHandler } from 'express'; import multer, { StorageEngine, diskStorage } from 'multer'; import { Observable } from 'rxjs'; -import { AuthRequest } from './app.guard'; +import { AuthRequest } from '../app.guard'; export enum Route { ASSET = 'asset', diff --git a/server/src/immich/interceptors/index.ts b/server/src/immich/interceptors/index.ts new file mode 100644 index 0000000000..27c858abad --- /dev/null +++ b/server/src/immich/interceptors/index.ts @@ -0,0 +1,2 @@ +export * from './error.interceptor'; +export * from './file.interceptor'; diff --git a/server/src/infra/repositories/asset.repository.ts b/server/src/infra/repositories/asset.repository.ts index 4947c0d76d..c237a3604b 100644 --- a/server/src/infra/repositories/asset.repository.ts +++ b/server/src/infra/repositories/asset.repository.ts @@ -493,7 +493,7 @@ export class AssetRepository implements IAssetRepository { .getRawMany(); } - getByTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise { + getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise { const truncated = dateTrunc(options); return ( this.getBuilder(options) diff --git a/server/test/e2e/server-info.e2e-spec.ts b/server/test/e2e/server-info.e2e-spec.ts index a19c6235ee..33b7c56935 100644 --- a/server/test/e2e/server-info.e2e-spec.ts +++ b/server/test/e2e/server-info.e2e-spec.ts @@ -103,9 +103,9 @@ describe(`${ServerInfoController.name} (e2e)`, () => { }); }); - describe('GET /server-info/stats', () => { + describe('GET /server-info/statistics', () => { it('should require authentication', async () => { - const { status, body } = await request(server).get('/server-info/stats'); + const { status, body } = await request(server).get('/server-info/statistics'); expect(status).toBe(401); expect(body).toEqual(errorStub.unauthorized); }); @@ -115,7 +115,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => { await api.userApi.create(server, accessToken, { ...loginDto, firstName: 'test', lastName: 'test' }); const { accessToken: userAccessToken } = await api.authApi.login(server, loginDto); const { status, body } = await request(server) - .get('/server-info/stats') + .get('/server-info/statistics') .set('Authorization', `Bearer ${userAccessToken}`); expect(status).toBe(403); expect(body).toEqual(errorStub.forbidden); @@ -123,7 +123,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => { it('should return the server stats', async () => { const { status, body } = await request(server) - .get('/server-info/stats') + .get('/server-info/statistics') .set('Authorization', `Bearer ${accessToken}`); expect(status).toBe(200); expect(body).toEqual({ diff --git a/server/test/repositories/asset.repository.mock.ts b/server/test/repositories/asset.repository.mock.ts index 57020001cb..c185d3983d 100644 --- a/server/test/repositories/asset.repository.mock.ts +++ b/server/test/repositories/asset.repository.mock.ts @@ -26,7 +26,7 @@ export const newAssetRepositoryMock = (): jest.Mocked => { findLivePhotoMatch: jest.fn(), getMapMarkers: jest.fn(), getStatistics: jest.fn(), - getByTimeBucket: jest.fn(), + getTimeBucket: jest.fn(), getTimeBuckets: jest.fn(), restoreAll: jest.fn(), softDeleteAll: jest.fn(), diff --git a/web/src/api/open-api/api.ts b/web/src/api/open-api/api.ts index b00b0deb5f..9f4d765f2d 100644 --- a/web/src/api/open-api/api.ts +++ b/web/src/api/open-api/api.ts @@ -4528,9 +4528,9 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - createKey: async (aPIKeyCreateDto: APIKeyCreateDto, options: AxiosRequestConfig = {}): Promise => { + createApiKey: async (aPIKeyCreateDto: APIKeyCreateDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'aPIKeyCreateDto' is not null or undefined - assertParamExists('createKey', 'aPIKeyCreateDto', aPIKeyCreateDto) + assertParamExists('createApiKey', 'aPIKeyCreateDto', aPIKeyCreateDto) const localVarPath = `/api-key`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -4572,9 +4572,9 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deleteKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { + deleteApiKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined - assertParamExists('deleteKey', 'id', id) + assertParamExists('deleteApiKey', 'id', id) const localVarPath = `/api-key/{id}` .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. @@ -4614,9 +4614,9 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { + getApiKey: async (id: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined - assertParamExists('getKey', 'id', id) + assertParamExists('getApiKey', 'id', id) const localVarPath = `/api-key/{id}` .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. @@ -4655,7 +4655,7 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKeys: async (options: AxiosRequestConfig = {}): Promise => { + getApiKeys: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api-key`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -4695,11 +4695,11 @@ export const APIKeyApiAxiosParamCreator = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - updateKey: async (id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options: AxiosRequestConfig = {}): Promise => { + updateApiKey: async (id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined - assertParamExists('updateKey', 'id', id) + assertParamExists('updateApiKey', 'id', id) // verify required parameter 'aPIKeyUpdateDto' is not null or undefined - assertParamExists('updateKey', 'aPIKeyUpdateDto', aPIKeyUpdateDto) + assertParamExists('updateApiKey', 'aPIKeyUpdateDto', aPIKeyUpdateDto) const localVarPath = `/api-key/{id}` .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. @@ -4752,8 +4752,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async createKey(aPIKeyCreateDto: APIKeyCreateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.createKey(aPIKeyCreateDto, options); + async createApiKey(aPIKeyCreateDto: APIKeyCreateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.createApiKey(aPIKeyCreateDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4762,8 +4762,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async deleteKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.deleteKey(id, options); + async deleteApiKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.deleteApiKey(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4772,8 +4772,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getKey(id, options); + async getApiKey(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getApiKey(id, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4781,8 +4781,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getKeys(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getKeys(options); + async getApiKeys(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getApiKeys(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -4792,8 +4792,8 @@ export const APIKeyApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async updateKey(id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.updateKey(id, aPIKeyUpdateDto, options); + async updateApiKey(id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.updateApiKey(id, aPIKeyUpdateDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -4808,110 +4808,110 @@ export const APIKeyApiFactory = function (configuration?: Configuration, basePat return { /** * - * @param {APIKeyApiCreateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiCreateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - createKey(requestParameters: APIKeyApiCreateKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.createKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(axios, basePath)); + createApiKey(requestParameters: APIKeyApiCreateApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.createApiKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(axios, basePath)); }, /** * - * @param {APIKeyApiDeleteKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiDeleteApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - deleteKey(requestParameters: APIKeyApiDeleteKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.deleteKey(requestParameters.id, options).then((request) => request(axios, basePath)); + deleteApiKey(requestParameters: APIKeyApiDeleteApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.deleteApiKey(requestParameters.id, options).then((request) => request(axios, basePath)); }, /** * - * @param {APIKeyApiGetKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiGetApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKey(requestParameters: APIKeyApiGetKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getKey(requestParameters.id, options).then((request) => request(axios, basePath)); + getApiKey(requestParameters: APIKeyApiGetApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getApiKey(requestParameters.id, options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getKeys(options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getKeys(options).then((request) => request(axios, basePath)); + getApiKeys(options?: AxiosRequestConfig): AxiosPromise> { + return localVarFp.getApiKeys(options).then((request) => request(axios, basePath)); }, /** * - * @param {APIKeyApiUpdateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiUpdateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - updateKey(requestParameters: APIKeyApiUpdateKeyRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.updateKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(axios, basePath)); + updateApiKey(requestParameters: APIKeyApiUpdateApiKeyRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.updateApiKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(axios, basePath)); }, }; }; /** - * Request parameters for createKey operation in APIKeyApi. + * Request parameters for createApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiCreateKeyRequest + * @interface APIKeyApiCreateApiKeyRequest */ -export interface APIKeyApiCreateKeyRequest { +export interface APIKeyApiCreateApiKeyRequest { /** * * @type {APIKeyCreateDto} - * @memberof APIKeyApiCreateKey + * @memberof APIKeyApiCreateApiKey */ readonly aPIKeyCreateDto: APIKeyCreateDto } /** - * Request parameters for deleteKey operation in APIKeyApi. + * Request parameters for deleteApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiDeleteKeyRequest + * @interface APIKeyApiDeleteApiKeyRequest */ -export interface APIKeyApiDeleteKeyRequest { +export interface APIKeyApiDeleteApiKeyRequest { /** * * @type {string} - * @memberof APIKeyApiDeleteKey + * @memberof APIKeyApiDeleteApiKey */ readonly id: string } /** - * Request parameters for getKey operation in APIKeyApi. + * Request parameters for getApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiGetKeyRequest + * @interface APIKeyApiGetApiKeyRequest */ -export interface APIKeyApiGetKeyRequest { +export interface APIKeyApiGetApiKeyRequest { /** * * @type {string} - * @memberof APIKeyApiGetKey + * @memberof APIKeyApiGetApiKey */ readonly id: string } /** - * Request parameters for updateKey operation in APIKeyApi. + * Request parameters for updateApiKey operation in APIKeyApi. * @export - * @interface APIKeyApiUpdateKeyRequest + * @interface APIKeyApiUpdateApiKeyRequest */ -export interface APIKeyApiUpdateKeyRequest { +export interface APIKeyApiUpdateApiKeyRequest { /** * * @type {string} - * @memberof APIKeyApiUpdateKey + * @memberof APIKeyApiUpdateApiKey */ readonly id: string /** * * @type {APIKeyUpdateDto} - * @memberof APIKeyApiUpdateKey + * @memberof APIKeyApiUpdateApiKey */ readonly aPIKeyUpdateDto: APIKeyUpdateDto } @@ -4925,35 +4925,35 @@ export interface APIKeyApiUpdateKeyRequest { export class APIKeyApi extends BaseAPI { /** * - * @param {APIKeyApiCreateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiCreateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public createKey(requestParameters: APIKeyApiCreateKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).createKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(this.axios, this.basePath)); + public createApiKey(requestParameters: APIKeyApiCreateApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).createApiKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {APIKeyApiDeleteKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiDeleteApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public deleteKey(requestParameters: APIKeyApiDeleteKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).deleteKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); + public deleteApiKey(requestParameters: APIKeyApiDeleteApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).deleteApiKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {APIKeyApiGetKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiGetApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public getKey(requestParameters: APIKeyApiGetKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).getKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); + public getApiKey(requestParameters: APIKeyApiGetApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).getApiKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** @@ -4962,19 +4962,19 @@ export class APIKeyApi extends BaseAPI { * @throws {RequiredError} * @memberof APIKeyApi */ - public getKeys(options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).getKeys(options).then((request) => request(this.axios, this.basePath)); + public getApiKeys(options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).getApiKeys(options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {APIKeyApiUpdateKeyRequest} requestParameters Request parameters. + * @param {APIKeyApiUpdateApiKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public updateKey(requestParameters: APIKeyApiUpdateKeyRequest, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).updateKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(this.axios, this.basePath)); + public updateApiKey(requestParameters: APIKeyApiUpdateApiKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).updateApiKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -6433,9 +6433,9 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - bulkUploadCheck: async (assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options: AxiosRequestConfig = {}): Promise => { + checkBulkUpload: async (assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'assetBulkUploadCheckDto' is not null or undefined - assertParamExists('bulkUploadCheck', 'assetBulkUploadCheckDto', assetBulkUploadCheckDto) + assertParamExists('checkBulkUpload', 'assetBulkUploadCheckDto', assetBulkUploadCheckDto) const localVarPath = `/asset/bulk-upload-check`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6856,7 +6856,7 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetStats: async (isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options: AxiosRequestConfig = {}): Promise => { + getAssetStatistics: async (isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/asset/statistics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6944,98 +6944,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {TimeBucketSize} size - * @param {string} timeBucket - * @param {string} [userId] - * @param {string} [albumId] - * @param {string} [personId] - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] - * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getByTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'size' is not null or undefined - assertParamExists('getByTimeBucket', 'size', size) - // verify required parameter 'timeBucket' is not null or undefined - assertParamExists('getByTimeBucket', 'timeBucket', timeBucket) - const localVarPath = `/asset/time-bucket`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - // authentication cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - if (size !== undefined) { - localVarQueryParameter['size'] = size; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; - } - - if (albumId !== undefined) { - localVarQueryParameter['albumId'] = albumId; - } - - if (personId !== undefined) { - localVarQueryParameter['personId'] = personId; - } - - if (isArchived !== undefined) { - localVarQueryParameter['isArchived'] = isArchived; - } - - if (isFavorite !== undefined) { - localVarQueryParameter['isFavorite'] = isFavorite; - } - - if (isTrashed !== undefined) { - localVarQueryParameter['isTrashed'] = isTrashed; - } - - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; - } - - if (timeBucket !== undefined) { - localVarQueryParameter['timeBucket'] = timeBucket; - } - - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - - - setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -7318,6 +7226,98 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {TimeBucketSize} size + * @param {string} timeBucket + * @param {string} [userId] + * @param {string} [albumId] + * @param {string} [personId] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] + * @param {boolean} [isTrashed] + * @param {boolean} [withStacked] + * @param {string} [key] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'size' is not null or undefined + assertParamExists('getTimeBucket', 'size', size) + // verify required parameter 'timeBucket' is not null or undefined + assertParamExists('getTimeBucket', 'timeBucket', timeBucket) + const localVarPath = `/asset/time-bucket`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication cookie required + + // authentication api_key required + await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) + + // authentication bearer required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) + + if (size !== undefined) { + localVarQueryParameter['size'] = size; + } + + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; + } + + if (albumId !== undefined) { + localVarQueryParameter['albumId'] = albumId; + } + + if (personId !== undefined) { + localVarQueryParameter['personId'] = personId; + } + + if (isArchived !== undefined) { + localVarQueryParameter['isArchived'] = isArchived; + } + + if (isFavorite !== undefined) { + localVarQueryParameter['isFavorite'] = isFavorite; + } + + if (isTrashed !== undefined) { + localVarQueryParameter['isTrashed'] = isTrashed; + } + + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; + } + + if (timeBucket !== undefined) { + localVarQueryParameter['timeBucket'] = timeBucket; + } + + if (key !== undefined) { + localVarQueryParameter['key'] = key; + } + + + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -8011,8 +8011,8 @@ export const AssetApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async bulkUploadCheck(assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.bulkUploadCheck(assetBulkUploadCheckDto, options); + async checkBulkUpload(assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.checkBulkUpload(assetBulkUploadCheckDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8109,8 +8109,8 @@ export const AssetApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAssetStats(isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetStats(isArchived, isFavorite, isTrashed, options); + async getAssetStatistics(isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetStatistics(isArchived, isFavorite, isTrashed, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8125,25 +8125,6 @@ export const AssetApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetThumbnail(id, format, key, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, - /** - * - * @param {TimeBucketSize} size - * @param {string} timeBucket - * @param {string} [userId] - * @param {string} [albumId] - * @param {string} [personId] - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] - * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async getByTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {*} [options] Override http request option. @@ -8207,6 +8188,25 @@ export const AssetApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.getRandom(count, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {TimeBucketSize} size + * @param {string} timeBucket + * @param {string} [userId] + * @param {string} [albumId] + * @param {string} [personId] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] + * @param {boolean} [isTrashed] + * @param {boolean} [withStacked] + * @param {string} [key] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async getTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {TimeBucketSize} size @@ -8365,12 +8365,12 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath return { /** * Checks if assets exist by checksums - * @param {AssetApiBulkUploadCheckRequest} requestParameters Request parameters. + * @param {AssetApiCheckBulkUploadRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - bulkUploadCheck(requestParameters: AssetApiBulkUploadCheckRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(axios, basePath)); + checkBulkUpload(requestParameters: AssetApiCheckBulkUploadRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.checkBulkUpload(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(axios, basePath)); }, /** * Checks if multiple assets exist on the server and returns all existing - used by background backup @@ -8444,12 +8444,12 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }, /** * - * @param {AssetApiGetAssetStatsRequest} requestParameters Request parameters. + * @param {AssetApiGetAssetStatisticsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetStats(requestParameters: AssetApiGetAssetStatsRequest = {}, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getAssetStats(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(axios, basePath)); + getAssetStatistics(requestParameters: AssetApiGetAssetStatisticsRequest = {}, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getAssetStatistics(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(axios, basePath)); }, /** * @@ -8460,15 +8460,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath getAssetThumbnail(requestParameters: AssetApiGetAssetThumbnailRequest, options?: AxiosRequestConfig): AxiosPromise { return localVarFp.getAssetThumbnail(requestParameters.id, requestParameters.format, requestParameters.key, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {AssetApiGetByTimeBucketRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getByTimeBucket(requestParameters: AssetApiGetByTimeBucketRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getByTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(axios, basePath)); - }, /** * * @param {*} [options] Override http request option. @@ -8521,6 +8512,15 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath getRandom(requestParameters: AssetApiGetRandomRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { return localVarFp.getRandom(requestParameters.count, options).then((request) => request(axios, basePath)); }, + /** + * + * @param {AssetApiGetTimeBucketRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig): AxiosPromise> { + return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(axios, basePath)); + }, /** * * @param {AssetApiGetTimeBucketsRequest} requestParameters Request parameters. @@ -8632,15 +8632,15 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }; /** - * Request parameters for bulkUploadCheck operation in AssetApi. + * Request parameters for checkBulkUpload operation in AssetApi. * @export - * @interface AssetApiBulkUploadCheckRequest + * @interface AssetApiCheckBulkUploadRequest */ -export interface AssetApiBulkUploadCheckRequest { +export interface AssetApiCheckBulkUploadRequest { /** * * @type {AssetBulkUploadCheckDto} - * @memberof AssetApiBulkUploadCheck + * @memberof AssetApiCheckBulkUpload */ readonly assetBulkUploadCheckDto: AssetBulkUploadCheckDto } @@ -8786,29 +8786,29 @@ export interface AssetApiGetAssetByIdRequest { } /** - * Request parameters for getAssetStats operation in AssetApi. + * Request parameters for getAssetStatistics operation in AssetApi. * @export - * @interface AssetApiGetAssetStatsRequest + * @interface AssetApiGetAssetStatisticsRequest */ -export interface AssetApiGetAssetStatsRequest { +export interface AssetApiGetAssetStatisticsRequest { /** * * @type {boolean} - * @memberof AssetApiGetAssetStats + * @memberof AssetApiGetAssetStatistics */ readonly isArchived?: boolean /** * * @type {boolean} - * @memberof AssetApiGetAssetStats + * @memberof AssetApiGetAssetStatistics */ readonly isFavorite?: boolean /** * * @type {boolean} - * @memberof AssetApiGetAssetStats + * @memberof AssetApiGetAssetStatistics */ readonly isTrashed?: boolean } @@ -8841,83 +8841,6 @@ export interface AssetApiGetAssetThumbnailRequest { readonly key?: string } -/** - * Request parameters for getByTimeBucket operation in AssetApi. - * @export - * @interface AssetApiGetByTimeBucketRequest - */ -export interface AssetApiGetByTimeBucketRequest { - /** - * - * @type {TimeBucketSize} - * @memberof AssetApiGetByTimeBucket - */ - readonly size: TimeBucketSize - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly timeBucket: string - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly userId?: string - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly albumId?: string - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly personId?: string - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly isArchived?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly isFavorite?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly isTrashed?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetByTimeBucket - */ - readonly withStacked?: boolean - - /** - * - * @type {string} - * @memberof AssetApiGetByTimeBucket - */ - readonly key?: string -} - /** * Request parameters for getDownloadInfo operation in AssetApi. * @export @@ -9009,6 +8932,83 @@ export interface AssetApiGetRandomRequest { readonly count?: number } +/** + * Request parameters for getTimeBucket operation in AssetApi. + * @export + * @interface AssetApiGetTimeBucketRequest + */ +export interface AssetApiGetTimeBucketRequest { + /** + * + * @type {TimeBucketSize} + * @memberof AssetApiGetTimeBucket + */ + readonly size: TimeBucketSize + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly timeBucket: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly userId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly albumId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly personId?: string + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly isArchived?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly isFavorite?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly isTrashed?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetTimeBucket + */ + readonly withStacked?: boolean + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly key?: string +} + /** * Request parameters for getTimeBuckets operation in AssetApi. * @export @@ -9361,13 +9361,13 @@ export interface AssetApiUploadFileRequest { export class AssetApi extends BaseAPI { /** * Checks if assets exist by checksums - * @param {AssetApiBulkUploadCheckRequest} requestParameters Request parameters. + * @param {AssetApiCheckBulkUploadRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public bulkUploadCheck(requestParameters: AssetApiBulkUploadCheckRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath)); + public checkBulkUpload(requestParameters: AssetApiCheckBulkUploadRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).checkBulkUpload(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -9458,13 +9458,13 @@ export class AssetApi extends BaseAPI { /** * - * @param {AssetApiGetAssetStatsRequest} requestParameters Request parameters. + * @param {AssetApiGetAssetStatisticsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getAssetStats(requestParameters: AssetApiGetAssetStatsRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetStats(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(this.axios, this.basePath)); + public getAssetStatistics(requestParameters: AssetApiGetAssetStatisticsRequest = {}, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getAssetStatistics(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, options).then((request) => request(this.axios, this.basePath)); } /** @@ -9478,17 +9478,6 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).getAssetThumbnail(requestParameters.id, requestParameters.format, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {AssetApiGetByTimeBucketRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public getByTimeBucket(requestParameters: AssetApiGetByTimeBucketRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getByTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {*} [options] Override http request option. @@ -9553,6 +9542,17 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).getRandom(requestParameters.count, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {AssetApiGetTimeBucketRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof AssetApi + */ + public getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {AssetApiGetTimeBucketsRequest} requestParameters Request parameters. @@ -10090,41 +10090,6 @@ export class AuditApi extends BaseAPI { */ export const AuthenticationApiAxiosParamCreator = function (configuration?: Configuration) { return { - /** - * - * @param {SignUpDto} signUpDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - adminSignUp: async (signUpDto: SignUpDto, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'signUpDto' is not null or undefined - assertParamExists('adminSignUp', 'signUpDto', signUpDto) - const localVarPath = `/auth/admin-sign-up`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(signUpDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {ChangePasswordDto} changePasswordDto @@ -10360,6 +10325,41 @@ export const AuthenticationApiAxiosParamCreator = function (configuration?: Conf options: localVarRequestOptions, }; }, + /** + * + * @param {SignUpDto} signUpDto + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + signUpAdmin: async (signUpDto: SignUpDto, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'signUpDto' is not null or undefined + assertParamExists('signUpAdmin', 'signUpDto', signUpDto) + const localVarPath = `/auth/admin-sign-up`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(signUpDto, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, /** * * @param {*} [options] Override http request option. @@ -10408,16 +10408,6 @@ export const AuthenticationApiAxiosParamCreator = function (configuration?: Conf export const AuthenticationApiFp = function(configuration?: Configuration) { const localVarAxiosParamCreator = AuthenticationApiAxiosParamCreator(configuration) return { - /** - * - * @param {SignUpDto} signUpDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async adminSignUp(signUpDto: SignUpDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.adminSignUp(signUpDto, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {ChangePasswordDto} changePasswordDto @@ -10475,6 +10465,16 @@ export const AuthenticationApiFp = function(configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.logoutAuthDevices(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, + /** + * + * @param {SignUpDto} signUpDto + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async signUpAdmin(signUpDto: SignUpDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.signUpAdmin(signUpDto, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, /** * * @param {*} [options] Override http request option. @@ -10494,15 +10494,6 @@ export const AuthenticationApiFp = function(configuration?: Configuration) { export const AuthenticationApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) { const localVarFp = AuthenticationApiFp(configuration) return { - /** - * - * @param {AuthenticationApiAdminSignUpRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - adminSignUp(requestParameters: AuthenticationApiAdminSignUpRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.adminSignUp(requestParameters.signUpDto, options).then((request) => request(axios, basePath)); - }, /** * * @param {AuthenticationApiChangePasswordRequest} requestParameters Request parameters. @@ -10554,6 +10545,15 @@ export const AuthenticationApiFactory = function (configuration?: Configuration, logoutAuthDevices(options?: AxiosRequestConfig): AxiosPromise { return localVarFp.logoutAuthDevices(options).then((request) => request(axios, basePath)); }, + /** + * + * @param {AuthenticationApiSignUpAdminRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + signUpAdmin(requestParameters: AuthenticationApiSignUpAdminRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.signUpAdmin(requestParameters.signUpDto, options).then((request) => request(axios, basePath)); + }, /** * * @param {*} [options] Override http request option. @@ -10565,20 +10565,6 @@ export const AuthenticationApiFactory = function (configuration?: Configuration, }; }; -/** - * Request parameters for adminSignUp operation in AuthenticationApi. - * @export - * @interface AuthenticationApiAdminSignUpRequest - */ -export interface AuthenticationApiAdminSignUpRequest { - /** - * - * @type {SignUpDto} - * @memberof AuthenticationApiAdminSignUp - */ - readonly signUpDto: SignUpDto -} - /** * Request parameters for changePassword operation in AuthenticationApi. * @export @@ -10621,6 +10607,20 @@ export interface AuthenticationApiLogoutAuthDeviceRequest { readonly id: string } +/** + * Request parameters for signUpAdmin operation in AuthenticationApi. + * @export + * @interface AuthenticationApiSignUpAdminRequest + */ +export interface AuthenticationApiSignUpAdminRequest { + /** + * + * @type {SignUpDto} + * @memberof AuthenticationApiSignUpAdmin + */ + readonly signUpDto: SignUpDto +} + /** * AuthenticationApi - object-oriented interface * @export @@ -10628,17 +10628,6 @@ export interface AuthenticationApiLogoutAuthDeviceRequest { * @extends {BaseAPI} */ export class AuthenticationApi extends BaseAPI { - /** - * - * @param {AuthenticationApiAdminSignUpRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AuthenticationApi - */ - public adminSignUp(requestParameters: AuthenticationApiAdminSignUpRequest, options?: AxiosRequestConfig) { - return AuthenticationApiFp(this.configuration).adminSignUp(requestParameters.signUpDto, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {AuthenticationApiChangePasswordRequest} requestParameters Request parameters. @@ -10702,6 +10691,17 @@ export class AuthenticationApi extends BaseAPI { return AuthenticationApiFp(this.configuration).logoutAuthDevices(options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @param {AuthenticationApiSignUpAdminRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof AuthenticationApi + */ + public signUpAdmin(requestParameters: AuthenticationApiSignUpAdminRequest, options?: AxiosRequestConfig) { + return AuthenticationApiFp(this.configuration).signUpAdmin(requestParameters.signUpDto, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @param {*} [options] Override http request option. @@ -11014,7 +11014,7 @@ export const LibraryApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllForUser: async (options: AxiosRequestConfig = {}): Promise => { + getLibraries: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/library`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11304,8 +11304,8 @@ export const LibraryApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAllForUser(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAllForUser(options); + async getLibraries(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getLibraries(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11393,8 +11393,8 @@ export const LibraryApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllForUser(options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getAllForUser(options).then((request) => request(axios, basePath)); + getLibraries(options?: AxiosRequestConfig): AxiosPromise> { + return localVarFp.getLibraries(options).then((request) => request(axios, basePath)); }, /** * @@ -11591,8 +11591,8 @@ export class LibraryApi extends BaseAPI { * @throws {RequiredError} * @memberof LibraryApi */ - public getAllForUser(options?: AxiosRequestConfig) { - return LibraryApiFp(this.configuration).getAllForUser(options).then((request) => request(this.axios, this.basePath)); + public getLibraries(options?: AxiosRequestConfig) { + return LibraryApiFp(this.configuration).getLibraries(options).then((request) => request(this.axios, this.basePath)); } /** @@ -11658,50 +11658,15 @@ export class LibraryApi extends BaseAPI { */ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration) { return { - /** - * - * @param {OAuthConfigDto} oAuthConfigDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - authorizeOAuth: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'oAuthConfigDto' is not null or undefined - assertParamExists('authorizeOAuth', 'oAuthConfigDto', oAuthConfigDto) - const localVarPath = `/oauth/authorize`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(oAuthConfigDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {OAuthCallbackDto} oAuthCallbackDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - callback: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { + finishOAuth: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'oAuthCallbackDto' is not null or undefined - assertParamExists('callback', 'oAuthCallbackDto', oAuthCallbackDto) + assertParamExists('finishOAuth', 'oAuthCallbackDto', oAuthCallbackDto) const localVarPath = `/oauth/callback`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11735,9 +11700,9 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration * @deprecated * @throws {RequiredError} */ - generateConfig: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { + generateOAuthConfig: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'oAuthConfigDto' is not null or undefined - assertParamExists('generateConfig', 'oAuthConfigDto', oAuthConfigDto) + assertParamExists('generateOAuthConfig', 'oAuthConfigDto', oAuthConfigDto) const localVarPath = `/oauth/config`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11770,9 +11735,9 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - link: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { + linkOAuthAccount: async (oAuthCallbackDto: OAuthCallbackDto, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'oAuthCallbackDto' is not null or undefined - assertParamExists('link', 'oAuthCallbackDto', oAuthCallbackDto) + assertParamExists('linkOAuthAccount', 'oAuthCallbackDto', oAuthCallbackDto) const localVarPath = `/oauth/link`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11813,7 +11778,7 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration * @param {*} [options] Override http request option. * @throws {RequiredError} */ - mobileRedirect: async (options: AxiosRequestConfig = {}): Promise => { + redirectOAuthToMobile: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/oauth/mobile-redirect`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11839,10 +11804,45 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration }, /** * + * @param {OAuthConfigDto} oAuthConfigDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - unlink: async (options: AxiosRequestConfig = {}): Promise => { + startOAuth: async (oAuthConfigDto: OAuthConfigDto, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'oAuthConfigDto' is not null or undefined + assertParamExists('startOAuth', 'oAuthConfigDto', oAuthConfigDto) + const localVarPath = `/oauth/authorize`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(oAuthConfigDto, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + unlinkOAuthAccount: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/oauth/unlink`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -11885,24 +11885,14 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration export const OAuthApiFp = function(configuration?: Configuration) { const localVarAxiosParamCreator = OAuthApiAxiosParamCreator(configuration) return { - /** - * - * @param {OAuthConfigDto} oAuthConfigDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async authorizeOAuth(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.authorizeOAuth(oAuthConfigDto, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, /** * * @param {OAuthCallbackDto} oAuthCallbackDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async callback(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.callback(oAuthCallbackDto, options); + async finishOAuth(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.finishOAuth(oAuthCallbackDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11912,8 +11902,8 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @deprecated * @throws {RequiredError} */ - async generateConfig(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.generateConfig(oAuthConfigDto, options); + async generateOAuthConfig(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.generateOAuthConfig(oAuthConfigDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11922,8 +11912,8 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async link(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.link(oAuthCallbackDto, options); + async linkOAuthAccount(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.linkOAuthAccount(oAuthCallbackDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11931,8 +11921,18 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async mobileRedirect(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.mobileRedirect(options); + async redirectOAuthToMobile(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.redirectOAuthToMobile(options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, + /** + * + * @param {OAuthConfigDto} oAuthConfigDto + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async startOAuth(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.startOAuth(oAuthConfigDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -11940,8 +11940,8 @@ export const OAuthApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async unlink(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.unlink(options); + async unlinkOAuthAccount(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.unlinkOAuthAccount(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -11956,116 +11956,116 @@ export const OAuthApiFactory = function (configuration?: Configuration, basePath return { /** * - * @param {OAuthApiAuthorizeOAuthRequest} requestParameters Request parameters. + * @param {OAuthApiFinishOAuthRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - authorizeOAuth(requestParameters: OAuthApiAuthorizeOAuthRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.authorizeOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); - }, - /** - * - * @param {OAuthApiCallbackRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - callback(requestParameters: OAuthApiCallbackRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.callback(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); + finishOAuth(requestParameters: OAuthApiFinishOAuthRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.finishOAuth(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); }, /** * @deprecated use feature flags and /oauth/authorize - * @param {OAuthApiGenerateConfigRequest} requestParameters Request parameters. + * @param {OAuthApiGenerateOAuthConfigRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @deprecated * @throws {RequiredError} */ - generateConfig(requestParameters: OAuthApiGenerateConfigRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.generateConfig(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); + generateOAuthConfig(requestParameters: OAuthApiGenerateOAuthConfigRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.generateOAuthConfig(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); }, /** * - * @param {OAuthApiLinkRequest} requestParameters Request parameters. + * @param {OAuthApiLinkOAuthAccountRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} */ - link(requestParameters: OAuthApiLinkRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.link(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); + linkOAuthAccount(requestParameters: OAuthApiLinkOAuthAccountRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.linkOAuthAccount(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - mobileRedirect(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.mobileRedirect(options).then((request) => request(axios, basePath)); + redirectOAuthToMobile(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.redirectOAuthToMobile(options).then((request) => request(axios, basePath)); + }, + /** + * + * @param {OAuthApiStartOAuthRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + startOAuth(requestParameters: OAuthApiStartOAuthRequest, options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.startOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - unlink(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.unlink(options).then((request) => request(axios, basePath)); + unlinkOAuthAccount(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.unlinkOAuthAccount(options).then((request) => request(axios, basePath)); }, }; }; /** - * Request parameters for authorizeOAuth operation in OAuthApi. + * Request parameters for finishOAuth operation in OAuthApi. * @export - * @interface OAuthApiAuthorizeOAuthRequest + * @interface OAuthApiFinishOAuthRequest */ -export interface OAuthApiAuthorizeOAuthRequest { - /** - * - * @type {OAuthConfigDto} - * @memberof OAuthApiAuthorizeOAuth - */ - readonly oAuthConfigDto: OAuthConfigDto -} - -/** - * Request parameters for callback operation in OAuthApi. - * @export - * @interface OAuthApiCallbackRequest - */ -export interface OAuthApiCallbackRequest { +export interface OAuthApiFinishOAuthRequest { /** * * @type {OAuthCallbackDto} - * @memberof OAuthApiCallback + * @memberof OAuthApiFinishOAuth */ readonly oAuthCallbackDto: OAuthCallbackDto } /** - * Request parameters for generateConfig operation in OAuthApi. + * Request parameters for generateOAuthConfig operation in OAuthApi. * @export - * @interface OAuthApiGenerateConfigRequest + * @interface OAuthApiGenerateOAuthConfigRequest */ -export interface OAuthApiGenerateConfigRequest { +export interface OAuthApiGenerateOAuthConfigRequest { /** * * @type {OAuthConfigDto} - * @memberof OAuthApiGenerateConfig + * @memberof OAuthApiGenerateOAuthConfig */ readonly oAuthConfigDto: OAuthConfigDto } /** - * Request parameters for link operation in OAuthApi. + * Request parameters for linkOAuthAccount operation in OAuthApi. * @export - * @interface OAuthApiLinkRequest + * @interface OAuthApiLinkOAuthAccountRequest */ -export interface OAuthApiLinkRequest { +export interface OAuthApiLinkOAuthAccountRequest { /** * * @type {OAuthCallbackDto} - * @memberof OAuthApiLink + * @memberof OAuthApiLinkOAuthAccount */ readonly oAuthCallbackDto: OAuthCallbackDto } +/** + * Request parameters for startOAuth operation in OAuthApi. + * @export + * @interface OAuthApiStartOAuthRequest + */ +export interface OAuthApiStartOAuthRequest { + /** + * + * @type {OAuthConfigDto} + * @memberof OAuthApiStartOAuth + */ + readonly oAuthConfigDto: OAuthConfigDto +} + /** * OAuthApi - object-oriented interface * @export @@ -12075,47 +12075,36 @@ export interface OAuthApiLinkRequest { export class OAuthApi extends BaseAPI { /** * - * @param {OAuthApiAuthorizeOAuthRequest} requestParameters Request parameters. + * @param {OAuthApiFinishOAuthRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof OAuthApi */ - public authorizeOAuth(requestParameters: OAuthApiAuthorizeOAuthRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).authorizeOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); - } - - /** - * - * @param {OAuthApiCallbackRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof OAuthApi - */ - public callback(requestParameters: OAuthApiCallbackRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).callback(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); + public finishOAuth(requestParameters: OAuthApiFinishOAuthRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).finishOAuth(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); } /** * @deprecated use feature flags and /oauth/authorize - * @param {OAuthApiGenerateConfigRequest} requestParameters Request parameters. + * @param {OAuthApiGenerateOAuthConfigRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @deprecated * @throws {RequiredError} * @memberof OAuthApi */ - public generateConfig(requestParameters: OAuthApiGenerateConfigRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).generateConfig(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); + public generateOAuthConfig(requestParameters: OAuthApiGenerateOAuthConfigRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).generateOAuthConfig(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {OAuthApiLinkRequest} requestParameters Request parameters. + * @param {OAuthApiLinkOAuthAccountRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof OAuthApi */ - public link(requestParameters: OAuthApiLinkRequest, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).link(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); + public linkOAuthAccount(requestParameters: OAuthApiLinkOAuthAccountRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).linkOAuthAccount(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -12124,8 +12113,19 @@ export class OAuthApi extends BaseAPI { * @throws {RequiredError} * @memberof OAuthApi */ - public mobileRedirect(options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).mobileRedirect(options).then((request) => request(this.axios, this.basePath)); + public redirectOAuthToMobile(options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).redirectOAuthToMobile(options).then((request) => request(this.axios, this.basePath)); + } + + /** + * + * @param {OAuthApiStartOAuthRequest} requestParameters Request parameters. + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof OAuthApi + */ + public startOAuth(requestParameters: OAuthApiStartOAuthRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).startOAuth(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -12134,8 +12134,8 @@ export class OAuthApi extends BaseAPI { * @throws {RequiredError} * @memberof OAuthApi */ - public unlink(options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).unlink(options).then((request) => request(this.axios, this.basePath)); + public unlinkOAuthAccount(options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).unlinkOAuthAccount(options).then((request) => request(this.axios, this.basePath)); } } @@ -13790,37 +13790,8 @@ export const ServerInfoApiAxiosParamCreator = function (configuration?: Configur * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getServerVersion: async (options: AxiosRequestConfig = {}): Promise => { - const localVarPath = `/server-info/version`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getStats: async (options: AxiosRequestConfig = {}): Promise => { - const localVarPath = `/server-info/stats`; + getServerStatistics: async (options: AxiosRequestConfig = {}): Promise => { + const localVarPath = `/server-info/statistics`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -13843,6 +13814,35 @@ export const ServerInfoApiAxiosParamCreator = function (configuration?: Configur + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getServerVersion: async (options: AxiosRequestConfig = {}): Promise => { + const localVarPath = `/server-info/version`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -13981,8 +13981,8 @@ export const ServerInfoApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getServerVersion(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getServerVersion(options); + async getServerStatistics(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getServerStatistics(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -13990,8 +13990,8 @@ export const ServerInfoApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getStats(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getStats(options); + async getServerVersion(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getServerVersion(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -14060,16 +14060,16 @@ export const ServerInfoApiFactory = function (configuration?: Configuration, bas * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getServerVersion(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getServerVersion(options).then((request) => request(axios, basePath)); + getServerStatistics(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getServerStatistics(options).then((request) => request(axios, basePath)); }, /** * * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getStats(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getStats(options).then((request) => request(axios, basePath)); + getServerVersion(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getServerVersion(options).then((request) => request(axios, basePath)); }, /** * @@ -14141,8 +14141,8 @@ export class ServerInfoApi extends BaseAPI { * @throws {RequiredError} * @memberof ServerInfoApi */ - public getServerVersion(options?: AxiosRequestConfig) { - return ServerInfoApiFp(this.configuration).getServerVersion(options).then((request) => request(this.axios, this.basePath)); + public getServerStatistics(options?: AxiosRequestConfig) { + return ServerInfoApiFp(this.configuration).getServerStatistics(options).then((request) => request(this.axios, this.basePath)); } /** @@ -14151,8 +14151,8 @@ export class ServerInfoApi extends BaseAPI { * @throws {RequiredError} * @memberof ServerInfoApi */ - public getStats(options?: AxiosRequestConfig) { - return ServerInfoApiFp(this.configuration).getStats(options).then((request) => request(this.axios, this.basePath)); + public getServerVersion(options?: AxiosRequestConfig) { + return ServerInfoApiFp(this.configuration).getServerVersion(options).then((request) => request(this.axios, this.basePath)); } /** @@ -15038,7 +15038,7 @@ export const SystemConfigApiAxiosParamCreator = function (configuration?: Config * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getDefaults: async (options: AxiosRequestConfig = {}): Promise => { + getConfigDefaults: async (options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/system-config/defaults`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -15177,8 +15177,8 @@ export const SystemConfigApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getDefaults(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getDefaults(options); + async getConfigDefaults(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getConfigDefaults(options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -15223,8 +15223,8 @@ export const SystemConfigApiFactory = function (configuration?: Configuration, b * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getDefaults(options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getDefaults(options).then((request) => request(axios, basePath)); + getConfigDefaults(options?: AxiosRequestConfig): AxiosPromise { + return localVarFp.getConfigDefaults(options).then((request) => request(axios, basePath)); }, /** * @@ -15283,8 +15283,8 @@ export class SystemConfigApi extends BaseAPI { * @throws {RequiredError} * @memberof SystemConfigApi */ - public getDefaults(options?: AxiosRequestConfig) { - return SystemConfigApiFp(this.configuration).getDefaults(options).then((request) => request(this.axios, this.basePath)); + public getConfigDefaults(options?: AxiosRequestConfig) { + return SystemConfigApiFp(this.configuration).getConfigDefaults(options).then((request) => request(this.axios, this.basePath)); } /** diff --git a/web/src/api/utils.ts b/web/src/api/utils.ts index f82596eef2..8dd0fb4ca7 100644 --- a/web/src/api/utils.ts +++ b/web/src/api/utils.ts @@ -36,23 +36,19 @@ export const oauth = { authorize: async (location: Location) => { try { const redirectUri = location.href.split('?')[0]; - const { data } = await api.oauthApi.authorizeOAuth({ oAuthConfigDto: { redirectUri } }); + const { data } = await api.oauthApi.startOAuth({ oAuthConfigDto: { redirectUri } }); goto(data.url); } catch (error) { handleError(error, 'Unable to login with OAuth'); } }, - getConfig: (location: Location) => { - const redirectUri = location.href.split('?')[0]; - return api.oauthApi.generateConfig({ oAuthConfigDto: { redirectUri } }); - }, login: (location: Location) => { - return api.oauthApi.callback({ oAuthCallbackDto: { url: location.href } }); + return api.oauthApi.finishOAuth({ oAuthCallbackDto: { url: location.href } }); }, link: (location: Location): AxiosPromise => { - return api.oauthApi.link({ oAuthCallbackDto: { url: location.href } }); + return api.oauthApi.linkOAuthAccount({ oAuthCallbackDto: { url: location.href } }); }, unlink: () => { - return api.oauthApi.unlink(); + return api.oauthApi.unlinkOAuthAccount(); }, }; diff --git a/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte b/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte index 96fceb61e9..f22538d943 100644 --- a/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte +++ b/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte @@ -32,7 +32,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.ffmpeg), - api.systemConfigApi.getDefaults().then((res) => res.data.ffmpeg), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.ffmpeg), ]); } @@ -76,7 +76,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); ffmpegConfig = { ...configs.ffmpeg }; defaultConfig = { ...configs.ffmpeg }; diff --git a/web/src/lib/components/admin-page/settings/job-settings/job-settings.svelte b/web/src/lib/components/admin-page/settings/job-settings/job-settings.svelte index b795db7d30..9098bc33cb 100644 --- a/web/src/lib/components/admin-page/settings/job-settings/job-settings.svelte +++ b/web/src/lib/components/admin-page/settings/job-settings/job-settings.svelte @@ -22,7 +22,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.job), - api.systemConfigApi.getDefaults().then((res) => res.data.job), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.job), ]); } @@ -59,7 +59,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); jobConfig = { ...configs.job }; defaultConfig = { ...configs.job }; diff --git a/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte b/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte index 2330507e0e..698f2fc358 100644 --- a/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte +++ b/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte @@ -28,7 +28,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.library), - api.systemConfigApi.getDefaults().then((res) => res.data.library), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.library), ]); } @@ -68,7 +68,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); libraryConfig = { ...configs.library }; defaultConfig = { ...configs.library }; diff --git a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte index 78c37977d3..e09157746b 100644 --- a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte +++ b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte @@ -22,7 +22,7 @@ async function refreshConfig() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.machineLearning), - api.systemConfigApi.getDefaults().then((res) => res.data.machineLearning), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.machineLearning), ]); } diff --git a/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte b/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte index df9059fced..0efc839ad8 100644 --- a/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte +++ b/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte @@ -22,7 +22,7 @@ async function refreshConfig() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data), - api.systemConfigApi.getDefaults().then((res) => res.data), + api.systemConfigApi.getConfigDefaults().then((res) => res.data), ]); } @@ -65,7 +65,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); config = cloneDeep(configs); defaultConfig = cloneDeep(configs); diff --git a/web/src/lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte b/web/src/lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte index acb83f0ca7..7568ef60a5 100644 --- a/web/src/lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte +++ b/web/src/lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte @@ -18,7 +18,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.newVersionCheck), - api.systemConfigApi.getDefaults().then((res) => res.data.newVersionCheck), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.newVersionCheck), ]); } @@ -55,7 +55,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); newVersionCheckConfig = { ...configs.newVersionCheck }; defaultConfig = { ...configs.newVersionCheck }; diff --git a/web/src/lib/components/admin-page/settings/oauth/oauth-settings.svelte b/web/src/lib/components/admin-page/settings/oauth/oauth-settings.svelte index 9e16b44f2a..a9f2c27139 100644 --- a/web/src/lib/components/admin-page/settings/oauth/oauth-settings.svelte +++ b/web/src/lib/components/admin-page/settings/oauth/oauth-settings.svelte @@ -29,7 +29,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.oauth), - api.systemConfigApi.getDefaults().then((res) => res.data.oauth), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.oauth), ]); } @@ -90,7 +90,7 @@ } async function resetToDefault() { - const { data: defaultConfig } = await api.systemConfigApi.getDefaults(); + const { data: defaultConfig } = await api.systemConfigApi.getConfigDefaults(); oauthConfig = { ...defaultConfig.oauth }; diff --git a/web/src/lib/components/admin-page/settings/password-login/password-login-settings.svelte b/web/src/lib/components/admin-page/settings/password-login/password-login-settings.svelte index 2c11512f54..0b5f7a16c0 100644 --- a/web/src/lib/components/admin-page/settings/password-login/password-login-settings.svelte +++ b/web/src/lib/components/admin-page/settings/password-login/password-login-settings.svelte @@ -20,7 +20,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.passwordLogin), - api.systemConfigApi.getDefaults().then((res) => res.data.passwordLogin), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.passwordLogin), ]); } @@ -77,7 +77,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); passwordLoginConfig = { ...configs.passwordLogin }; defaultConfig = { ...configs.passwordLogin }; diff --git a/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte b/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte index fc95e6d7b2..5bdef1f5e5 100644 --- a/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte +++ b/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte @@ -26,7 +26,7 @@ async function getConfigs() { [savedConfig, defaultConfig, templateOptions] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.storageTemplate), - api.systemConfigApi.getDefaults().then((res) => res.data.storageTemplate), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.storageTemplate), api.systemConfigApi.getStorageTemplateOptions().then((res) => res.data), ]); @@ -119,7 +119,7 @@ } async function resetToDefault() { - const { data: defaultConfig } = await api.systemConfigApi.getDefaults(); + const { data: defaultConfig } = await api.systemConfigApi.getConfigDefaults(); storageConfig.template = defaultConfig.storageTemplate.template; diff --git a/web/src/lib/components/admin-page/settings/theme/theme-settings.svelte b/web/src/lib/components/admin-page/settings/theme/theme-settings.svelte index b28d0106d2..7d67c3d953 100644 --- a/web/src/lib/components/admin-page/settings/theme/theme-settings.svelte +++ b/web/src/lib/components/admin-page/settings/theme/theme-settings.svelte @@ -19,7 +19,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.theme), - api.systemConfigApi.getDefaults().then((res) => res.data.theme), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.theme), ]); } @@ -56,7 +56,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); themeConfig = { ...configs.theme }; defaultConfig = { ...configs.theme }; diff --git a/web/src/lib/components/admin-page/settings/thumbnail/thumbnail-settings.svelte b/web/src/lib/components/admin-page/settings/thumbnail/thumbnail-settings.svelte index d57d7ccff1..e1f4f89bfc 100644 --- a/web/src/lib/components/admin-page/settings/thumbnail/thumbnail-settings.svelte +++ b/web/src/lib/components/admin-page/settings/thumbnail/thumbnail-settings.svelte @@ -20,7 +20,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.thumbnail), - api.systemConfigApi.getDefaults().then((res) => res.data.thumbnail), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.thumbnail), ]); } @@ -37,7 +37,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); thumbnailConfig = { ...configs.thumbnail }; defaultConfig = { ...configs.thumbnail }; diff --git a/web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte b/web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte index 5ebc21a6dd..da9e0d779a 100644 --- a/web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte +++ b/web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte @@ -20,7 +20,7 @@ async function getConfigs() { [savedConfig, defaultConfig] = await Promise.all([ api.systemConfigApi.getConfig().then((res) => res.data.trash), - api.systemConfigApi.getDefaults().then((res) => res.data.trash), + api.systemConfigApi.getConfigDefaults().then((res) => res.data.trash), ]); } @@ -53,7 +53,7 @@ } async function resetToDefault() { - const { data: configs } = await api.systemConfigApi.getDefaults(); + const { data: configs } = await api.systemConfigApi.getConfigDefaults(); trashConfig = { ...configs.trash }; defaultConfig = { ...configs.trash }; diff --git a/web/src/lib/components/forms/admin-registration-form.svelte b/web/src/lib/components/forms/admin-registration-form.svelte index 6d3902a469..9223f54e06 100644 --- a/web/src/lib/components/forms/admin-registration-form.svelte +++ b/web/src/lib/components/forms/admin-registration-form.svelte @@ -30,7 +30,7 @@ const firstName = form.get('firstName'); const lastName = form.get('lastName'); - const { status } = await api.authenticationApi.adminSignUp({ + const { status } = await api.authenticationApi.signUpAdmin({ signUpDto: { email: String(email), password: String(password), diff --git a/web/src/lib/components/shared-components/side-bar/side-bar.svelte b/web/src/lib/components/shared-components/side-bar/side-bar.svelte index 464eba2994..9f5103a76f 100644 --- a/web/src/lib/components/shared-components/side-bar/side-bar.svelte +++ b/web/src/lib/components/shared-components/side-bar/side-bar.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { locale, sidebarSettings } from '$lib/stores/preferences.store'; import { featureFlags } from '$lib/stores/server-config.store'; - import { AssetApiGetAssetStatsRequest, api } from '@api'; + import { AssetApiGetAssetStatisticsRequest, api } from '@api'; import { mdiAccount, mdiAccountMultiple, @@ -23,8 +23,8 @@ import SideBarButton from './side-bar-button.svelte'; import SideBarSection from './side-bar-section.svelte'; - const getStats = async (dto: AssetApiGetAssetStatsRequest) => { - const { data: stats } = await api.assetApi.getAssetStats(dto); + const getStats = async (dto: AssetApiGetAssetStatisticsRequest) => { + const { data: stats } = await api.assetApi.getAssetStatistics(dto); return stats; }; diff --git a/web/src/lib/components/user-settings-page/library-list.svelte b/web/src/lib/components/user-settings-page/library-list.svelte index e69e22279b..fd96129eba 100644 --- a/web/src/lib/components/user-settings-page/library-list.svelte +++ b/web/src/lib/components/user-settings-page/library-list.svelte @@ -82,7 +82,7 @@ }; async function readLibraryList() { - const { data } = await api.libraryApi.getAllForUser(); + const { data } = await api.libraryApi.getLibraries(); libraries = data; dropdownOpen.length = libraries.length; diff --git a/web/src/lib/components/user-settings-page/user-api-key-list.svelte b/web/src/lib/components/user-settings-page/user-api-key-list.svelte index d9f2008b92..d1f5d927fb 100644 --- a/web/src/lib/components/user-settings-page/user-api-key-list.svelte +++ b/web/src/lib/components/user-settings-page/user-api-key-list.svelte @@ -25,14 +25,14 @@ }; async function refreshKeys() { - const { data } = await api.keyApi.getKeys(); + const { data } = await api.keyApi.getApiKeys(); keys = data; } const handleCreate = async (event: CustomEvent) => { try { const dto = event.detail; - const { data } = await api.keyApi.createKey({ aPIKeyCreateDto: dto }); + const { data } = await api.keyApi.createApiKey({ aPIKeyCreateDto: dto }); secret = data.secret; } catch (error) { handleError(error, 'Unable to create a new API Key'); @@ -50,7 +50,7 @@ const dto = event.detail; try { - await api.keyApi.updateKey({ id: editKey.id, aPIKeyUpdateDto: { name: dto.name } }); + await api.keyApi.updateApiKey({ id: editKey.id, aPIKeyUpdateDto: { name: dto.name } }); notificationController.show({ message: `Saved API Key`, type: NotificationType.Info, @@ -69,7 +69,7 @@ } try { - await api.keyApi.deleteKey({ id: deleteKey.id }); + await api.keyApi.deleteApiKey({ id: deleteKey.id }); notificationController.show({ message: `Removed API Key: ${deleteKey.name}`, type: NotificationType.Info, diff --git a/web/src/lib/stores/assets.store.ts b/web/src/lib/stores/assets.store.ts index 7488ddf6a6..83123f7fd1 100644 --- a/web/src/lib/stores/assets.store.ts +++ b/web/src/lib/stores/assets.store.ts @@ -196,7 +196,7 @@ export class AssetStore { bucket.cancelToken = new AbortController(); - const { data: assets } = await api.assetApi.getByTimeBucket( + const { data: assets } = await api.assetApi.getTimeBucket( { ...this.options, timeBucket: bucketDate, @@ -206,7 +206,7 @@ export class AssetStore { ); if (this.albumId) { - const { data: albumAssets } = await api.assetApi.getByTimeBucket( + const { data: albumAssets } = await api.assetApi.getTimeBucket( { albumId: this.albumId, timeBucket: bucketDate, diff --git a/web/src/routes/(user)/user-settings/+page.server.ts b/web/src/routes/(user)/user-settings/+page.server.ts index 7d35d5fdeb..a6aa5e15a4 100644 --- a/web/src/routes/(user)/user-settings/+page.server.ts +++ b/web/src/routes/(user)/user-settings/+page.server.ts @@ -8,7 +8,7 @@ export const load = (async ({ parent, locals }) => { throw redirect(302, AppRoute.AUTH_LOGIN); } - const { data: keys } = await locals.api.keyApi.getKeys(); + const { data: keys } = await locals.api.keyApi.getApiKeys(); const { data: devices } = await locals.api.authenticationApi.getAuthDevices(); const { data: partners } = await locals.api.partnerApi.getPartners({ direction: 'shared-by' }); diff --git a/web/src/routes/admin/server-status/+page.server.ts b/web/src/routes/admin/server-status/+page.server.ts index 00c5e48bfa..a9b08e2a16 100644 --- a/web/src/routes/admin/server-status/+page.server.ts +++ b/web/src/routes/admin/server-status/+page.server.ts @@ -11,7 +11,7 @@ export const load = (async ({ parent, locals: { api } }) => { throw redirect(302, AppRoute.PHOTOS); } - const { data: stats } = await api.serverInfoApi.getStats(); + const { data: stats } = await api.serverInfoApi.getServerStatistics(); return { user, diff --git a/web/src/routes/admin/server-status/+page.svelte b/web/src/routes/admin/server-status/+page.svelte index d5fd31f314..ea8344723d 100644 --- a/web/src/routes/admin/server-status/+page.svelte +++ b/web/src/routes/admin/server-status/+page.svelte @@ -11,7 +11,7 @@ onMount(async () => { setIntervalHandler = setInterval(async () => { - const { data: stats } = await api.serverInfoApi.getStats(); + const { data: stats } = await api.serverInfoApi.getServerStatistics(); data.stats = stats; }, 5000); });