diff --git a/server/bin/generate-open-api.sh b/server/bin/generate-open-api.sh index 82a694d80d..c93f4f4732 100755 --- a/server/bin/generate-open-api.sh +++ b/server/bin/generate-open-api.sh @@ -20,7 +20,7 @@ function web { wget -O apiInner.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/v6.0.1/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache patch -u apiInner.mustache < apiInner.mustache.patch cd ../../.. - npx --yes @openapitools/openapi-generator-cli generate -g typescript-axios -i ./immich-openapi-specs.json -o ../web/src/api/open-api -t ./openapi-generator/templates/web + npx --yes @openapitools/openapi-generator-cli generate -g typescript-axios -i ./immich-openapi-specs.json -o ../web/src/api/open-api -t ./openapi-generator/templates/web --additional-properties=useSingleRequestParameter=true } if [[ $1 == 'mobile' ]]; then diff --git a/web/src/api/open-api/api.ts b/web/src/api/open-api/api.ts index 9da1b38469..1a0858caf9 100644 --- a/web/src/api/open-api/api.ts +++ b/web/src/api/open-api/api.ts @@ -3113,6 +3113,69 @@ export const APIKeyApiFactory = function (configuration?: Configuration, basePat }; }; +/** + * Request parameters for createKey operation in APIKeyApi. + * @export + * @interface APIKeyApiCreateKeyRequest + */ +export interface APIKeyApiCreateKeyRequest { + /** + * + * @type {APIKeyCreateDto} + * @memberof APIKeyApiCreateKey + */ + readonly aPIKeyCreateDto: APIKeyCreateDto +} + +/** + * Request parameters for deleteKey operation in APIKeyApi. + * @export + * @interface APIKeyApiDeleteKeyRequest + */ +export interface APIKeyApiDeleteKeyRequest { + /** + * + * @type {string} + * @memberof APIKeyApiDeleteKey + */ + readonly id: string +} + +/** + * Request parameters for getKey operation in APIKeyApi. + * @export + * @interface APIKeyApiGetKeyRequest + */ +export interface APIKeyApiGetKeyRequest { + /** + * + * @type {string} + * @memberof APIKeyApiGetKey + */ + readonly id: string +} + +/** + * Request parameters for updateKey operation in APIKeyApi. + * @export + * @interface APIKeyApiUpdateKeyRequest + */ +export interface APIKeyApiUpdateKeyRequest { + /** + * + * @type {string} + * @memberof APIKeyApiUpdateKey + */ + readonly id: string + + /** + * + * @type {APIKeyUpdateDto} + * @memberof APIKeyApiUpdateKey + */ + readonly aPIKeyUpdateDto: APIKeyUpdateDto +} + /** * APIKeyApi - object-oriented interface * @export @@ -3122,35 +3185,35 @@ export const APIKeyApiFactory = function (configuration?: Configuration, basePat export class APIKeyApi extends BaseAPI { /** * - * @param {APIKeyCreateDto} aPIKeyCreateDto + * @param {APIKeyApiCreateKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public createKey(aPIKeyCreateDto: APIKeyCreateDto, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).createKey(aPIKeyCreateDto, options).then((request) => request(this.axios, this.basePath)); + public createKey(requestParameters: APIKeyApiCreateKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).createKey(requestParameters.aPIKeyCreateDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {APIKeyApiDeleteKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public deleteKey(id: string, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).deleteKey(id, options).then((request) => request(this.axios, this.basePath)); + public deleteKey(requestParameters: APIKeyApiDeleteKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).deleteKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {APIKeyApiGetKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public getKey(id: string, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).getKey(id, options).then((request) => request(this.axios, this.basePath)); + public getKey(requestParameters: APIKeyApiGetKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).getKey(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** @@ -3165,14 +3228,13 @@ export class APIKeyApi extends BaseAPI { /** * - * @param {string} id - * @param {APIKeyUpdateDto} aPIKeyUpdateDto + * @param {APIKeyApiUpdateKeyRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof APIKeyApi */ - public updateKey(id: string, aPIKeyUpdateDto: APIKeyUpdateDto, options?: AxiosRequestConfig) { - return APIKeyApiFp(this.configuration).updateKey(id, aPIKeyUpdateDto, options).then((request) => request(this.axios, this.basePath)); + public updateKey(requestParameters: APIKeyApiUpdateKeyRequest, options?: AxiosRequestConfig) { + return APIKeyApiFp(this.configuration).updateKey(requestParameters.id, requestParameters.aPIKeyUpdateDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -4017,6 +4079,237 @@ export const AlbumApiFactory = function (configuration?: Configuration, basePath }; }; +/** + * Request parameters for addAssetsToAlbum operation in AlbumApi. + * @export + * @interface AlbumApiAddAssetsToAlbumRequest + */ +export interface AlbumApiAddAssetsToAlbumRequest { + /** + * + * @type {string} + * @memberof AlbumApiAddAssetsToAlbum + */ + readonly id: string + + /** + * + * @type {AddAssetsDto} + * @memberof AlbumApiAddAssetsToAlbum + */ + readonly addAssetsDto: AddAssetsDto + + /** + * + * @type {string} + * @memberof AlbumApiAddAssetsToAlbum + */ + readonly key?: string +} + +/** + * Request parameters for addUsersToAlbum operation in AlbumApi. + * @export + * @interface AlbumApiAddUsersToAlbumRequest + */ +export interface AlbumApiAddUsersToAlbumRequest { + /** + * + * @type {string} + * @memberof AlbumApiAddUsersToAlbum + */ + readonly id: string + + /** + * + * @type {AddUsersDto} + * @memberof AlbumApiAddUsersToAlbum + */ + readonly addUsersDto: AddUsersDto +} + +/** + * Request parameters for createAlbum operation in AlbumApi. + * @export + * @interface AlbumApiCreateAlbumRequest + */ +export interface AlbumApiCreateAlbumRequest { + /** + * + * @type {CreateAlbumDto} + * @memberof AlbumApiCreateAlbum + */ + readonly createAlbumDto: CreateAlbumDto +} + +/** + * Request parameters for createAlbumSharedLink operation in AlbumApi. + * @export + * @interface AlbumApiCreateAlbumSharedLinkRequest + */ +export interface AlbumApiCreateAlbumSharedLinkRequest { + /** + * + * @type {CreateAlbumShareLinkDto} + * @memberof AlbumApiCreateAlbumSharedLink + */ + readonly createAlbumShareLinkDto: CreateAlbumShareLinkDto +} + +/** + * Request parameters for deleteAlbum operation in AlbumApi. + * @export + * @interface AlbumApiDeleteAlbumRequest + */ +export interface AlbumApiDeleteAlbumRequest { + /** + * + * @type {string} + * @memberof AlbumApiDeleteAlbum + */ + readonly id: string +} + +/** + * Request parameters for downloadArchive operation in AlbumApi. + * @export + * @interface AlbumApiDownloadArchiveRequest + */ +export interface AlbumApiDownloadArchiveRequest { + /** + * + * @type {string} + * @memberof AlbumApiDownloadArchive + */ + readonly id: string + + /** + * + * @type {string} + * @memberof AlbumApiDownloadArchive + */ + readonly name?: string + + /** + * + * @type {number} + * @memberof AlbumApiDownloadArchive + */ + readonly skip?: number + + /** + * + * @type {string} + * @memberof AlbumApiDownloadArchive + */ + readonly key?: string +} + +/** + * Request parameters for getAlbumInfo operation in AlbumApi. + * @export + * @interface AlbumApiGetAlbumInfoRequest + */ +export interface AlbumApiGetAlbumInfoRequest { + /** + * + * @type {string} + * @memberof AlbumApiGetAlbumInfo + */ + readonly id: string + + /** + * + * @type {string} + * @memberof AlbumApiGetAlbumInfo + */ + readonly key?: string +} + +/** + * Request parameters for getAllAlbums operation in AlbumApi. + * @export + * @interface AlbumApiGetAllAlbumsRequest + */ +export interface AlbumApiGetAllAlbumsRequest { + /** + * + * @type {boolean} + * @memberof AlbumApiGetAllAlbums + */ + readonly shared?: boolean + + /** + * Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums + * @type {string} + * @memberof AlbumApiGetAllAlbums + */ + readonly assetId?: string +} + +/** + * Request parameters for removeAssetFromAlbum operation in AlbumApi. + * @export + * @interface AlbumApiRemoveAssetFromAlbumRequest + */ +export interface AlbumApiRemoveAssetFromAlbumRequest { + /** + * + * @type {string} + * @memberof AlbumApiRemoveAssetFromAlbum + */ + readonly id: string + + /** + * + * @type {RemoveAssetsDto} + * @memberof AlbumApiRemoveAssetFromAlbum + */ + readonly removeAssetsDto: RemoveAssetsDto +} + +/** + * Request parameters for removeUserFromAlbum operation in AlbumApi. + * @export + * @interface AlbumApiRemoveUserFromAlbumRequest + */ +export interface AlbumApiRemoveUserFromAlbumRequest { + /** + * + * @type {string} + * @memberof AlbumApiRemoveUserFromAlbum + */ + readonly id: string + + /** + * + * @type {string} + * @memberof AlbumApiRemoveUserFromAlbum + */ + readonly userId: string +} + +/** + * Request parameters for updateAlbumInfo operation in AlbumApi. + * @export + * @interface AlbumApiUpdateAlbumInfoRequest + */ +export interface AlbumApiUpdateAlbumInfoRequest { + /** + * + * @type {string} + * @memberof AlbumApiUpdateAlbumInfo + */ + readonly id: string + + /** + * + * @type {UpdateAlbumDto} + * @memberof AlbumApiUpdateAlbumInfo + */ + readonly updateAlbumDto: UpdateAlbumDto +} + /** * AlbumApi - object-oriented interface * @export @@ -4026,74 +4319,68 @@ export const AlbumApiFactory = function (configuration?: Configuration, basePath export class AlbumApi extends BaseAPI { /** * - * @param {string} id - * @param {AddAssetsDto} addAssetsDto - * @param {string} [key] + * @param {AlbumApiAddAssetsToAlbumRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public addAssetsToAlbum(id: string, addAssetsDto: AddAssetsDto, key?: string, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).addAssetsToAlbum(id, addAssetsDto, key, options).then((request) => request(this.axios, this.basePath)); + public addAssetsToAlbum(requestParameters: AlbumApiAddAssetsToAlbumRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).addAssetsToAlbum(requestParameters.id, requestParameters.addAssetsDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id - * @param {AddUsersDto} addUsersDto + * @param {AlbumApiAddUsersToAlbumRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public addUsersToAlbum(id: string, addUsersDto: AddUsersDto, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).addUsersToAlbum(id, addUsersDto, options).then((request) => request(this.axios, this.basePath)); + public addUsersToAlbum(requestParameters: AlbumApiAddUsersToAlbumRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).addUsersToAlbum(requestParameters.id, requestParameters.addUsersDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {CreateAlbumDto} createAlbumDto + * @param {AlbumApiCreateAlbumRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public createAlbum(createAlbumDto: CreateAlbumDto, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).createAlbum(createAlbumDto, options).then((request) => request(this.axios, this.basePath)); + public createAlbum(requestParameters: AlbumApiCreateAlbumRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).createAlbum(requestParameters.createAlbumDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {CreateAlbumShareLinkDto} createAlbumShareLinkDto + * @param {AlbumApiCreateAlbumSharedLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public createAlbumSharedLink(createAlbumShareLinkDto: CreateAlbumShareLinkDto, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).createAlbumSharedLink(createAlbumShareLinkDto, options).then((request) => request(this.axios, this.basePath)); + public createAlbumSharedLink(requestParameters: AlbumApiCreateAlbumSharedLinkRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).createAlbumSharedLink(requestParameters.createAlbumShareLinkDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {AlbumApiDeleteAlbumRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public deleteAlbum(id: string, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).deleteAlbum(id, options).then((request) => request(this.axios, this.basePath)); + public deleteAlbum(requestParameters: AlbumApiDeleteAlbumRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).deleteAlbum(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id - * @param {string} [name] - * @param {number} [skip] - * @param {string} [key] + * @param {AlbumApiDownloadArchiveRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public downloadArchive(id: string, name?: string, skip?: number, key?: string, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).downloadArchive(id, name, skip, key, options).then((request) => request(this.axios, this.basePath)); + public downloadArchive(requestParameters: AlbumApiDownloadArchiveRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).downloadArchive(requestParameters.id, requestParameters.name, requestParameters.skip, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** @@ -4108,62 +4395,57 @@ export class AlbumApi extends BaseAPI { /** * - * @param {string} id - * @param {string} [key] + * @param {AlbumApiGetAlbumInfoRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public getAlbumInfo(id: string, key?: string, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).getAlbumInfo(id, key, options).then((request) => request(this.axios, this.basePath)); + public getAlbumInfo(requestParameters: AlbumApiGetAlbumInfoRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).getAlbumInfo(requestParameters.id, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {boolean} [shared] - * @param {string} [assetId] Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums + * @param {AlbumApiGetAllAlbumsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public getAllAlbums(shared?: boolean, assetId?: string, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).getAllAlbums(shared, assetId, options).then((request) => request(this.axios, this.basePath)); + public getAllAlbums(requestParameters: AlbumApiGetAllAlbumsRequest = {}, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).getAllAlbums(requestParameters.shared, requestParameters.assetId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id - * @param {RemoveAssetsDto} removeAssetsDto + * @param {AlbumApiRemoveAssetFromAlbumRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public removeAssetFromAlbum(id: string, removeAssetsDto: RemoveAssetsDto, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).removeAssetFromAlbum(id, removeAssetsDto, options).then((request) => request(this.axios, this.basePath)); + public removeAssetFromAlbum(requestParameters: AlbumApiRemoveAssetFromAlbumRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).removeAssetFromAlbum(requestParameters.id, requestParameters.removeAssetsDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id - * @param {string} userId + * @param {AlbumApiRemoveUserFromAlbumRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public removeUserFromAlbum(id: string, userId: string, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).removeUserFromAlbum(id, userId, options).then((request) => request(this.axios, this.basePath)); + public removeUserFromAlbum(requestParameters: AlbumApiRemoveUserFromAlbumRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).removeUserFromAlbum(requestParameters.id, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id - * @param {UpdateAlbumDto} updateAlbumDto + * @param {AlbumApiUpdateAlbumInfoRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AlbumApi */ - public updateAlbumInfo(id: string, updateAlbumDto: UpdateAlbumDto, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).updateAlbumInfo(id, updateAlbumDto, options).then((request) => request(this.axios, this.basePath)); + public updateAlbumInfo(requestParameters: AlbumApiUpdateAlbumInfoRequest, options?: AxiosRequestConfig) { + return AlbumApiFp(this.configuration).updateAlbumInfo(requestParameters.id, requestParameters.updateAlbumDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -6035,6 +6317,531 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }; }; +/** + * Request parameters for addAssetsToSharedLink operation in AssetApi. + * @export + * @interface AssetApiAddAssetsToSharedLinkRequest + */ +export interface AssetApiAddAssetsToSharedLinkRequest { + /** + * + * @type {AddAssetsDto} + * @memberof AssetApiAddAssetsToSharedLink + */ + readonly addAssetsDto: AddAssetsDto + + /** + * + * @type {string} + * @memberof AssetApiAddAssetsToSharedLink + */ + readonly key?: string +} + +/** + * Request parameters for bulkUploadCheck operation in AssetApi. + * @export + * @interface AssetApiBulkUploadCheckRequest + */ +export interface AssetApiBulkUploadCheckRequest { + /** + * + * @type {AssetBulkUploadCheckDto} + * @memberof AssetApiBulkUploadCheck + */ + readonly assetBulkUploadCheckDto: AssetBulkUploadCheckDto +} + +/** + * Request parameters for checkDuplicateAsset operation in AssetApi. + * @export + * @interface AssetApiCheckDuplicateAssetRequest + */ +export interface AssetApiCheckDuplicateAssetRequest { + /** + * + * @type {CheckDuplicateAssetDto} + * @memberof AssetApiCheckDuplicateAsset + */ + readonly checkDuplicateAssetDto: CheckDuplicateAssetDto + + /** + * + * @type {string} + * @memberof AssetApiCheckDuplicateAsset + */ + readonly key?: string +} + +/** + * Request parameters for checkExistingAssets operation in AssetApi. + * @export + * @interface AssetApiCheckExistingAssetsRequest + */ +export interface AssetApiCheckExistingAssetsRequest { + /** + * + * @type {CheckExistingAssetsDto} + * @memberof AssetApiCheckExistingAssets + */ + readonly checkExistingAssetsDto: CheckExistingAssetsDto +} + +/** + * Request parameters for createAssetsSharedLink operation in AssetApi. + * @export + * @interface AssetApiCreateAssetsSharedLinkRequest + */ +export interface AssetApiCreateAssetsSharedLinkRequest { + /** + * + * @type {CreateAssetsShareLinkDto} + * @memberof AssetApiCreateAssetsSharedLink + */ + readonly createAssetsShareLinkDto: CreateAssetsShareLinkDto +} + +/** + * Request parameters for deleteAsset operation in AssetApi. + * @export + * @interface AssetApiDeleteAssetRequest + */ +export interface AssetApiDeleteAssetRequest { + /** + * + * @type {DeleteAssetDto} + * @memberof AssetApiDeleteAsset + */ + readonly deleteAssetDto: DeleteAssetDto +} + +/** + * Request parameters for downloadFile operation in AssetApi. + * @export + * @interface AssetApiDownloadFileRequest + */ +export interface AssetApiDownloadFileRequest { + /** + * + * @type {string} + * @memberof AssetApiDownloadFile + */ + readonly assetId: string + + /** + * + * @type {string} + * @memberof AssetApiDownloadFile + */ + readonly key?: string +} + +/** + * Request parameters for downloadFiles operation in AssetApi. + * @export + * @interface AssetApiDownloadFilesRequest + */ +export interface AssetApiDownloadFilesRequest { + /** + * + * @type {DownloadFilesDto} + * @memberof AssetApiDownloadFiles + */ + readonly downloadFilesDto: DownloadFilesDto + + /** + * + * @type {string} + * @memberof AssetApiDownloadFiles + */ + readonly key?: string +} + +/** + * Request parameters for downloadLibrary operation in AssetApi. + * @export + * @interface AssetApiDownloadLibraryRequest + */ +export interface AssetApiDownloadLibraryRequest { + /** + * + * @type {string} + * @memberof AssetApiDownloadLibrary + */ + readonly name?: string + + /** + * + * @type {number} + * @memberof AssetApiDownloadLibrary + */ + readonly skip?: number + + /** + * + * @type {string} + * @memberof AssetApiDownloadLibrary + */ + readonly key?: string +} + +/** + * Request parameters for getAllAssets operation in AssetApi. + * @export + * @interface AssetApiGetAllAssetsRequest + */ +export interface AssetApiGetAllAssetsRequest { + /** + * + * @type {string} + * @memberof AssetApiGetAllAssets + */ + readonly userId?: string + + /** + * + * @type {boolean} + * @memberof AssetApiGetAllAssets + */ + readonly isFavorite?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetAllAssets + */ + readonly isArchived?: boolean + + /** + * + * @type {number} + * @memberof AssetApiGetAllAssets + */ + readonly skip?: number + + /** + * ETag of data already cached on the client + * @type {string} + * @memberof AssetApiGetAllAssets + */ + readonly ifNoneMatch?: string +} + +/** + * Request parameters for getAssetById operation in AssetApi. + * @export + * @interface AssetApiGetAssetByIdRequest + */ +export interface AssetApiGetAssetByIdRequest { + /** + * + * @type {string} + * @memberof AssetApiGetAssetById + */ + readonly assetId: string + + /** + * + * @type {string} + * @memberof AssetApiGetAssetById + */ + readonly key?: string +} + +/** + * Request parameters for getAssetByTimeBucket operation in AssetApi. + * @export + * @interface AssetApiGetAssetByTimeBucketRequest + */ +export interface AssetApiGetAssetByTimeBucketRequest { + /** + * + * @type {GetAssetByTimeBucketDto} + * @memberof AssetApiGetAssetByTimeBucket + */ + readonly getAssetByTimeBucketDto: GetAssetByTimeBucketDto +} + +/** + * Request parameters for getAssetCountByTimeBucket operation in AssetApi. + * @export + * @interface AssetApiGetAssetCountByTimeBucketRequest + */ +export interface AssetApiGetAssetCountByTimeBucketRequest { + /** + * + * @type {GetAssetCountByTimeBucketDto} + * @memberof AssetApiGetAssetCountByTimeBucket + */ + readonly getAssetCountByTimeBucketDto: GetAssetCountByTimeBucketDto +} + +/** + * Request parameters for getAssetThumbnail operation in AssetApi. + * @export + * @interface AssetApiGetAssetThumbnailRequest + */ +export interface AssetApiGetAssetThumbnailRequest { + /** + * + * @type {string} + * @memberof AssetApiGetAssetThumbnail + */ + readonly assetId: string + + /** + * + * @type {ThumbnailFormat} + * @memberof AssetApiGetAssetThumbnail + */ + readonly format?: ThumbnailFormat + + /** + * + * @type {string} + * @memberof AssetApiGetAssetThumbnail + */ + readonly key?: string +} + +/** + * Request parameters for getMapMarkers operation in AssetApi. + * @export + * @interface AssetApiGetMapMarkersRequest + */ +export interface AssetApiGetMapMarkersRequest { + /** + * + * @type {boolean} + * @memberof AssetApiGetMapMarkers + */ + readonly isFavorite?: boolean + + /** + * + * @type {string} + * @memberof AssetApiGetMapMarkers + */ + readonly fileCreatedAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiGetMapMarkers + */ + readonly fileCreatedBefore?: string +} + +/** + * Request parameters for getUserAssetsByDeviceId operation in AssetApi. + * @export + * @interface AssetApiGetUserAssetsByDeviceIdRequest + */ +export interface AssetApiGetUserAssetsByDeviceIdRequest { + /** + * + * @type {string} + * @memberof AssetApiGetUserAssetsByDeviceId + */ + readonly deviceId: string +} + +/** + * Request parameters for removeAssetsFromSharedLink operation in AssetApi. + * @export + * @interface AssetApiRemoveAssetsFromSharedLinkRequest + */ +export interface AssetApiRemoveAssetsFromSharedLinkRequest { + /** + * + * @type {RemoveAssetsDto} + * @memberof AssetApiRemoveAssetsFromSharedLink + */ + readonly removeAssetsDto: RemoveAssetsDto + + /** + * + * @type {string} + * @memberof AssetApiRemoveAssetsFromSharedLink + */ + readonly key?: string +} + +/** + * Request parameters for searchAsset operation in AssetApi. + * @export + * @interface AssetApiSearchAssetRequest + */ +export interface AssetApiSearchAssetRequest { + /** + * + * @type {SearchAssetDto} + * @memberof AssetApiSearchAsset + */ + readonly searchAssetDto: SearchAssetDto +} + +/** + * Request parameters for serveFile operation in AssetApi. + * @export + * @interface AssetApiServeFileRequest + */ +export interface AssetApiServeFileRequest { + /** + * + * @type {string} + * @memberof AssetApiServeFile + */ + readonly assetId: string + + /** + * + * @type {boolean} + * @memberof AssetApiServeFile + */ + readonly isThumb?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiServeFile + */ + readonly isWeb?: boolean + + /** + * + * @type {string} + * @memberof AssetApiServeFile + */ + readonly key?: string +} + +/** + * Request parameters for updateAsset operation in AssetApi. + * @export + * @interface AssetApiUpdateAssetRequest + */ +export interface AssetApiUpdateAssetRequest { + /** + * + * @type {string} + * @memberof AssetApiUpdateAsset + */ + readonly assetId: string + + /** + * + * @type {UpdateAssetDto} + * @memberof AssetApiUpdateAsset + */ + readonly updateAssetDto: UpdateAssetDto +} + +/** + * Request parameters for uploadFile operation in AssetApi. + * @export + * @interface AssetApiUploadFileRequest + */ +export interface AssetApiUploadFileRequest { + /** + * + * @type {AssetTypeEnum} + * @memberof AssetApiUploadFile + */ + readonly assetType: AssetTypeEnum + + /** + * + * @type {File} + * @memberof AssetApiUploadFile + */ + readonly assetData: File + + /** + * + * @type {string} + * @memberof AssetApiUploadFile + */ + readonly deviceAssetId: string + + /** + * + * @type {string} + * @memberof AssetApiUploadFile + */ + readonly deviceId: string + + /** + * + * @type {string} + * @memberof AssetApiUploadFile + */ + readonly fileCreatedAt: string + + /** + * + * @type {string} + * @memberof AssetApiUploadFile + */ + readonly fileModifiedAt: string + + /** + * + * @type {boolean} + * @memberof AssetApiUploadFile + */ + readonly isFavorite: boolean + + /** + * + * @type {string} + * @memberof AssetApiUploadFile + */ + readonly fileExtension: string + + /** + * + * @type {string} + * @memberof AssetApiUploadFile + */ + readonly key?: string + + /** + * + * @type {File} + * @memberof AssetApiUploadFile + */ + readonly livePhotoData?: File + + /** + * + * @type {File} + * @memberof AssetApiUploadFile + */ + readonly sidecarData?: File + + /** + * + * @type {boolean} + * @memberof AssetApiUploadFile + */ + readonly isArchived?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiUploadFile + */ + readonly isVisible?: boolean + + /** + * + * @type {string} + * @memberof AssetApiUploadFile + */ + readonly duration?: string +} + /** * AssetApi - object-oriented interface * @export @@ -6044,122 +6851,112 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath export class AssetApi extends BaseAPI { /** * - * @param {AddAssetsDto} addAssetsDto - * @param {string} [key] + * @param {AssetApiAddAssetsToSharedLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public addAssetsToSharedLink(addAssetsDto: AddAssetsDto, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).addAssetsToSharedLink(addAssetsDto, key, options).then((request) => request(this.axios, this.basePath)); + public addAssetsToSharedLink(requestParameters: AssetApiAddAssetsToSharedLinkRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).addAssetsToSharedLink(requestParameters.addAssetsDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * Checks if assets exist by checksums - * @param {AssetBulkUploadCheckDto} assetBulkUploadCheckDto + * @param {AssetApiBulkUploadCheckRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public bulkUploadCheck(assetBulkUploadCheckDto: AssetBulkUploadCheckDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).bulkUploadCheck(assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath)); + public bulkUploadCheck(requestParameters: AssetApiBulkUploadCheckRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath)); } /** * Check duplicated asset before uploading - for Web upload used - * @param {CheckDuplicateAssetDto} checkDuplicateAssetDto - * @param {string} [key] + * @param {AssetApiCheckDuplicateAssetRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public checkDuplicateAsset(checkDuplicateAssetDto: CheckDuplicateAssetDto, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).checkDuplicateAsset(checkDuplicateAssetDto, key, options).then((request) => request(this.axios, this.basePath)); + public checkDuplicateAsset(requestParameters: AssetApiCheckDuplicateAssetRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).checkDuplicateAsset(requestParameters.checkDuplicateAssetDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * Checks if multiple assets exist on the server and returns all existing - used by background backup - * @param {CheckExistingAssetsDto} checkExistingAssetsDto + * @param {AssetApiCheckExistingAssetsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public checkExistingAssets(checkExistingAssetsDto: CheckExistingAssetsDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).checkExistingAssets(checkExistingAssetsDto, options).then((request) => request(this.axios, this.basePath)); + public checkExistingAssets(requestParameters: AssetApiCheckExistingAssetsRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).checkExistingAssets(requestParameters.checkExistingAssetsDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {CreateAssetsShareLinkDto} createAssetsShareLinkDto + * @param {AssetApiCreateAssetsSharedLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public createAssetsSharedLink(createAssetsShareLinkDto: CreateAssetsShareLinkDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).createAssetsSharedLink(createAssetsShareLinkDto, options).then((request) => request(this.axios, this.basePath)); + public createAssetsSharedLink(requestParameters: AssetApiCreateAssetsSharedLinkRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).createAssetsSharedLink(requestParameters.createAssetsShareLinkDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {DeleteAssetDto} deleteAssetDto + * @param {AssetApiDeleteAssetRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public deleteAsset(deleteAssetDto: DeleteAssetDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).deleteAsset(deleteAssetDto, options).then((request) => request(this.axios, this.basePath)); + public deleteAsset(requestParameters: AssetApiDeleteAssetRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).deleteAsset(requestParameters.deleteAssetDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} assetId - * @param {string} [key] + * @param {AssetApiDownloadFileRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public downloadFile(assetId: string, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).downloadFile(assetId, key, options).then((request) => request(this.axios, this.basePath)); + public downloadFile(requestParameters: AssetApiDownloadFileRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).downloadFile(requestParameters.assetId, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {DownloadFilesDto} downloadFilesDto - * @param {string} [key] + * @param {AssetApiDownloadFilesRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public downloadFiles(downloadFilesDto: DownloadFilesDto, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).downloadFiles(downloadFilesDto, key, options).then((request) => request(this.axios, this.basePath)); + public downloadFiles(requestParameters: AssetApiDownloadFilesRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).downloadFiles(requestParameters.downloadFilesDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * Current this is not used in any UI element - * @param {string} [name] - * @param {number} [skip] - * @param {string} [key] + * @param {AssetApiDownloadLibraryRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public downloadLibrary(name?: string, skip?: number, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).downloadLibrary(name, skip, key, options).then((request) => request(this.axios, this.basePath)); + public downloadLibrary(requestParameters: AssetApiDownloadLibraryRequest = {}, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).downloadLibrary(requestParameters.name, requestParameters.skip, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * Get all AssetEntity belong to the user - * @param {string} [userId] - * @param {boolean} [isFavorite] - * @param {boolean} [isArchived] - * @param {number} [skip] - * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {AssetApiGetAllAssetsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getAllAssets(userId?: string, isFavorite?: boolean, isArchived?: boolean, skip?: number, ifNoneMatch?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAllAssets(userId, isFavorite, isArchived, skip, ifNoneMatch, options).then((request) => request(this.axios, this.basePath)); + public getAllAssets(requestParameters: AssetApiGetAllAssetsRequest = {}, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getAllAssets(requestParameters.userId, requestParameters.isFavorite, requestParameters.isArchived, requestParameters.skip, requestParameters.ifNoneMatch, options).then((request) => request(this.axios, this.basePath)); } /** @@ -6174,36 +6971,35 @@ export class AssetApi extends BaseAPI { /** * Get a single asset\'s information - * @param {string} assetId - * @param {string} [key] + * @param {AssetApiGetAssetByIdRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getAssetById(assetId: string, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetById(assetId, key, options).then((request) => request(this.axios, this.basePath)); + public getAssetById(requestParameters: AssetApiGetAssetByIdRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getAssetById(requestParameters.assetId, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {GetAssetByTimeBucketDto} getAssetByTimeBucketDto + * @param {AssetApiGetAssetByTimeBucketRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getAssetByTimeBucket(getAssetByTimeBucketDto: GetAssetByTimeBucketDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetByTimeBucket(getAssetByTimeBucketDto, options).then((request) => request(this.axios, this.basePath)); + public getAssetByTimeBucket(requestParameters: AssetApiGetAssetByTimeBucketRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getAssetByTimeBucket(requestParameters.getAssetByTimeBucketDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {GetAssetCountByTimeBucketDto} getAssetCountByTimeBucketDto + * @param {AssetApiGetAssetCountByTimeBucketRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getAssetCountByTimeBucket(getAssetCountByTimeBucketDto: GetAssetCountByTimeBucketDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetCountByTimeBucket(getAssetCountByTimeBucketDto, options).then((request) => request(this.axios, this.basePath)); + public getAssetCountByTimeBucket(requestParameters: AssetApiGetAssetCountByTimeBucketRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getAssetCountByTimeBucket(requestParameters.getAssetCountByTimeBucketDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -6228,15 +7024,13 @@ export class AssetApi extends BaseAPI { /** * - * @param {string} assetId - * @param {ThumbnailFormat} [format] - * @param {string} [key] + * @param {AssetApiGetAssetThumbnailRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getAssetThumbnail(assetId: string, format?: ThumbnailFormat, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetThumbnail(assetId, format, key, options).then((request) => request(this.axios, this.basePath)); + public getAssetThumbnail(requestParameters: AssetApiGetAssetThumbnailRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getAssetThumbnail(requestParameters.assetId, requestParameters.format, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** @@ -6261,99 +7055,79 @@ export class AssetApi extends BaseAPI { /** * - * @param {boolean} [isFavorite] - * @param {string} [fileCreatedAfter] - * @param {string} [fileCreatedBefore] + * @param {AssetApiGetMapMarkersRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getMapMarkers(isFavorite?: boolean, fileCreatedAfter?: string, fileCreatedBefore?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getMapMarkers(isFavorite, fileCreatedAfter, fileCreatedBefore, options).then((request) => request(this.axios, this.basePath)); + public getMapMarkers(requestParameters: AssetApiGetMapMarkersRequest = {}, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getMapMarkers(requestParameters.isFavorite, requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, options).then((request) => request(this.axios, this.basePath)); } /** * Get all asset of a device that are in the database, ID only. - * @param {string} deviceId + * @param {AssetApiGetUserAssetsByDeviceIdRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public getUserAssetsByDeviceId(deviceId: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getUserAssetsByDeviceId(deviceId, options).then((request) => request(this.axios, this.basePath)); + public getUserAssetsByDeviceId(requestParameters: AssetApiGetUserAssetsByDeviceIdRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).getUserAssetsByDeviceId(requestParameters.deviceId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {RemoveAssetsDto} removeAssetsDto - * @param {string} [key] + * @param {AssetApiRemoveAssetsFromSharedLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public removeAssetsFromSharedLink(removeAssetsDto: RemoveAssetsDto, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).removeAssetsFromSharedLink(removeAssetsDto, key, options).then((request) => request(this.axios, this.basePath)); + public removeAssetsFromSharedLink(requestParameters: AssetApiRemoveAssetsFromSharedLinkRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).removeAssetsFromSharedLink(requestParameters.removeAssetsDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {SearchAssetDto} searchAssetDto + * @param {AssetApiSearchAssetRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public searchAsset(searchAssetDto: SearchAssetDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).searchAsset(searchAssetDto, options).then((request) => request(this.axios, this.basePath)); + public searchAsset(requestParameters: AssetApiSearchAssetRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).searchAsset(requestParameters.searchAssetDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} assetId - * @param {boolean} [isThumb] - * @param {boolean} [isWeb] - * @param {string} [key] + * @param {AssetApiServeFileRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public serveFile(assetId: string, isThumb?: boolean, isWeb?: boolean, key?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).serveFile(assetId, isThumb, isWeb, key, options).then((request) => request(this.axios, this.basePath)); + public serveFile(requestParameters: AssetApiServeFileRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).serveFile(requestParameters.assetId, requestParameters.isThumb, requestParameters.isWeb, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * Update an asset - * @param {string} assetId - * @param {UpdateAssetDto} updateAssetDto + * @param {AssetApiUpdateAssetRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public updateAsset(assetId: string, updateAssetDto: UpdateAssetDto, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).updateAsset(assetId, updateAssetDto, options).then((request) => request(this.axios, this.basePath)); + public updateAsset(requestParameters: AssetApiUpdateAssetRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).updateAsset(requestParameters.assetId, requestParameters.updateAssetDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {AssetTypeEnum} assetType - * @param {File} assetData - * @param {string} deviceAssetId - * @param {string} deviceId - * @param {string} fileCreatedAt - * @param {string} fileModifiedAt - * @param {boolean} isFavorite - * @param {string} fileExtension - * @param {string} [key] - * @param {File} [livePhotoData] - * @param {File} [sidecarData] - * @param {boolean} [isArchived] - * @param {boolean} [isVisible] - * @param {string} [duration] + * @param {AssetApiUploadFileRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AssetApi */ - public uploadFile(assetType: AssetTypeEnum, assetData: File, deviceAssetId: string, deviceId: string, fileCreatedAt: string, fileModifiedAt: string, isFavorite: boolean, fileExtension: string, key?: string, livePhotoData?: File, sidecarData?: File, isArchived?: boolean, isVisible?: boolean, duration?: string, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).uploadFile(assetType, assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, isFavorite, fileExtension, key, livePhotoData, sidecarData, isArchived, isVisible, duration, options).then((request) => request(this.axios, this.basePath)); + public uploadFile(requestParameters: AssetApiUploadFileRequest, options?: AxiosRequestConfig) { + return AssetApiFp(this.configuration).uploadFile(requestParameters.assetType, requestParameters.assetData, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.fileCreatedAt, requestParameters.fileModifiedAt, requestParameters.isFavorite, requestParameters.fileExtension, requestParameters.key, requestParameters.livePhotoData, requestParameters.sidecarData, requestParameters.isArchived, requestParameters.isVisible, requestParameters.duration, options).then((request) => request(this.axios, this.basePath)); } } @@ -6839,6 +7613,62 @@ 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 + * @interface AuthenticationApiChangePasswordRequest + */ +export interface AuthenticationApiChangePasswordRequest { + /** + * + * @type {ChangePasswordDto} + * @memberof AuthenticationApiChangePassword + */ + readonly changePasswordDto: ChangePasswordDto +} + +/** + * Request parameters for login operation in AuthenticationApi. + * @export + * @interface AuthenticationApiLoginRequest + */ +export interface AuthenticationApiLoginRequest { + /** + * + * @type {LoginCredentialDto} + * @memberof AuthenticationApiLogin + */ + readonly loginCredentialDto: LoginCredentialDto +} + +/** + * Request parameters for logoutAuthDevice operation in AuthenticationApi. + * @export + * @interface AuthenticationApiLogoutAuthDeviceRequest + */ +export interface AuthenticationApiLogoutAuthDeviceRequest { + /** + * + * @type {string} + * @memberof AuthenticationApiLogoutAuthDevice + */ + readonly id: string +} + /** * AuthenticationApi - object-oriented interface * @export @@ -6848,24 +7678,24 @@ export const AuthenticationApiFactory = function (configuration?: Configuration, export class AuthenticationApi extends BaseAPI { /** * - * @param {SignUpDto} signUpDto + * @param {AuthenticationApiAdminSignUpRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AuthenticationApi */ - public adminSignUp(signUpDto: SignUpDto, options?: AxiosRequestConfig) { - return AuthenticationApiFp(this.configuration).adminSignUp(signUpDto, options).then((request) => request(this.axios, this.basePath)); + public adminSignUp(requestParameters: AuthenticationApiAdminSignUpRequest, options?: AxiosRequestConfig) { + return AuthenticationApiFp(this.configuration).adminSignUp(requestParameters.signUpDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {ChangePasswordDto} changePasswordDto + * @param {AuthenticationApiChangePasswordRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AuthenticationApi */ - public changePassword(changePasswordDto: ChangePasswordDto, options?: AxiosRequestConfig) { - return AuthenticationApiFp(this.configuration).changePassword(changePasswordDto, options).then((request) => request(this.axios, this.basePath)); + public changePassword(requestParameters: AuthenticationApiChangePasswordRequest, options?: AxiosRequestConfig) { + return AuthenticationApiFp(this.configuration).changePassword(requestParameters.changePasswordDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -6880,13 +7710,13 @@ export class AuthenticationApi extends BaseAPI { /** * - * @param {LoginCredentialDto} loginCredentialDto + * @param {AuthenticationApiLoginRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AuthenticationApi */ - public login(loginCredentialDto: LoginCredentialDto, options?: AxiosRequestConfig) { - return AuthenticationApiFp(this.configuration).login(loginCredentialDto, options).then((request) => request(this.axios, this.basePath)); + public login(requestParameters: AuthenticationApiLoginRequest, options?: AxiosRequestConfig) { + return AuthenticationApiFp(this.configuration).login(requestParameters.loginCredentialDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -6901,13 +7731,13 @@ export class AuthenticationApi extends BaseAPI { /** * - * @param {string} id + * @param {AuthenticationApiLogoutAuthDeviceRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof AuthenticationApi */ - public logoutAuthDevice(id: string, options?: AxiosRequestConfig) { - return AuthenticationApiFp(this.configuration).logoutAuthDevice(id, options).then((request) => request(this.axios, this.basePath)); + public logoutAuthDevice(requestParameters: AuthenticationApiLogoutAuthDeviceRequest, options?: AxiosRequestConfig) { + return AuthenticationApiFp(this.configuration).logoutAuthDevice(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7085,6 +7915,27 @@ export const JobApiFactory = function (configuration?: Configuration, basePath?: }; }; +/** + * Request parameters for sendJobCommand operation in JobApi. + * @export + * @interface JobApiSendJobCommandRequest + */ +export interface JobApiSendJobCommandRequest { + /** + * + * @type {JobName} + * @memberof JobApiSendJobCommand + */ + readonly jobId: JobName + + /** + * + * @type {JobCommandDto} + * @memberof JobApiSendJobCommand + */ + readonly jobCommandDto: JobCommandDto +} + /** * JobApi - object-oriented interface * @export @@ -7104,14 +7955,13 @@ export class JobApi extends BaseAPI { /** * - * @param {JobName} jobId - * @param {JobCommandDto} jobCommandDto + * @param {JobApiSendJobCommandRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof JobApi */ - public sendJobCommand(jobId: JobName, jobCommandDto: JobCommandDto, options?: AxiosRequestConfig) { - return JobApiFp(this.configuration).sendJobCommand(jobId, jobCommandDto, options).then((request) => request(this.axios, this.basePath)); + public sendJobCommand(requestParameters: JobApiSendJobCommandRequest, options?: AxiosRequestConfig) { + return JobApiFp(this.configuration).sendJobCommand(requestParameters.jobId, requestParameters.jobCommandDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -7417,6 +8267,48 @@ export const OAuthApiFactory = function (configuration?: Configuration, basePath }; }; +/** + * Request parameters for callback operation in OAuthApi. + * @export + * @interface OAuthApiCallbackRequest + */ +export interface OAuthApiCallbackRequest { + /** + * + * @type {OAuthCallbackDto} + * @memberof OAuthApiCallback + */ + readonly oAuthCallbackDto: OAuthCallbackDto +} + +/** + * Request parameters for generateConfig operation in OAuthApi. + * @export + * @interface OAuthApiGenerateConfigRequest + */ +export interface OAuthApiGenerateConfigRequest { + /** + * + * @type {OAuthConfigDto} + * @memberof OAuthApiGenerateConfig + */ + readonly oAuthConfigDto: OAuthConfigDto +} + +/** + * Request parameters for link operation in OAuthApi. + * @export + * @interface OAuthApiLinkRequest + */ +export interface OAuthApiLinkRequest { + /** + * + * @type {OAuthCallbackDto} + * @memberof OAuthApiLink + */ + readonly oAuthCallbackDto: OAuthCallbackDto +} + /** * OAuthApi - object-oriented interface * @export @@ -7426,35 +8318,35 @@ export const OAuthApiFactory = function (configuration?: Configuration, basePath export class OAuthApi extends BaseAPI { /** * - * @param {OAuthCallbackDto} oAuthCallbackDto + * @param {OAuthApiCallbackRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof OAuthApi */ - public callback(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).callback(oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); + public callback(requestParameters: OAuthApiCallbackRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).callback(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {OAuthConfigDto} oAuthConfigDto + * @param {OAuthApiGenerateConfigRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof OAuthApi */ - public generateConfig(oAuthConfigDto: OAuthConfigDto, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).generateConfig(oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); + public generateConfig(requestParameters: OAuthApiGenerateConfigRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).generateConfig(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {OAuthCallbackDto} oAuthCallbackDto + * @param {OAuthApiLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof OAuthApi */ - public link(oAuthCallbackDto: OAuthCallbackDto, options?: AxiosRequestConfig) { - return OAuthApiFp(this.configuration).link(oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); + public link(requestParameters: OAuthApiLinkRequest, options?: AxiosRequestConfig) { + return OAuthApiFp(this.configuration).link(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7694,6 +8586,48 @@ export const PartnerApiFactory = function (configuration?: Configuration, basePa }; }; +/** + * Request parameters for createPartner operation in PartnerApi. + * @export + * @interface PartnerApiCreatePartnerRequest + */ +export interface PartnerApiCreatePartnerRequest { + /** + * + * @type {string} + * @memberof PartnerApiCreatePartner + */ + readonly id: string +} + +/** + * Request parameters for getPartners operation in PartnerApi. + * @export + * @interface PartnerApiGetPartnersRequest + */ +export interface PartnerApiGetPartnersRequest { + /** + * + * @type {'shared-by' | 'shared-with'} + * @memberof PartnerApiGetPartners + */ + readonly direction: 'shared-by' | 'shared-with' +} + +/** + * Request parameters for removePartner operation in PartnerApi. + * @export + * @interface PartnerApiRemovePartnerRequest + */ +export interface PartnerApiRemovePartnerRequest { + /** + * + * @type {string} + * @memberof PartnerApiRemovePartner + */ + readonly id: string +} + /** * PartnerApi - object-oriented interface * @export @@ -7703,35 +8637,35 @@ export const PartnerApiFactory = function (configuration?: Configuration, basePa export class PartnerApi extends BaseAPI { /** * - * @param {string} id + * @param {PartnerApiCreatePartnerRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PartnerApi */ - public createPartner(id: string, options?: AxiosRequestConfig) { - return PartnerApiFp(this.configuration).createPartner(id, options).then((request) => request(this.axios, this.basePath)); + public createPartner(requestParameters: PartnerApiCreatePartnerRequest, options?: AxiosRequestConfig) { + return PartnerApiFp(this.configuration).createPartner(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {'shared-by' | 'shared-with'} direction + * @param {PartnerApiGetPartnersRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PartnerApi */ - public getPartners(direction: 'shared-by' | 'shared-with', options?: AxiosRequestConfig) { - return PartnerApiFp(this.configuration).getPartners(direction, options).then((request) => request(this.axios, this.basePath)); + public getPartners(requestParameters: PartnerApiGetPartnersRequest, options?: AxiosRequestConfig) { + return PartnerApiFp(this.configuration).getPartners(requestParameters.direction, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {PartnerApiRemovePartnerRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PartnerApi */ - public removePartner(id: string, options?: AxiosRequestConfig) { - return PartnerApiFp(this.configuration).removePartner(id, options).then((request) => request(this.axios, this.basePath)); + public removePartner(requestParameters: PartnerApiRemovePartnerRequest, options?: AxiosRequestConfig) { + return PartnerApiFp(this.configuration).removePartner(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } } @@ -8072,6 +9006,69 @@ export const PersonApiFactory = function (configuration?: Configuration, basePat }; }; +/** + * Request parameters for getPerson operation in PersonApi. + * @export + * @interface PersonApiGetPersonRequest + */ +export interface PersonApiGetPersonRequest { + /** + * + * @type {string} + * @memberof PersonApiGetPerson + */ + readonly id: string +} + +/** + * Request parameters for getPersonAssets operation in PersonApi. + * @export + * @interface PersonApiGetPersonAssetsRequest + */ +export interface PersonApiGetPersonAssetsRequest { + /** + * + * @type {string} + * @memberof PersonApiGetPersonAssets + */ + readonly id: string +} + +/** + * Request parameters for getPersonThumbnail operation in PersonApi. + * @export + * @interface PersonApiGetPersonThumbnailRequest + */ +export interface PersonApiGetPersonThumbnailRequest { + /** + * + * @type {string} + * @memberof PersonApiGetPersonThumbnail + */ + readonly id: string +} + +/** + * Request parameters for updatePerson operation in PersonApi. + * @export + * @interface PersonApiUpdatePersonRequest + */ +export interface PersonApiUpdatePersonRequest { + /** + * + * @type {string} + * @memberof PersonApiUpdatePerson + */ + readonly id: string + + /** + * + * @type {PersonUpdateDto} + * @memberof PersonApiUpdatePerson + */ + readonly personUpdateDto: PersonUpdateDto +} + /** * PersonApi - object-oriented interface * @export @@ -8091,47 +9088,46 @@ export class PersonApi extends BaseAPI { /** * - * @param {string} id + * @param {PersonApiGetPersonRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PersonApi */ - public getPerson(id: string, options?: AxiosRequestConfig) { - return PersonApiFp(this.configuration).getPerson(id, options).then((request) => request(this.axios, this.basePath)); + public getPerson(requestParameters: PersonApiGetPersonRequest, options?: AxiosRequestConfig) { + return PersonApiFp(this.configuration).getPerson(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {PersonApiGetPersonAssetsRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PersonApi */ - public getPersonAssets(id: string, options?: AxiosRequestConfig) { - return PersonApiFp(this.configuration).getPersonAssets(id, options).then((request) => request(this.axios, this.basePath)); + public getPersonAssets(requestParameters: PersonApiGetPersonAssetsRequest, options?: AxiosRequestConfig) { + return PersonApiFp(this.configuration).getPersonAssets(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {PersonApiGetPersonThumbnailRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PersonApi */ - public getPersonThumbnail(id: string, options?: AxiosRequestConfig) { - return PersonApiFp(this.configuration).getPersonThumbnail(id, options).then((request) => request(this.axios, this.basePath)); + public getPersonThumbnail(requestParameters: PersonApiGetPersonThumbnailRequest, options?: AxiosRequestConfig) { + return PersonApiFp(this.configuration).getPersonThumbnail(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id - * @param {PersonUpdateDto} personUpdateDto + * @param {PersonApiUpdatePersonRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PersonApi */ - public updatePerson(id: string, personUpdateDto: PersonUpdateDto, options?: AxiosRequestConfig) { - return PersonApiFp(this.configuration).updatePerson(id, personUpdateDto, options).then((request) => request(this.axios, this.basePath)); + public updatePerson(requestParameters: PersonApiUpdatePersonRequest, options?: AxiosRequestConfig) { + return PersonApiFp(this.configuration).updatePerson(requestParameters.id, requestParameters.personUpdateDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -8435,6 +9431,118 @@ export const SearchApiFactory = function (configuration?: Configuration, basePat }; }; +/** + * Request parameters for search operation in SearchApi. + * @export + * @interface SearchApiSearchRequest + */ +export interface SearchApiSearchRequest { + /** + * + * @type {string} + * @memberof SearchApiSearch + */ + readonly q?: string + + /** + * + * @type {string} + * @memberof SearchApiSearch + */ + readonly query?: string + + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly clip?: boolean + + /** + * + * @type {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} + * @memberof SearchApiSearch + */ + readonly type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER' + + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly isFavorite?: boolean + + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly isArchived?: boolean + + /** + * + * @type {string} + * @memberof SearchApiSearch + */ + readonly exifInfoCity?: string + + /** + * + * @type {string} + * @memberof SearchApiSearch + */ + readonly exifInfoState?: string + + /** + * + * @type {string} + * @memberof SearchApiSearch + */ + readonly exifInfoCountry?: string + + /** + * + * @type {string} + * @memberof SearchApiSearch + */ + readonly exifInfoMake?: string + + /** + * + * @type {string} + * @memberof SearchApiSearch + */ + readonly exifInfoModel?: string + + /** + * + * @type {Array} + * @memberof SearchApiSearch + */ + readonly smartInfoObjects?: Array + + /** + * + * @type {Array} + * @memberof SearchApiSearch + */ + readonly smartInfoTags?: Array + + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly recent?: boolean + + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly motion?: boolean +} + /** * SearchApi - object-oriented interface * @export @@ -8464,27 +9572,13 @@ export class SearchApi extends BaseAPI { /** * - * @param {string} [q] - * @param {string} [query] - * @param {boolean} [clip] - * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] - * @param {boolean} [isFavorite] - * @param {boolean} [isArchived] - * @param {string} [exifInfoCity] - * @param {string} [exifInfoState] - * @param {string} [exifInfoCountry] - * @param {string} [exifInfoMake] - * @param {string} [exifInfoModel] - * @param {Array} [smartInfoObjects] - * @param {Array} [smartInfoTags] - * @param {boolean} [recent] - * @param {boolean} [motion] + * @param {SearchApiSearchRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof SearchApi */ - public search(q?: string, query?: string, clip?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', isFavorite?: boolean, isArchived?: boolean, exifInfoCity?: string, exifInfoState?: string, exifInfoCountry?: string, exifInfoMake?: string, exifInfoModel?: string, smartInfoObjects?: Array, smartInfoTags?: Array, recent?: boolean, motion?: boolean, options?: AxiosRequestConfig) { - return SearchApiFp(this.configuration).search(q, query, clip, type, isFavorite, isArchived, exifInfoCity, exifInfoState, exifInfoCountry, exifInfoMake, exifInfoModel, smartInfoObjects, smartInfoTags, recent, motion, options).then((request) => request(this.axios, this.basePath)); + public search(requestParameters: SearchApiSearchRequest = {}, options?: AxiosRequestConfig) { + return SearchApiFp(this.configuration).search(requestParameters.q, requestParameters.query, requestParameters.clip, requestParameters.type, requestParameters.isFavorite, requestParameters.isArchived, requestParameters.exifInfoCity, requestParameters.exifInfoState, requestParameters.exifInfoCountry, requestParameters.exifInfoMake, requestParameters.exifInfoModel, requestParameters.smartInfoObjects, requestParameters.smartInfoTags, requestParameters.recent, requestParameters.motion, options).then((request) => request(this.axios, this.basePath)); } } @@ -9106,6 +10200,69 @@ export const ShareApiFactory = function (configuration?: Configuration, basePath }; }; +/** + * Request parameters for editSharedLink operation in ShareApi. + * @export + * @interface ShareApiEditSharedLinkRequest + */ +export interface ShareApiEditSharedLinkRequest { + /** + * + * @type {string} + * @memberof ShareApiEditSharedLink + */ + readonly id: string + + /** + * + * @type {EditSharedLinkDto} + * @memberof ShareApiEditSharedLink + */ + readonly editSharedLinkDto: EditSharedLinkDto +} + +/** + * Request parameters for getMySharedLink operation in ShareApi. + * @export + * @interface ShareApiGetMySharedLinkRequest + */ +export interface ShareApiGetMySharedLinkRequest { + /** + * + * @type {string} + * @memberof ShareApiGetMySharedLink + */ + readonly key?: string +} + +/** + * Request parameters for getSharedLinkById operation in ShareApi. + * @export + * @interface ShareApiGetSharedLinkByIdRequest + */ +export interface ShareApiGetSharedLinkByIdRequest { + /** + * + * @type {string} + * @memberof ShareApiGetSharedLinkById + */ + readonly id: string +} + +/** + * Request parameters for removeSharedLink operation in ShareApi. + * @export + * @interface ShareApiRemoveSharedLinkRequest + */ +export interface ShareApiRemoveSharedLinkRequest { + /** + * + * @type {string} + * @memberof ShareApiRemoveSharedLink + */ + readonly id: string +} + /** * ShareApi - object-oriented interface * @export @@ -9115,14 +10272,13 @@ export const ShareApiFactory = function (configuration?: Configuration, basePath export class ShareApi extends BaseAPI { /** * - * @param {string} id - * @param {EditSharedLinkDto} editSharedLinkDto + * @param {ShareApiEditSharedLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof ShareApi */ - public editSharedLink(id: string, editSharedLinkDto: EditSharedLinkDto, options?: AxiosRequestConfig) { - return ShareApiFp(this.configuration).editSharedLink(id, editSharedLinkDto, options).then((request) => request(this.axios, this.basePath)); + public editSharedLink(requestParameters: ShareApiEditSharedLinkRequest, options?: AxiosRequestConfig) { + return ShareApiFp(this.configuration).editSharedLink(requestParameters.id, requestParameters.editSharedLinkDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -9137,35 +10293,35 @@ export class ShareApi extends BaseAPI { /** * - * @param {string} [key] + * @param {ShareApiGetMySharedLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof ShareApi */ - public getMySharedLink(key?: string, options?: AxiosRequestConfig) { - return ShareApiFp(this.configuration).getMySharedLink(key, options).then((request) => request(this.axios, this.basePath)); + public getMySharedLink(requestParameters: ShareApiGetMySharedLinkRequest = {}, options?: AxiosRequestConfig) { + return ShareApiFp(this.configuration).getMySharedLink(requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {ShareApiGetSharedLinkByIdRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof ShareApi */ - public getSharedLinkById(id: string, options?: AxiosRequestConfig) { - return ShareApiFp(this.configuration).getSharedLinkById(id, options).then((request) => request(this.axios, this.basePath)); + public getSharedLinkById(requestParameters: ShareApiGetSharedLinkByIdRequest, options?: AxiosRequestConfig) { + return ShareApiFp(this.configuration).getSharedLinkById(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id + * @param {ShareApiRemoveSharedLinkRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof ShareApi */ - public removeSharedLink(id: string, options?: AxiosRequestConfig) { - return ShareApiFp(this.configuration).removeSharedLink(id, options).then((request) => request(this.axios, this.basePath)); + public removeSharedLink(requestParameters: ShareApiRemoveSharedLinkRequest, options?: AxiosRequestConfig) { + return ShareApiFp(this.configuration).removeSharedLink(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } } @@ -9427,6 +10583,20 @@ export const SystemConfigApiFactory = function (configuration?: Configuration, b }; }; +/** + * Request parameters for updateConfig operation in SystemConfigApi. + * @export + * @interface SystemConfigApiUpdateConfigRequest + */ +export interface SystemConfigApiUpdateConfigRequest { + /** + * + * @type {SystemConfigDto} + * @memberof SystemConfigApiUpdateConfig + */ + readonly systemConfigDto: SystemConfigDto +} + /** * SystemConfigApi - object-oriented interface * @export @@ -9466,13 +10636,13 @@ export class SystemConfigApi extends BaseAPI { /** * - * @param {SystemConfigDto} systemConfigDto + * @param {SystemConfigApiUpdateConfigRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof SystemConfigApi */ - public updateConfig(systemConfigDto: SystemConfigDto, options?: AxiosRequestConfig) { - return SystemConfigApiFp(this.configuration).updateConfig(systemConfigDto, options).then((request) => request(this.axios, this.basePath)); + public updateConfig(requestParameters: SystemConfigApiUpdateConfigRequest, options?: AxiosRequestConfig) { + return SystemConfigApiFp(this.configuration).updateConfig(requestParameters.systemConfigDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -9815,6 +10985,69 @@ export const TagApiFactory = function (configuration?: Configuration, basePath?: }; }; +/** + * Request parameters for _delete operation in TagApi. + * @export + * @interface TagApiDeleteRequest + */ +export interface TagApiDeleteRequest { + /** + * + * @type {string} + * @memberof TagApiDelete + */ + readonly id: string +} + +/** + * Request parameters for create operation in TagApi. + * @export + * @interface TagApiCreateRequest + */ +export interface TagApiCreateRequest { + /** + * + * @type {CreateTagDto} + * @memberof TagApiCreate + */ + readonly createTagDto: CreateTagDto +} + +/** + * Request parameters for findOne operation in TagApi. + * @export + * @interface TagApiFindOneRequest + */ +export interface TagApiFindOneRequest { + /** + * + * @type {string} + * @memberof TagApiFindOne + */ + readonly id: string +} + +/** + * Request parameters for update operation in TagApi. + * @export + * @interface TagApiUpdateRequest + */ +export interface TagApiUpdateRequest { + /** + * + * @type {string} + * @memberof TagApiUpdate + */ + readonly id: string + + /** + * + * @type {UpdateTagDto} + * @memberof TagApiUpdate + */ + readonly updateTagDto: UpdateTagDto +} + /** * TagApi - object-oriented interface * @export @@ -9824,24 +11057,24 @@ export const TagApiFactory = function (configuration?: Configuration, basePath?: export class TagApi extends BaseAPI { /** * - * @param {string} id + * @param {TagApiDeleteRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof TagApi */ - public _delete(id: string, options?: AxiosRequestConfig) { - return TagApiFp(this.configuration)._delete(id, options).then((request) => request(this.axios, this.basePath)); + public _delete(requestParameters: TagApiDeleteRequest, options?: AxiosRequestConfig) { + return TagApiFp(this.configuration)._delete(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {CreateTagDto} createTagDto + * @param {TagApiCreateRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof TagApi */ - public create(createTagDto: CreateTagDto, options?: AxiosRequestConfig) { - return TagApiFp(this.configuration).create(createTagDto, options).then((request) => request(this.axios, this.basePath)); + public create(requestParameters: TagApiCreateRequest, options?: AxiosRequestConfig) { + return TagApiFp(this.configuration).create(requestParameters.createTagDto, options).then((request) => request(this.axios, this.basePath)); } /** @@ -9856,25 +11089,24 @@ export class TagApi extends BaseAPI { /** * - * @param {string} id + * @param {TagApiFindOneRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof TagApi */ - public findOne(id: string, options?: AxiosRequestConfig) { - return TagApiFp(this.configuration).findOne(id, options).then((request) => request(this.axios, this.basePath)); + public findOne(requestParameters: TagApiFindOneRequest, options?: AxiosRequestConfig) { + return TagApiFp(this.configuration).findOne(requestParameters.id, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} id - * @param {UpdateTagDto} updateTagDto + * @param {TagApiUpdateRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof TagApi */ - public update(id: string, updateTagDto: UpdateTagDto, options?: AxiosRequestConfig) { - return TagApiFp(this.configuration).update(id, updateTagDto, options).then((request) => request(this.axios, this.basePath)); + public update(requestParameters: TagApiUpdateRequest, options?: AxiosRequestConfig) { + return TagApiFp(this.configuration).update(requestParameters.id, requestParameters.updateTagDto, options).then((request) => request(this.axios, this.basePath)); } } @@ -10518,6 +11750,132 @@ export const UserApiFactory = function (configuration?: Configuration, basePath? }; }; +/** + * Request parameters for createProfileImage operation in UserApi. + * @export + * @interface UserApiCreateProfileImageRequest + */ +export interface UserApiCreateProfileImageRequest { + /** + * + * @type {File} + * @memberof UserApiCreateProfileImage + */ + readonly file: File +} + +/** + * Request parameters for createUser operation in UserApi. + * @export + * @interface UserApiCreateUserRequest + */ +export interface UserApiCreateUserRequest { + /** + * + * @type {CreateUserDto} + * @memberof UserApiCreateUser + */ + readonly createUserDto: CreateUserDto +} + +/** + * Request parameters for deleteUser operation in UserApi. + * @export + * @interface UserApiDeleteUserRequest + */ +export interface UserApiDeleteUserRequest { + /** + * + * @type {string} + * @memberof UserApiDeleteUser + */ + readonly userId: string +} + +/** + * Request parameters for getAllUsers operation in UserApi. + * @export + * @interface UserApiGetAllUsersRequest + */ +export interface UserApiGetAllUsersRequest { + /** + * + * @type {boolean} + * @memberof UserApiGetAllUsers + */ + readonly isAll: boolean +} + +/** + * Request parameters for getProfileImage operation in UserApi. + * @export + * @interface UserApiGetProfileImageRequest + */ +export interface UserApiGetProfileImageRequest { + /** + * + * @type {string} + * @memberof UserApiGetProfileImage + */ + readonly userId: string +} + +/** + * Request parameters for getUserById operation in UserApi. + * @export + * @interface UserApiGetUserByIdRequest + */ +export interface UserApiGetUserByIdRequest { + /** + * + * @type {string} + * @memberof UserApiGetUserById + */ + readonly userId: string +} + +/** + * Request parameters for getUserCount operation in UserApi. + * @export + * @interface UserApiGetUserCountRequest + */ +export interface UserApiGetUserCountRequest { + /** + * + * @type {boolean} + * @memberof UserApiGetUserCount + */ + readonly admin?: boolean +} + +/** + * Request parameters for restoreUser operation in UserApi. + * @export + * @interface UserApiRestoreUserRequest + */ +export interface UserApiRestoreUserRequest { + /** + * + * @type {string} + * @memberof UserApiRestoreUser + */ + readonly userId: string +} + +/** + * Request parameters for updateUser operation in UserApi. + * @export + * @interface UserApiUpdateUserRequest + */ +export interface UserApiUpdateUserRequest { + /** + * + * @type {UpdateUserDto} + * @memberof UserApiUpdateUser + */ + readonly updateUserDto: UpdateUserDto +} + /** * UserApi - object-oriented interface * @export @@ -10527,46 +11885,46 @@ export const UserApiFactory = function (configuration?: Configuration, basePath? export class UserApi extends BaseAPI { /** * - * @param {File} file + * @param {UserApiCreateProfileImageRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public createProfileImage(file: File, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).createProfileImage(file, options).then((request) => request(this.axios, this.basePath)); + public createProfileImage(requestParameters: UserApiCreateProfileImageRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).createProfileImage(requestParameters.file, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {CreateUserDto} createUserDto + * @param {UserApiCreateUserRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public createUser(createUserDto: CreateUserDto, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).createUser(createUserDto, options).then((request) => request(this.axios, this.basePath)); + public createUser(requestParameters: UserApiCreateUserRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).createUser(requestParameters.createUserDto, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} userId + * @param {UserApiDeleteUserRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public deleteUser(userId: string, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).deleteUser(userId, options).then((request) => request(this.axios, this.basePath)); + public deleteUser(requestParameters: UserApiDeleteUserRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).deleteUser(requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {boolean} isAll + * @param {UserApiGetAllUsersRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public getAllUsers(isAll: boolean, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).getAllUsers(isAll, options).then((request) => request(this.axios, this.basePath)); + public getAllUsers(requestParameters: UserApiGetAllUsersRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).getAllUsers(requestParameters.isAll, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10581,57 +11939,57 @@ export class UserApi extends BaseAPI { /** * - * @param {string} userId + * @param {UserApiGetProfileImageRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public getProfileImage(userId: string, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).getProfileImage(userId, options).then((request) => request(this.axios, this.basePath)); + public getProfileImage(requestParameters: UserApiGetProfileImageRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).getProfileImage(requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} userId + * @param {UserApiGetUserByIdRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public getUserById(userId: string, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).getUserById(userId, options).then((request) => request(this.axios, this.basePath)); + public getUserById(requestParameters: UserApiGetUserByIdRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).getUserById(requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {boolean} [admin] + * @param {UserApiGetUserCountRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public getUserCount(admin?: boolean, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).getUserCount(admin, options).then((request) => request(this.axios, this.basePath)); + public getUserCount(requestParameters: UserApiGetUserCountRequest = {}, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).getUserCount(requestParameters.admin, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {string} userId + * @param {UserApiRestoreUserRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public restoreUser(userId: string, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).restoreUser(userId, options).then((request) => request(this.axios, this.basePath)); + public restoreUser(requestParameters: UserApiRestoreUserRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).restoreUser(requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @param {UpdateUserDto} updateUserDto + * @param {UserApiUpdateUserRequest} requestParameters Request parameters. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof UserApi */ - public updateUser(updateUserDto: UpdateUserDto, options?: AxiosRequestConfig) { - return UserApiFp(this.configuration).updateUser(updateUserDto, options).then((request) => request(this.axios, this.basePath)); + public updateUser(requestParameters: UserApiUpdateUserRequest, options?: AxiosRequestConfig) { + return UserApiFp(this.configuration).updateUser(requestParameters.updateUserDto, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/web/src/api/utils.ts b/web/src/api/utils.ts index 42e04f07e0..c7fa62bfad 100644 --- a/web/src/api/utils.ts +++ b/web/src/api/utils.ts @@ -21,13 +21,13 @@ export const oauth = { getConfig: (location: Location) => { const redirectUri = location.href.split('?')[0]; console.log(`OAuth Redirect URI: ${redirectUri}`); - return api.oauthApi.generateConfig({ redirectUri }); + return api.oauthApi.generateConfig({ oAuthConfigDto: { redirectUri } }); }, login: (location: Location) => { - return api.oauthApi.callback({ url: location.href }); + return api.oauthApi.callback({ oAuthCallbackDto: { url: location.href } }); }, link: (location: Location): AxiosPromise => { - return api.oauthApi.link({ url: location.href }); + return api.oauthApi.link({ oAuthCallbackDto: { url: location.href } }); }, unlink: () => { return api.oauthApi.unlink(); diff --git a/web/src/lib/components/admin-page/delete-confirm-dialoge.svelte b/web/src/lib/components/admin-page/delete-confirm-dialoge.svelte index 2561f0d1d9..5b1298c262 100644 --- a/web/src/lib/components/admin-page/delete-confirm-dialoge.svelte +++ b/web/src/lib/components/admin-page/delete-confirm-dialoge.svelte @@ -10,7 +10,7 @@ const deleteUser = async () => { try { - const deletedUser = await api.userApi.deleteUser(user.id); + const deletedUser = await api.userApi.deleteUser({ userId: user.id }); if (deletedUser.data.deletedAt != null) { dispatch('user-delete-success'); } else { diff --git a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte b/web/src/lib/components/admin-page/jobs/jobs-panel.svelte index abf78ac8bc..041266cbef 100644 --- a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte +++ b/web/src/lib/components/admin-page/jobs/jobs-panel.svelte @@ -102,7 +102,7 @@ const title = jobDetails[jobId]?.title; try { - const { data } = await api.jobApi.sendJobCommand(jobId, jobCommand); + const { data } = await api.jobApi.sendJobCommand({ jobId, jobCommandDto: jobCommand }); jobs[jobId] = data; switch (jobCommand.command) { diff --git a/web/src/lib/components/admin-page/restore-dialoge.svelte b/web/src/lib/components/admin-page/restore-dialoge.svelte index b32a591c59..6573e04f6a 100644 --- a/web/src/lib/components/admin-page/restore-dialoge.svelte +++ b/web/src/lib/components/admin-page/restore-dialoge.svelte @@ -8,7 +8,7 @@ const dispatch = createEventDispatcher(); const restoreUser = async () => { - const restoredUser = await api.userApi.restoreUser(user.id); + const restoredUser = await api.userApi.restoreUser({ userId: user.id }); if (restoredUser.data.deletedAt == null) dispatch('user-restore-success'); else dispatch('user-restore-fail'); }; 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 e2ce856f5d..d91df0325f 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 @@ -28,8 +28,10 @@ const { data: configs } = await api.systemConfigApi.getConfig(); const result = await api.systemConfigApi.updateConfig({ - ...configs, - ffmpeg: ffmpegConfig + systemConfigDto: { + ...configs, + ffmpeg: ffmpegConfig + } }); ffmpegConfig = { ...result.data.ffmpeg }; 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 17599f2ff6..644135894e 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 @@ -73,8 +73,10 @@ } const { data: updated } = await api.systemConfigApi.updateConfig({ - ...current, - oauth: oauthConfig + systemConfigDto: { + ...current, + oauth: oauthConfig + } }); oauthConfig = { ...updated.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 9650f4ebab..fb8f0ef7c9 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 @@ -48,8 +48,10 @@ } const { data: updated } = await api.systemConfigApi.updateConfig({ - ...current, - passwordLogin: passwordLoginConfig + systemConfigDto: { + ...current, + passwordLogin: passwordLoginConfig + } }); passwordLoginConfig = { ...updated.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 7b778a5078..eae24ffe80 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 @@ -97,8 +97,10 @@ const { data: currentConfig } = await api.systemConfigApi.getConfig(); const result = await api.systemConfigApi.updateConfig({ - ...currentConfig, - storageTemplate: storageConfig + systemConfigDto: { + ...currentConfig, + storageTemplate: storageConfig + } }); storageConfig.template = result.data.storageTemplate.template; diff --git a/web/src/lib/components/album-page/__tests__/album-card.spec.ts b/web/src/lib/components/album-page/__tests__/album-card.spec.ts index 92de385415..f4b6227e90 100644 --- a/web/src/lib/components/album-page/__tests__/album-card.spec.ts +++ b/web/src/lib/components/album-page/__tests__/album-card.spec.ts @@ -86,9 +86,10 @@ describe('AlbumCard component', () => { expect(albumImgElement).toHaveAttribute('alt', album.id); expect(apiMock.assetApi.getAssetThumbnail).toHaveBeenCalledTimes(1); expect(apiMock.assetApi.getAssetThumbnail).toHaveBeenCalledWith( - 'thumbnailIdOne', - ThumbnailFormat.Jpeg, - undefined, + { + assetId: 'thumbnailIdOne', + format: ThumbnailFormat.Jpeg + }, { responseType: 'blob' } ); expect(createObjectURLMock).toHaveBeenCalledWith(thumbnailBlob); diff --git a/web/src/lib/components/album-page/album-card.svelte b/web/src/lib/components/album-page/album-card.svelte index 7eedfdb273..fc7bc34902 100644 --- a/web/src/lib/components/album-page/album-card.svelte +++ b/web/src/lib/components/album-page/album-card.svelte @@ -36,9 +36,10 @@ } const { data } = await api.assetApi.getAssetThumbnail( - thubmnailId, - ThumbnailFormat.Jpeg, - undefined, + { + assetId: thubmnailId, + format: ThumbnailFormat.Jpeg + }, { responseType: 'blob' } @@ -61,7 +62,7 @@ }); const getAlbumOwnerInfo = async (): Promise => { - const { data } = await api.userApi.getUserById(album.ownerId); + const { data } = await api.userApi.getUserById({ userId: album.ownerId }); return data; }; diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 2d5b7ddb06..127e481fcb 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -124,8 +124,11 @@ $: { if (!isEditingTitle && currentAlbumName != album.albumName && isOwned) { api.albumApi - .updateAlbumInfo(album.id, { - albumName: album.albumName + .updateAlbumInfo({ + id: album.id, + updateAlbumDto: { + albumName: album.albumName + } }) .then(() => { currentAlbumName = album.albumName; @@ -143,13 +146,13 @@ const createAlbumHandler = async (event: CustomEvent) => { const { assets }: { assets: AssetResponseDto[] } = event.detail; try { - const { data } = await api.albumApi.addAssetsToAlbum( - album.id, - { + const { data } = await api.albumApi.addAssetsToAlbum({ + id: album.id, + addAssetsDto: { assetIds: assets.map((a) => a.id) }, - sharedLink?.key - ); + key: sharedLink?.key + }); if (data.album) { album = data.album; @@ -168,8 +171,11 @@ const { selectedUsers }: { selectedUsers: UserResponseDto[] } = event.detail; try { - const { data } = await api.albumApi.addUsersToAlbum(album.id, { - sharedUserIds: Array.from(selectedUsers).map((u) => u.id) + const { data } = await api.albumApi.addUsersToAlbum({ + id: album.id, + addUsersDto: { + sharedUserIds: Array.from(selectedUsers).map((u) => u.id) + } }); album = data; @@ -193,7 +199,7 @@ } try { - const { data } = await api.albumApi.getAlbumInfo(album.id); + const { data } = await api.albumApi.getAlbumInfo({ id: album.id }); album = data; isShowShareInfoModal = false; @@ -213,7 +219,7 @@ ) ) { try { - await api.albumApi.deleteAlbum(album.id); + await api.albumApi.deleteAlbum({ id: album.id }); goto(backUrl); } catch (e) { console.error('Error [userDeleteMenu] ', e); @@ -241,10 +247,7 @@ let total = 0; const { data, status, headers } = await api.albumApi.downloadArchive( - album.id, - undefined, - skip || undefined, - sharedLink?.key, + { id: album.id, skip: skip || undefined, key: sharedLink?.key }, { responseType: 'blob', onDownloadProgress: function (progressEvent) { @@ -311,8 +314,11 @@ const setAlbumThumbnailHandler = (event: CustomEvent) => { const { asset }: { asset: AssetResponseDto } = event.detail; try { - api.albumApi.updateAlbumInfo(album.id, { - albumThumbnailAssetId: asset.id + api.albumApi.updateAlbumInfo({ + id: album.id, + updateAlbumDto: { + albumThumbnailAssetId: asset.id + } }); } catch (e) { console.error('Error [setAlbumThumbnailHandler] ', e); diff --git a/web/src/lib/components/album-page/share-info-modal.svelte b/web/src/lib/components/album-page/share-info-modal.svelte index dad382776d..095364d307 100644 --- a/web/src/lib/components/album-page/share-info-modal.svelte +++ b/web/src/lib/components/album-page/share-info-modal.svelte @@ -53,7 +53,7 @@ const removeUser = async (userId: string) => { if (window.confirm('Do you want to remove selected user from the album?')) { try { - await api.albumApi.removeUserFromAlbum(album.id, userId); + await api.albumApi.removeUserFromAlbum({ id: album.id, userId }); dispatch('user-deleted', { userId }); } catch (e) { console.error('Error [share-info-modal] [removeUser]', e); diff --git a/web/src/lib/components/album-page/user-selection-modal.svelte b/web/src/lib/components/album-page/user-selection-modal.svelte index 5dc10300da..4f7c3630de 100644 --- a/web/src/lib/components/album-page/user-selection-modal.svelte +++ b/web/src/lib/components/album-page/user-selection-modal.svelte @@ -19,7 +19,7 @@ let sharedLinks: SharedLinkResponseDto[] = []; onMount(async () => { await getSharedLinks(); - const { data } = await api.userApi.getAllUsers(false); + const { data } = await api.userApi.getAllUsers({ isAll: false }); // remove invalid users users = data.filter((user) => !(user.deletedAt || user.id === album.ownerId)); diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte index 4f61239f63..8b91b7429a 100644 --- a/web/src/lib/components/asset-viewer/asset-viewer.svelte +++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte @@ -65,7 +65,7 @@ const getAllAlbums = async () => { try { - const { data } = await api.albumApi.getAllAlbums(undefined, asset.id); + const { data } = await api.albumApi.getAllAlbums({ assetId: asset.id }); appearsInAlbums = data; } catch (e) { console.error('Error getting album that asset belong to', e); @@ -151,16 +151,19 @@ $downloadAssets[imageFileName] = 0; - const { data, status } = await api.assetApi.downloadFile(assetId, key, { - responseType: 'blob', - onDownloadProgress: (progressEvent) => { - if (progressEvent.lengthComputable) { - const total = progressEvent.total; - const current = progressEvent.loaded; - $downloadAssets[imageFileName] = Math.floor((current / total) * 100); + const { data, status } = await api.assetApi.downloadFile( + { assetId, key }, + { + responseType: 'blob', + onDownloadProgress: (progressEvent) => { + if (progressEvent.lengthComputable) { + const total = progressEvent.total; + const current = progressEvent.loaded; + $downloadAssets[imageFileName] = Math.floor((current / total) * 100); + } } } - }); + ); if (!(data instanceof Blob)) { return; @@ -203,7 +206,9 @@ ) ) { const { data: deletedAssets } = await api.assetApi.deleteAsset({ - ids: [asset.id] + deleteAssetDto: { + ids: [asset.id] + } }); navigateAssetForward(); @@ -224,8 +229,11 @@ }; const toggleFavorite = async () => { - const { data } = await api.assetApi.updateAsset(asset.id, { - isFavorite: !asset.isFavorite + const { data } = await api.assetApi.updateAsset({ + assetId: asset.id, + updateAssetDto: { + isFavorite: !asset.isFavorite + } }); asset.isFavorite = data.isFavorite; @@ -241,10 +249,12 @@ isShowAlbumPicker = false; const { albumName }: { albumName: string } = event.detail; - api.albumApi.createAlbum({ albumName, assetIds: [asset.id] }).then((response) => { - const album = response.data; - goto('/albums/' + album.id); - }); + api.albumApi + .createAlbum({ createAlbumDto: { albumName, assetIds: [asset.id] } }) + .then((response) => { + const album = response.data; + goto('/albums/' + album.id); + }); }; const handleAddToAlbum = async (event: CustomEvent<{ album: AlbumResponseDto }>) => { @@ -272,8 +282,11 @@ const toggleArchive = async () => { try { - const { data } = await api.assetApi.updateAsset(asset.id, { - isArchived: !asset.isArchived + const { data } = await api.assetApi.updateAsset({ + assetId: asset.id, + updateAssetDto: { + isArchived: !asset.isArchived + } }); asset.isArchived = data.isArchived; diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte index a44899e8eb..c776bae81b 100644 --- a/web/src/lib/components/asset-viewer/detail-panel.svelte +++ b/web/src/lib/components/asset-viewer/detail-panel.svelte @@ -21,7 +21,7 @@ $: { // Get latest description from server if (asset.id) { - api.assetApi.getAssetById(asset.id).then((res) => { + api.assetApi.getAssetById({ assetId: asset.id }).then((res) => { people = res.data?.people || []; textarea.value = res.data?.exifInfo?.description || ''; }); @@ -64,8 +64,11 @@ const handleFocusOut = async () => { dispatch('description-focus-out'); try { - await api.assetApi.updateAsset(asset.id, { - description: description + await api.assetApi.updateAsset({ + assetId: asset.id, + updateAssetDto: { + description: description + } }); } catch (error) { console.error(error); diff --git a/web/src/lib/components/asset-viewer/photo-viewer.svelte b/web/src/lib/components/asset-viewer/photo-viewer.svelte index 875a3ba221..c510a1221e 100644 --- a/web/src/lib/components/asset-viewer/photo-viewer.svelte +++ b/web/src/lib/components/asset-viewer/photo-viewer.svelte @@ -26,9 +26,12 @@ const loadAssetData = async () => { try { - const { data } = await api.assetApi.serveFile(asset.id, false, true, publicSharedKey, { - responseType: 'blob' - }); + const { data } = await api.assetApi.serveFile( + { assetId: asset.id, isThumb: false, isWeb: true, key: publicSharedKey }, + { + responseType: 'blob' + } + ); if (!(data instanceof Blob)) { return; diff --git a/web/src/lib/components/forms/admin-registration-form.svelte b/web/src/lib/components/forms/admin-registration-form.svelte index 0f64c2a1a2..49253d8ab1 100644 --- a/web/src/lib/components/forms/admin-registration-form.svelte +++ b/web/src/lib/components/forms/admin-registration-form.svelte @@ -31,10 +31,12 @@ const lastName = form.get('lastName'); const { status } = await api.authenticationApi.adminSignUp({ - email: String(email), - password: String(password), - firstName: String(firstName), - lastName: String(lastName) + signUpDto: { + email: String(email), + password: String(password), + firstName: String(firstName), + lastName: String(lastName) + } }); if (status === 201) { diff --git a/web/src/lib/components/forms/change-password-form.svelte b/web/src/lib/components/forms/change-password-form.svelte index d28f7be4f3..ba2e374287 100644 --- a/web/src/lib/components/forms/change-password-form.svelte +++ b/web/src/lib/components/forms/change-password-form.svelte @@ -29,9 +29,11 @@ error = ''; const { status } = await api.userApi.updateUser({ - id: user.id, - password: String(password), - shouldChangePassword: false + updateUserDto: { + id: user.id, + password: String(password), + shouldChangePassword: false + } }); if (status === 200) { diff --git a/web/src/lib/components/forms/create-user-form.svelte b/web/src/lib/components/forms/create-user-form.svelte index 44262a723d..bb2d198828 100644 --- a/web/src/lib/components/forms/create-user-form.svelte +++ b/web/src/lib/components/forms/create-user-form.svelte @@ -46,10 +46,12 @@ try { const { status } = await api.userApi.createUser({ - email: String(email), - password: String(password), - firstName: String(firstName), - lastName: String(lastName) + createUserDto: { + email: String(email), + password: String(password), + firstName: String(firstName), + lastName: String(lastName) + } }); if (status === 201) { diff --git a/web/src/lib/components/forms/edit-user-form.svelte b/web/src/lib/components/forms/edit-user-form.svelte index 0b509bdc7f..7ec5f05700 100644 --- a/web/src/lib/components/forms/edit-user-form.svelte +++ b/web/src/lib/components/forms/edit-user-form.svelte @@ -21,11 +21,13 @@ try { const { id, email, firstName, lastName, storageLabel } = user; const { status } = await api.userApi.updateUser({ - id, - email, - firstName, - lastName, - storageLabel: storageLabel || '' + updateUserDto: { + id, + email, + firstName, + lastName, + storageLabel: storageLabel || '' + } }); if (status === 200) { @@ -42,9 +44,11 @@ const defaultPassword = 'password'; const { status } = await api.userApi.updateUser({ - id: user.id, - password: defaultPassword, - shouldChangePassword: true + updateUserDto: { + id: user.id, + password: defaultPassword, + shouldChangePassword: true + } }); if (status == 200) { diff --git a/web/src/lib/components/forms/login-form.svelte b/web/src/lib/components/forms/login-form.svelte index 0fecd86876..c43be1c0d0 100644 --- a/web/src/lib/components/forms/login-form.svelte +++ b/web/src/lib/components/forms/login-form.svelte @@ -57,8 +57,10 @@ loading = true; const { data } = await api.authenticationApi.login({ - email, - password + loginCredentialDto: { + email, + password + } }); if (!data.isAdmin && data.shouldChangePassword) { diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/photos-page/actions/add-to-album.svelte index 3dbd988bbe..628d98f418 100644 --- a/web/src/lib/components/photos-page/actions/add-to-album.svelte +++ b/web/src/lib/components/photos-page/actions/add-to-album.svelte @@ -27,7 +27,7 @@ const { albumName }: { albumName: string } = event.detail; const assetIds = Array.from(getAssets()).map((asset) => asset.id); - api.albumApi.createAlbum({ albumName, assetIds }).then((response) => { + api.albumApi.createAlbum({ createAlbumDto: { albumName, assetIds } }).then((response) => { const { id, albumName } = response.data; notificationController.show({ diff --git a/web/src/lib/components/photos-page/actions/archive-action.svelte b/web/src/lib/components/photos-page/actions/archive-action.svelte index e959f4c6b8..7c5e5f5982 100644 --- a/web/src/lib/components/photos-page/actions/archive-action.svelte +++ b/web/src/lib/components/photos-page/actions/archive-action.svelte @@ -28,7 +28,7 @@ for (const asset of getAssets()) { if (asset.isArchived !== isArchived) { - api.assetApi.updateAsset(asset.id, { isArchived }); + api.assetApi.updateAsset({ assetId: asset.id, updateAssetDto: { isArchived } }); onAssetArchive(asset, isArchived); cnt = cnt + 1; diff --git a/web/src/lib/components/photos-page/actions/delete-assets.svelte b/web/src/lib/components/photos-page/actions/delete-assets.svelte index f11c7c5c0e..ce030b5444 100644 --- a/web/src/lib/components/photos-page/actions/delete-assets.svelte +++ b/web/src/lib/components/photos-page/actions/delete-assets.svelte @@ -20,7 +20,9 @@ let count = 0; const { data: deletedAssets } = await api.assetApi.deleteAsset({ - ids: Array.from(getAssets()).map((a) => a.id) + deleteAssetDto: { + ids: Array.from(getAssets()).map((a) => a.id) + } }); for (const asset of deletedAssets) { diff --git a/web/src/lib/components/photos-page/actions/favorite-action.svelte b/web/src/lib/components/photos-page/actions/favorite-action.svelte index 0b268322e7..e7e768ebe4 100644 --- a/web/src/lib/components/photos-page/actions/favorite-action.svelte +++ b/web/src/lib/components/photos-page/actions/favorite-action.svelte @@ -28,7 +28,7 @@ let cnt = 0; for (const asset of getAssets()) { if (asset.isFavorite !== isFavorite) { - api.assetApi.updateAsset(asset.id, { isFavorite }); + api.assetApi.updateAsset({ assetId: asset.id, updateAssetDto: { isFavorite } }); onAssetFavorite(asset, isFavorite); cnt = cnt + 1; } diff --git a/web/src/lib/components/photos-page/actions/remove-from-album.svelte b/web/src/lib/components/photos-page/actions/remove-from-album.svelte index 1db8e16c6f..ffcd3d4343 100644 --- a/web/src/lib/components/photos-page/actions/remove-from-album.svelte +++ b/web/src/lib/components/photos-page/actions/remove-from-album.svelte @@ -15,8 +15,11 @@ const handleRemoveFromAlbum = async () => { if (window.confirm('Do you want to remove selected assets from the album?')) { try { - const { data } = await api.albumApi.removeAssetFromAlbum(album.id, { - assetIds: Array.from(getAssets()).map((a) => a.id) + const { data } = await api.albumApi.removeAssetFromAlbum({ + id: album.id, + removeAssetsDto: { + assetIds: Array.from(getAssets()).map((a) => a.id) + } }); album = data; diff --git a/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte b/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte index 86a70720e9..b2088e1437 100644 --- a/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte +++ b/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte @@ -14,12 +14,12 @@ // TODO: Rename API method or change functionality. The assetIds passed // in are kept instead of removed. const assetsToKeep = allAssets.filter((a) => !getAssets().has(a)); - await api.assetApi.removeAssetsFromSharedLink( - { + await api.assetApi.removeAssetsFromSharedLink({ + removeAssetsDto: { assetIds: assetsToKeep.map((a) => a.id) }, - sharedLink?.key - ); + key: sharedLink?.key + }); sharedLink.assets = assetsToKeep; clearSelect(); diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte index 9248606670..dc2eac76cb 100644 --- a/web/src/lib/components/photos-page/asset-grid.svelte +++ b/web/src/lib/components/photos-page/asset-grid.svelte @@ -28,8 +28,10 @@ onMount(async () => { const { data: assetCountByTimebucket } = await api.assetApi.getAssetCountByTimeBucket({ - timeGroup: TimeGroupEnum.Month, - userId: user?.id + getAssetCountByTimeBucketDto: { + timeGroup: TimeGroupEnum.Month, + userId: user?.id + } }); bucketInfo = assetCountByTimebucket; diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte index 347b7abbfc..5ba129705e 100644 --- a/web/src/lib/components/share-page/individual-shared-viewer.svelte +++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte @@ -40,12 +40,12 @@ const assetIds = results.filter((id) => !!id) as string[]; - await api.assetApi.addAssetsToSharedLink( - { + await api.assetApi.addAssetsToSharedLink({ + addAssetsDto: { assetIds }, - sharedLink?.key - ); + key: sharedLink?.key + }); notificationController.show({ message: `Successfully add ${assetIds.length} to the shared link`, diff --git a/web/src/lib/components/shared-components/album-selection-modal.svelte b/web/src/lib/components/shared-components/album-selection-modal.svelte index b810ec1129..f63c22bb11 100644 --- a/web/src/lib/components/shared-components/album-selection-modal.svelte +++ b/web/src/lib/components/shared-components/album-selection-modal.svelte @@ -16,7 +16,7 @@ export let shared: boolean; onMount(async () => { - const { data } = await api.albumApi.getAllAlbums(shared || undefined); + const { data } = await api.albumApi.getAllAlbums({ shared: shared || undefined }); albums = data; recentAlbums = albums diff --git a/web/src/lib/components/shared-components/circle-avatar.svelte b/web/src/lib/components/shared-components/circle-avatar.svelte index 23876aba00..d71aa12fff 100644 --- a/web/src/lib/components/shared-components/circle-avatar.svelte +++ b/web/src/lib/components/shared-components/circle-avatar.svelte @@ -10,9 +10,12 @@ const dispatch = createEventDispatcher(); const getUserAvatar = async () => { - const { data } = await api.userApi.getProfileImage(user.id, { - responseType: 'blob' - }); + const { data } = await api.userApi.getProfileImage( + { userId: user.id }, + { + responseType: 'blob' + } + ); if (data instanceof Blob) { return URL.createObjectURL(data); diff --git a/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte b/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte index b39580e835..b2522f3e79 100644 --- a/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte +++ b/web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte @@ -60,22 +60,26 @@ try { if (shareType === SharedLinkType.Album && album) { const { data } = await api.albumApi.createAlbumSharedLink({ - albumId: album.id, - expiresAt: expirationDate, - allowUpload: isAllowUpload, - description: description, - allowDownload: isAllowDownload, - showExif: shouldShowExif + createAlbumShareLinkDto: { + albumId: album.id, + expiresAt: expirationDate, + allowUpload: isAllowUpload, + description: description, + allowDownload: isAllowDownload, + showExif: shouldShowExif + } }); buildSharedLink(data); } else { const { data } = await api.assetApi.createAssetsSharedLink({ - assetIds: sharedAssets.map((a) => a.id), - expiresAt: expirationDate, - allowUpload: isAllowUpload, - description: description, - allowDownload: isAllowDownload, - showExif: shouldShowExif + createAssetsShareLinkDto: { + assetIds: sharedAssets.map((a) => a.id), + expiresAt: expirationDate, + allowUpload: isAllowUpload, + description: description, + allowDownload: isAllowDownload, + showExif: shouldShowExif + } }); buildSharedLink(data); } @@ -133,12 +137,15 @@ ? new Date(currentTime + expirationTime).toISOString() : null; - await api.shareApi.editSharedLink(editingLink.id, { - description, - expiresAt: shouldChangeExpirationTime ? expirationDate : undefined, - allowUpload: isAllowUpload, - allowDownload: isAllowDownload, - showExif: shouldShowExif + await api.shareApi.editSharedLink({ + id: editingLink.id, + editSharedLinkDto: { + description, + expiresAt: shouldChangeExpirationTime ? expirationDate : undefined, + allowUpload: isAllowUpload, + allowDownload: isAllowDownload, + showExif: shouldShowExif + } }); notificationController.show({ 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 50ce62990e..92e8e47191 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 @@ -30,7 +30,7 @@ const getFavoriteCount = async () => { try { - const { data: assets } = await api.assetApi.getAllAssets(undefined, true, undefined); + const { data: assets } = await api.assetApi.getAllAssets({ isFavorite: true }); return { favorites: assets.length diff --git a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte b/web/src/lib/components/sharedlinks-page/shared-link-card.svelte index 46217eead5..6c1f7a7dca 100644 --- a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte +++ b/web/src/lib/components/sharedlinks-page/shared-link-card.svelte @@ -30,7 +30,7 @@ assetId = link.assets[0].id; } - const { data } = await api.assetApi.getAssetById(assetId); + const { data } = await api.assetApi.getAssetById({ assetId }); return data; }; diff --git a/web/src/lib/components/user-settings-page/change-password-settings.svelte b/web/src/lib/components/user-settings-page/change-password-settings.svelte index 7f6f305300..9902f66706 100644 --- a/web/src/lib/components/user-settings-page/change-password-settings.svelte +++ b/web/src/lib/components/user-settings-page/change-password-settings.svelte @@ -17,8 +17,10 @@ const handleChangePassword = async () => { try { await api.authenticationApi.changePassword({ - password, - newPassword + changePasswordDto: { + password, + newPassword + } }); notificationController.show({ diff --git a/web/src/lib/components/user-settings-page/device-list.svelte b/web/src/lib/components/user-settings-page/device-list.svelte index 5e6544d432..dfd85a667e 100644 --- a/web/src/lib/components/user-settings-page/device-list.svelte +++ b/web/src/lib/components/user-settings-page/device-list.svelte @@ -29,7 +29,7 @@ } try { - await api.authenticationApi.logoutAuthDevice(deleteDevice.id); + await api.authenticationApi.logoutAuthDevice({ id: deleteDevice.id }); notificationController.show({ message: `Logged out device`, type: NotificationType.Info }); } catch (error) { handleError(error, 'Unable to log out device'); diff --git a/web/src/lib/components/user-settings-page/partner-selection-modal.svelte b/web/src/lib/components/user-settings-page/partner-selection-modal.svelte index 4c420e5a40..f0652ae6cb 100644 --- a/web/src/lib/components/user-settings-page/partner-selection-modal.svelte +++ b/web/src/lib/components/user-settings-page/partner-selection-modal.svelte @@ -15,13 +15,13 @@ onMount(async () => { // TODO: update endpoint to have a query param for deleted users - let { data: users } = await api.userApi.getAllUsers(false); + let { data: users } = await api.userApi.getAllUsers({ isAll: false }); // remove invalid users users = users.filter((_user) => !(_user.deletedAt || _user.id === user.id)); // exclude partners from the list of users available for selection - const { data: partners } = await api.partnerApi.getPartners('shared-by'); + const { data: partners } = await api.partnerApi.getPartners({ direction: 'shared-by' }); const partnerIds = partners.map((partner) => partner.id); availableUsers = users.filter((user) => !partnerIds.includes(user.id)); }); diff --git a/web/src/lib/components/user-settings-page/partner-settings.svelte b/web/src/lib/components/user-settings-page/partner-settings.svelte index 5743529c81..6c70d58c94 100644 --- a/web/src/lib/components/user-settings-page/partner-settings.svelte +++ b/web/src/lib/components/user-settings-page/partner-settings.svelte @@ -16,7 +16,7 @@ let removePartner: UserResponseDto | null = null; const refreshPartners = async () => { - const { data } = await api.partnerApi.getPartners('shared-by'); + const { data } = await api.partnerApi.getPartners({ direction: 'shared-by' }); partners = data; }; @@ -26,7 +26,7 @@ } try { - await api.partnerApi.removePartner(removePartner.id); + await api.partnerApi.removePartner({ id: removePartner.id }); removePartner = null; await refreshPartners(); } catch (error) { @@ -37,7 +37,7 @@ const handleCreatePartners = async (users: UserResponseDto[]) => { try { for (const user of users) { - await api.partnerApi.createPartner(user.id); + await api.partnerApi.createPartner({ id: user.id }); } await refreshPartners(); 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 ca254b6a86..5612497ef0 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 @@ -40,7 +40,7 @@ const handleCreate = async (event: CustomEvent) => { try { const dto = event.detail; - const { data } = await api.keyApi.createKey(dto); + const { data } = await api.keyApi.createKey({ aPIKeyCreateDto: dto }); secret = data.secret; } catch (error) { handleError(error, 'Unable to create a new API Key'); @@ -58,7 +58,7 @@ const dto = event.detail; try { - await api.keyApi.updateKey(editKey.id, { name: dto.name }); + await api.keyApi.updateKey({ id: editKey.id, aPIKeyUpdateDto: { name: dto.name } }); notificationController.show({ message: `Saved API Key`, type: NotificationType.Info @@ -77,7 +77,7 @@ } try { - await api.keyApi.deleteKey(deleteKey.id); + await api.keyApi.deleteKey({ id: deleteKey.id }); notificationController.show({ message: `Removed API Key: ${deleteKey.name}`, type: NotificationType.Info diff --git a/web/src/lib/components/user-settings-page/user-profile-settings.svelte b/web/src/lib/components/user-settings-page/user-profile-settings.svelte index 639bcd8825..3fc770de36 100644 --- a/web/src/lib/components/user-settings-page/user-profile-settings.svelte +++ b/web/src/lib/components/user-settings-page/user-profile-settings.svelte @@ -16,10 +16,12 @@ const handleSaveProfile = async () => { try { const { data } = await api.userApi.updateUser({ - id: user.id, - email: user.email, - firstName: user.firstName, - lastName: user.lastName + updateUserDto: { + id: user.id, + email: user.email, + firstName: user.firstName, + lastName: user.lastName + } }); Object.assign(user, data); diff --git a/web/src/lib/stores/asset-interaction.store.ts b/web/src/lib/stores/asset-interaction.store.ts index 2fd70c292c..bc3e3bea35 100644 --- a/web/src/lib/stores/asset-interaction.store.ts +++ b/web/src/lib/stores/asset-interaction.store.ts @@ -57,7 +57,7 @@ function createAssetInteractionStore() { }; const setViewingAssetId = async (id: string) => { - const { data } = await api.assetApi.getAssetById(id); + const { data } = await api.assetApi.getAssetById({ assetId: id }); viewingAssetStoreState.set(data); isViewingAssetStoreState.set(true); }; diff --git a/web/src/lib/stores/assets.store.ts b/web/src/lib/stores/assets.store.ts index cf8865fc07..620626b647 100644 --- a/web/src/lib/stores/assets.store.ts +++ b/web/src/lib/stores/assets.store.ts @@ -66,9 +66,11 @@ function createAssetStore() { }); const { data: assets } = await api.assetApi.getAssetByTimeBucket( { - timeBucket: [bucket], - userId: _assetGridState.userId, - withoutThumbs: true + getAssetByTimeBucketDto: { + timeBucket: [bucket], + userId: _assetGridState.userId, + withoutThumbs: true + } }, { signal: currentBucketData?.cancelToken.signal } ); diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts index e8428f72ea..f10521d2e7 100644 --- a/web/src/lib/utils/asset-utils.ts +++ b/web/src/lib/utils/asset-utils.ts @@ -10,17 +10,19 @@ export const addAssetsToAlbum = async ( assetIds: Array, key: string | undefined = undefined ): Promise => - api.albumApi.addAssetsToAlbum(albumId, { assetIds }, key).then(({ data: dto }) => { - if (dto.successfullyAdded > 0) { - // This might be 0 if the user tries to add an asset that is already in the album - notificationController.show({ - message: `Added ${dto.successfullyAdded} to ${dto.album?.albumName}`, - type: NotificationType.Info - }); - } + api.albumApi + .addAssetsToAlbum({ id: albumId, addAssetsDto: { assetIds }, key }) + .then(({ data: dto }) => { + if (dto.successfullyAdded > 0) { + // This might be 0 if the user tries to add an asset that is already in the album + notificationController.show({ + message: `Added ${dto.successfullyAdded} to ${dto.album?.albumName}`, + type: NotificationType.Info + }); + } - return dto; - }); + return dto; + }); export async function bulkDownload( fileName: string, @@ -43,20 +45,23 @@ export async function bulkDownload( let total = 0; - const { data, status, headers } = await api.assetApi.downloadFiles({ assetIds }, key, { - responseType: 'blob', - onDownloadProgress: function (progressEvent) { - const request = this as XMLHttpRequest; - if (!total) { - total = Number(request.getResponseHeader('X-Immich-Content-Length-Hint')) || 0; - } + const { data, status, headers } = await api.assetApi.downloadFiles( + { downloadFilesDto: { assetIds }, key }, + { + responseType: 'blob', + onDownloadProgress: function (progressEvent) { + const request = this as XMLHttpRequest; + if (!total) { + total = Number(request.getResponseHeader('X-Immich-Content-Length-Hint')) || 0; + } - if (total) { - const current = progressEvent.loaded; - downloadAssets.set({ [downloadFileName]: Math.floor((current / total) * 100) }); + if (total) { + const current = progressEvent.loaded; + downloadAssets.set({ [downloadFileName]: Math.floor((current / total) * 100) }); + } } } - }); + ); const isNotComplete = headers['x-immich-archive-complete'] === 'false'; const fileCount = Number(headers['x-immich-archive-file-count']) || 0; diff --git a/web/src/routes/(user)/albums/[albumId]/+page.server.ts b/web/src/routes/(user)/albums/[albumId]/+page.server.ts index 47a304ffa8..75764423ef 100644 --- a/web/src/routes/(user)/albums/[albumId]/+page.server.ts +++ b/web/src/routes/(user)/albums/[albumId]/+page.server.ts @@ -10,7 +10,7 @@ export const load = (async ({ params, locals: { api, user } }) => { const albumId = params['albumId']; try { - const { data: album } = await api.albumApi.getAlbumInfo(albumId); + const { data: album } = await api.albumApi.getAlbumInfo({ id: albumId }); return { album, meta: { diff --git a/web/src/routes/(user)/albums/__tests__/albums.bloc.spec.ts b/web/src/routes/(user)/albums/__tests__/albums.bloc.spec.ts index 8565202d6b..8dad0c966a 100644 --- a/web/src/routes/(user)/albums/__tests__/albums.bloc.spec.ts +++ b/web/src/routes/(user)/albums/__tests__/albums.bloc.spec.ts @@ -90,7 +90,7 @@ describe('Albums BLoC', () => { const newAlbum = await sut.createAlbum(); expect(apiMock.albumApi.createAlbum).toHaveBeenCalledTimes(1); - expect(apiMock.albumApi.createAlbum).toHaveBeenCalledWith(payload); + expect(apiMock.albumApi.createAlbum).toHaveBeenCalledWith({ createAlbumDto: payload }); expect(newAlbum).toEqual(returnedAlbum); }); @@ -130,7 +130,7 @@ describe('Albums BLoC', () => { const updatedAlbums = get(sut.albums); expect(apiMock.albumApi.deleteAlbum).toHaveBeenCalledTimes(1); - expect(apiMock.albumApi.deleteAlbum).toHaveBeenCalledWith(albumToDeleteId); + expect(apiMock.albumApi.deleteAlbum).toHaveBeenCalledWith({ id: albumToDeleteId }); expect(updatedAlbums).toHaveLength(4); expect(updatedAlbums).not.toContain(albumToDelete); expect(get(sut.isShowContextMenu)).toBe(false); diff --git a/web/src/routes/(user)/albums/albums.bloc.ts b/web/src/routes/(user)/albums/albums.bloc.ts index 190dfabdfe..ceca7db14c 100644 --- a/web/src/routes/(user)/albums/albums.bloc.ts +++ b/web/src/routes/(user)/albums/albums.bloc.ts @@ -40,7 +40,9 @@ export const useAlbums = (props: AlbumsProps) => { async function createAlbum(): Promise { try { const { data: newAlbum } = await api.albumApi.createAlbum({ - albumName: 'Untitled' + createAlbumDto: { + albumName: 'Untitled' + } }); return newAlbum; @@ -53,7 +55,7 @@ export const useAlbums = (props: AlbumsProps) => { } async function deleteAlbum(album: AlbumResponseDto): Promise { - await api.albumApi.deleteAlbum(album.id); + await api.albumApi.deleteAlbum({ id: album.id }); } async function showAlbumContextMenu( @@ -83,7 +85,7 @@ export const useAlbums = (props: AlbumsProps) => { ) ) { try { - await api.albumApi.deleteAlbum(albumToDelete.id); + await api.albumApi.deleteAlbum({ id: albumToDelete.id }); const _albums = get(albums); albums.set(_albums.filter((a) => a.id !== albumToDelete.id)); } catch { diff --git a/web/src/routes/(user)/archive/+page.svelte b/web/src/routes/(user)/archive/+page.svelte index 5a4e1529b6..bcbb649297 100644 --- a/web/src/routes/(user)/archive/+page.svelte +++ b/web/src/routes/(user)/archive/+page.svelte @@ -26,7 +26,7 @@ onMount(async () => { try { - const { data: assets } = await api.assetApi.getAllAssets(undefined, undefined, true); + const { data: assets } = await api.assetApi.getAllAssets({ isArchived: true }); $archivedAsset = assets; } catch { handleError(Error, 'Unable to load archived assets'); diff --git a/web/src/routes/(user)/favorites/+page.svelte b/web/src/routes/(user)/favorites/+page.svelte index 64f186e0d6..7b2ad8054b 100644 --- a/web/src/routes/(user)/favorites/+page.svelte +++ b/web/src/routes/(user)/favorites/+page.svelte @@ -28,7 +28,7 @@ onMount(async () => { try { - const { data: assets } = await api.assetApi.getAllAssets(undefined, true, undefined); + const { data: assets } = await api.assetApi.getAllAssets({ isFavorite: true }); favorites = assets; } catch { handleError(Error, 'Unable to load favorites'); diff --git a/web/src/routes/(user)/map/+page.svelte b/web/src/routes/(user)/map/+page.svelte index 3b1744ffad..e116d37662 100644 --- a/web/src/routes/(user)/map/+page.svelte +++ b/web/src/routes/(user)/map/+page.svelte @@ -48,9 +48,11 @@ const { fileCreatedAfter, fileCreatedBefore } = getFileCreatedDates(); const { data } = await api.assetApi.getMapMarkers( - onlyFavorites || undefined, - fileCreatedAfter, - fileCreatedBefore, + { + isFavorite: onlyFavorites || undefined, + fileCreatedAfter, + fileCreatedBefore + }, { signal: abortController.signal } diff --git a/web/src/routes/(user)/partners/[userId]/+page.server.ts b/web/src/routes/(user)/partners/[userId]/+page.server.ts index 3d6feb830e..8ce5f77606 100644 --- a/web/src/routes/(user)/partners/[userId]/+page.server.ts +++ b/web/src/routes/(user)/partners/[userId]/+page.server.ts @@ -9,7 +9,7 @@ export const load: PageServerLoad = async ({ params, parent, locals: { api } }) throw redirect(302, AppRoute.AUTH_LOGIN); } - const { data: partner } = await api.userApi.getUserById(params['userId']); + const { data: partner } = await api.userApi.getUserById({ userId: params['userId'] }); return { user, diff --git a/web/src/routes/(user)/people/[personId]/+page.server.ts b/web/src/routes/(user)/people/[personId]/+page.server.ts index b12f7a166b..e562cd30f2 100644 --- a/web/src/routes/(user)/people/[personId]/+page.server.ts +++ b/web/src/routes/(user)/people/[personId]/+page.server.ts @@ -7,8 +7,8 @@ export const load = (async ({ locals, parent, params }) => { throw redirect(302, '/auth/login'); } - const { data: person } = await locals.api.personApi.getPerson(params.personId); - const { data: assets } = await locals.api.personApi.getPersonAssets(params.personId); + const { data: person } = await locals.api.personApi.getPerson({ id: params.personId }); + const { data: assets } = await locals.api.personApi.getPersonAssets({ id: params.personId }); return { user, diff --git a/web/src/routes/(user)/people/[personId]/+page.svelte b/web/src/routes/(user)/people/[personId]/+page.svelte index 57750c045d..eb98a56906 100644 --- a/web/src/routes/(user)/people/[personId]/+page.svelte +++ b/web/src/routes/(user)/people/[personId]/+page.svelte @@ -41,7 +41,7 @@ try { isEditName = false; data.person.name = name; - await api.personApi.updatePerson(data.person.id, { name }); + await api.personApi.updatePerson({ id: data.person.id, personUpdateDto: { name } }); } catch (error) { handleError(error, 'Unable to save name'); } diff --git a/web/src/routes/(user)/search/+page.server.ts b/web/src/routes/(user)/search/+page.server.ts index 0254dc27b1..e2fa1ce6b1 100644 --- a/web/src/routes/(user)/search/+page.server.ts +++ b/web/src/routes/(user)/search/+page.server.ts @@ -9,24 +9,7 @@ export const load = (async ({ locals, parent, url }) => { const term = url.searchParams.get('q') || url.searchParams.get('query') || undefined; - const { data: results } = await locals.api.searchApi.search( - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - { params: url.searchParams } - ); + const { data: results } = await locals.api.searchApi.search({}, { params: url.searchParams }); return { user, diff --git a/web/src/routes/(user)/share/[key]/+page.server.ts b/web/src/routes/(user)/share/[key]/+page.server.ts index 9738422146..080a6e3914 100644 --- a/web/src/routes/(user)/share/[key]/+page.server.ts +++ b/web/src/routes/(user)/share/[key]/+page.server.ts @@ -7,7 +7,7 @@ export const load = (async ({ params, locals: { api } }) => { const { key } = params; try { - const { data: sharedLink } = await api.shareApi.getMySharedLink(key); + const { data: sharedLink } = await api.shareApi.getMySharedLink({ key }); const assetCount = sharedLink.assets.length; const assetId = sharedLink.album?.albumThumbnailAssetId || sharedLink.assets[0]?.id; diff --git a/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts b/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts index 3ba60ed169..f5672b1c10 100644 --- a/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts +++ b/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts @@ -6,7 +6,7 @@ import type { PageServerLoad } from './$types'; export const load = (async ({ params, locals: { api } }) => { try { const { key, assetId } = params; - const { data: asset } = await api.assetApi.getAssetById(assetId, key); + const { data: asset } = await api.assetApi.getAssetById({ assetId, key }); if (!asset) { return error(404, 'Asset not found'); diff --git a/web/src/routes/(user)/sharing/+page.server.ts b/web/src/routes/(user)/sharing/+page.server.ts index da5ec9c5fa..4e8d4f764a 100644 --- a/web/src/routes/(user)/sharing/+page.server.ts +++ b/web/src/routes/(user)/sharing/+page.server.ts @@ -8,8 +8,8 @@ export const load = (async ({ locals: { api, user } }) => { } try { - const { data: sharedAlbums } = await api.albumApi.getAllAlbums(true); - const { data: partners } = await api.partnerApi.getPartners('shared-with'); + const { data: sharedAlbums } = await api.albumApi.getAllAlbums({ shared: true }); + const { data: partners } = await api.partnerApi.getPartners({ direction: 'shared-with' }); return { user, diff --git a/web/src/routes/(user)/sharing/+page.svelte b/web/src/routes/(user)/sharing/+page.svelte index 34d012912c..119dc0d77b 100644 --- a/web/src/routes/(user)/sharing/+page.svelte +++ b/web/src/routes/(user)/sharing/+page.svelte @@ -21,7 +21,9 @@ const createSharedAlbum = async () => { try { const { data: newAlbum } = await api.albumApi.createAlbum({ - albumName: 'Untitled' + createAlbumDto: { + albumName: 'Untitled' + } }); goto('/albums/' + newAlbum.id); diff --git a/web/src/routes/(user)/sharing/sharedlinks/+page.svelte b/web/src/routes/(user)/sharing/sharedlinks/+page.svelte index 4e8f7efdf1..7d2aab0577 100644 --- a/web/src/routes/(user)/sharing/sharedlinks/+page.svelte +++ b/web/src/routes/(user)/sharing/sharedlinks/+page.svelte @@ -29,7 +29,7 @@ const handleDeleteLink = async (linkId: string) => { if (window.confirm('Do you want to delete the shared link? ')) { try { - await api.shareApi.removeSharedLink(linkId); + await api.shareApi.removeSharedLink({ id: linkId }); notificationController.show({ message: 'Shared link deleted', type: NotificationType.Info @@ -47,7 +47,7 @@ }; const handleEditLink = async (id: string) => { - const { data } = await api.shareApi.getSharedLinkById(id); + const { data } = await api.shareApi.getSharedLinkById({ id }); editSharedLink = data; showEditForm = true; }; diff --git a/web/src/routes/+page.server.ts b/web/src/routes/+page.server.ts index 7f9e9ce9dc..b5e4e4d23f 100644 --- a/web/src/routes/+page.server.ts +++ b/web/src/routes/+page.server.ts @@ -9,7 +9,7 @@ export const load = (async ({ parent, locals: { api } }) => { throw redirect(302, '/photos'); } - const { data } = await api.userApi.getUserCount(true); + const { data } = await api.userApi.getUserCount({ admin: true }); if (data.userCount > 0) { // Redirect to login page if an admin is already registered. diff --git a/web/src/routes/admin/user-management/+page.server.ts b/web/src/routes/admin/user-management/+page.server.ts index 3e5f29ffef..b2c18fa9ac 100644 --- a/web/src/routes/admin/user-management/+page.server.ts +++ b/web/src/routes/admin/user-management/+page.server.ts @@ -10,7 +10,7 @@ export const load = (async ({ parent, locals: { api } }) => { throw redirect(302, '/photos'); } - const { data: allUsers } = await api.userApi.getAllUsers(false); + const { data: allUsers } = await api.userApi.getAllUsers({ isAll: false }); return { user, diff --git a/web/src/routes/admin/user-management/+page.svelte b/web/src/routes/admin/user-management/+page.svelte index 9b33a49516..b5a3624bb8 100644 --- a/web/src/routes/admin/user-management/+page.svelte +++ b/web/src/routes/admin/user-management/+page.svelte @@ -46,7 +46,7 @@ }; const onUserCreated = async () => { - const getAllUsersRes = await api.userApi.getAllUsers(false); + const getAllUsersRes = await api.userApi.getAllUsers({ isAll: false }); allUsers = getAllUsersRes.data; shouldShowCreateUserForm = false; }; @@ -57,13 +57,13 @@ }; const onEditUserSuccess = async () => { - const getAllUsersRes = await api.userApi.getAllUsers(false); + const getAllUsersRes = await api.userApi.getAllUsers({ isAll: false }); allUsers = getAllUsersRes.data; shouldShowEditUserForm = false; }; const onEditPasswordSuccess = async () => { - const getAllUsersRes = await api.userApi.getAllUsers(false); + const getAllUsersRes = await api.userApi.getAllUsers({ isAll: false }); allUsers = getAllUsersRes.data; shouldShowEditUserForm = false; shouldShowInfoPanel = true; @@ -75,13 +75,13 @@ }; const onUserDeleteSuccess = async () => { - const getAllUsersRes = await api.userApi.getAllUsers(false); + const getAllUsersRes = await api.userApi.getAllUsers({ isAll: false }); allUsers = getAllUsersRes.data; shouldShowDeleteConfirmDialog = false; }; const onUserDeleteFail = async () => { - const getAllUsersRes = await api.userApi.getAllUsers(false); + const getAllUsersRes = await api.userApi.getAllUsers({ isAll: false }); allUsers = getAllUsersRes.data; shouldShowDeleteConfirmDialog = false; }; @@ -92,14 +92,14 @@ }; const onUserRestoreSuccess = async () => { - const getAllUsersRes = await api.userApi.getAllUsers(false); + const getAllUsersRes = await api.userApi.getAllUsers({ isAll: false }); allUsers = getAllUsersRes.data; shouldShowRestoreDialog = false; }; const onUserRestoreFail = async () => { // show fail dialog - const getAllUsersRes = await api.userApi.getAllUsers(false); + const getAllUsersRes = await api.userApi.getAllUsers({ isAll: false }); allUsers = getAllUsersRes.data; shouldShowRestoreDialog = false; }; diff --git a/web/src/routes/auth/login/+page.server.ts b/web/src/routes/auth/login/+page.server.ts index 918a20dd03..3d42639de3 100644 --- a/web/src/routes/auth/login/+page.server.ts +++ b/web/src/routes/auth/login/+page.server.ts @@ -4,7 +4,7 @@ import type { OAuthConfigResponseDto } from '@api'; import type { PageServerLoad } from './$types'; export const load = (async ({ locals: { api } }) => { - const { data } = await api.userApi.getUserCount(true); + const { data } = await api.userApi.getUserCount({ admin: true }); if (data.userCount === 0) { // Admin not registered throw redirect(302, AppRoute.AUTH_REGISTER); @@ -17,7 +17,7 @@ export const load = (async ({ locals: { api } }) => { try { // TODO: Figure out how to get correct redirect URI server-side. - const { data } = await api.oauthApi.generateConfig({ redirectUri: '/' }); + const { data } = await api.oauthApi.generateConfig({ oAuthConfigDto: { redirectUri: '/' } }); data.url = undefined; authConfig = data; diff --git a/web/src/routes/auth/register/+page.server.ts b/web/src/routes/auth/register/+page.server.ts index bf62570726..4c6fcbc77d 100644 --- a/web/src/routes/auth/register/+page.server.ts +++ b/web/src/routes/auth/register/+page.server.ts @@ -2,7 +2,7 @@ import { redirect } from '@sveltejs/kit'; import type { PageServerLoad } from './$types'; export const load = (async ({ locals: { api } }) => { - const { data } = await api.userApi.getUserCount(true); + const { data } = await api.userApi.getUserCount({ admin: true }); if (data.userCount != 0) { // Admin has been registered, redirect to login throw redirect(302, '/auth/login');