diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md index e98d49f036..49755beacc 100644 Binary files a/mobile/openapi/README.md and b/mobile/openapi/README.md differ diff --git a/mobile/openapi/doc/AssetApi.md b/mobile/openapi/doc/AssetApi.md index 9a1c073406..7ddea756c0 100644 Binary files a/mobile/openapi/doc/AssetApi.md and b/mobile/openapi/doc/AssetApi.md differ diff --git a/mobile/openapi/lib/api/asset_api.dart b/mobile/openapi/lib/api/asset_api.dart index e27d4e4557..ff272d4c27 100644 Binary files a/mobile/openapi/lib/api/asset_api.dart and b/mobile/openapi/lib/api/asset_api.dart differ diff --git a/mobile/openapi/test/asset_api_test.dart b/mobile/openapi/test/asset_api_test.dart index e5d50815ca..79c74cc8e0 100644 Binary files a/mobile/openapi/test/asset_api_test.dart and b/mobile/openapi/test/asset_api_test.dart differ diff --git a/server/apps/immich/src/api-v1/asset/asset.controller.ts b/server/apps/immich/src/api-v1/asset/asset.controller.ts index 82d9ea8baf..496b567ea4 100644 --- a/server/apps/immich/src/api-v1/asset/asset.controller.ts +++ b/server/apps/immich/src/api-v1/asset/asset.controller.ts @@ -54,7 +54,7 @@ import FileNotEmptyValidator from '../validation/file-not-empty-validator'; import { RemoveAssetsDto } from '../album/dto/remove-assets.dto'; import { AssetBulkUploadCheckDto } from './dto/asset-check.dto'; import { AssetBulkUploadCheckResponseDto } from './response-dto/asset-check-response.dto'; -import { AssetIdDto } from './dto/asset-id.dto'; +import { UUIDParamDto } from '../../controllers/dto/uuid-param.dto'; import { DeviceIdDto } from './dto/device-id.dto'; import { handleDownload } from '../../app.utils'; @@ -114,14 +114,14 @@ export class AssetController { } @SharedLinkRoute() - @Get('/download/:assetId') + @Get('/download/:id') @ApiOkResponse({ content: { 'application/octet-stream': { schema: { type: 'string', format: 'binary' } } } }) async downloadFile( @GetAuthUser() authUser: AuthUserDto, @Response({ passthrough: true }) res: Res, - @Param() { assetId }: AssetIdDto, + @Param() { id }: UUIDParamDto, ) { - return this.assetService.downloadFile(authUser, assetId).then(asStreamableFile); + return this.assetService.downloadFile(authUser, id).then(asStreamableFile); } @SharedLinkRoute() @@ -153,7 +153,7 @@ export class AssetController { } @SharedLinkRoute() - @Get('/file/:assetId') + @Get('/file/:id') @Header('Cache-Control', 'max-age=31536000') @ApiOkResponse({ content: { 'application/octet-stream': { schema: { type: 'string', format: 'binary' } } } }) async serveFile( @@ -161,25 +161,25 @@ export class AssetController { @Headers() headers: Record, @Response({ passthrough: true }) res: Res, @Query(new ValidationPipe({ transform: true })) query: ServeFileDto, - @Param() { assetId }: AssetIdDto, + @Param() { id }: UUIDParamDto, ) { - await this.assetService.checkAssetsAccess(authUser, [assetId]); - return this.assetService.serveFile(authUser, assetId, query, res, headers); + await this.assetService.checkAssetsAccess(authUser, [id]); + return this.assetService.serveFile(authUser, id, query, res, headers); } @SharedLinkRoute() - @Get('/thumbnail/:assetId') + @Get('/thumbnail/:id') @Header('Cache-Control', 'max-age=31536000') @ApiOkResponse({ content: { 'application/octet-stream': { schema: { type: 'string', format: 'binary' } } } }) async getAssetThumbnail( @GetAuthUser() authUser: AuthUserDto, @Headers() headers: Record, @Response({ passthrough: true }) res: Res, - @Param() { assetId }: AssetIdDto, + @Param() { id }: UUIDParamDto, @Query(new ValidationPipe({ transform: true })) query: GetAssetThumbnailDto, ) { - await this.assetService.checkAssetsAccess(authUser, [assetId]); - return this.assetService.getAssetThumbnail(assetId, query, res, headers); + await this.assetService.checkAssetsAccess(authUser, [id]); + return this.assetService.getAssetThumbnail(id, query, res, headers); } @Get('/curated-objects') @@ -259,26 +259,23 @@ export class AssetController { * Get a single asset's information */ @SharedLinkRoute() - @Get('/assetById/:assetId') - async getAssetById( - @GetAuthUser() authUser: AuthUserDto, - @Param() { assetId }: AssetIdDto, - ): Promise { - await this.assetService.checkAssetsAccess(authUser, [assetId]); - return await this.assetService.getAssetById(authUser, assetId); + @Get('/assetById/:id') + async getAssetById(@GetAuthUser() authUser: AuthUserDto, @Param() { id }: UUIDParamDto): Promise { + await this.assetService.checkAssetsAccess(authUser, [id]); + return await this.assetService.getAssetById(authUser, id); } /** * Update an asset */ - @Put('/:assetId') + @Put('/:id') async updateAsset( @GetAuthUser() authUser: AuthUserDto, - @Param() { assetId }: AssetIdDto, + @Param() { id }: UUIDParamDto, @Body(ValidationPipe) dto: UpdateAssetDto, ): Promise { - await this.assetService.checkAssetsAccess(authUser, [assetId], true); - return await this.assetService.updateAsset(authUser, assetId, dto); + await this.assetService.checkAssetsAccess(authUser, [id], true); + return await this.assetService.updateAsset(authUser, id, dto); } @Delete('/') diff --git a/server/apps/immich/src/api-v1/asset/dto/asset-id.dto.ts b/server/apps/immich/src/api-v1/asset/dto/asset-id.dto.ts deleted file mode 100644 index 5404878382..0000000000 --- a/server/apps/immich/src/api-v1/asset/dto/asset-id.dto.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ApiProperty } from '@nestjs/swagger'; -import { IsNotEmpty, IsUUID } from 'class-validator'; - -export class AssetIdDto { - @IsNotEmpty() - @IsUUID('4') - @ApiProperty({ format: 'uuid' }) - assetId!: string; -} diff --git a/server/immich-openapi-specs.json b/server/immich-openapi-specs.json index 9faac4bc57..36a4dad1d8 100644 --- a/server/immich-openapi-specs.json +++ b/server/immich-openapi-specs.json @@ -2801,12 +2801,12 @@ ] } }, - "/asset/download/{assetId}": { + "/asset/download/{id}": { "get": { "operationId": "downloadFile", "parameters": [ { - "name": "assetId", + "name": "id", "required": true, "in": "path", "schema": { @@ -2966,7 +2966,7 @@ ] } }, - "/asset/file/{assetId}": { + "/asset/file/{id}": { "get": { "operationId": "serveFile", "parameters": [ @@ -2989,7 +2989,7 @@ } }, { - "name": "assetId", + "name": "id", "required": true, "in": "path", "schema": { @@ -3035,12 +3035,12 @@ ] } }, - "/asset/thumbnail/{assetId}": { + "/asset/thumbnail/{id}": { "get": { "operationId": "getAssetThumbnail", "parameters": [ { - "name": "assetId", + "name": "id", "required": true, "in": "path", "schema": { @@ -3563,13 +3563,13 @@ ] } }, - "/asset/assetById/{assetId}": { + "/asset/assetById/{id}": { "get": { "operationId": "getAssetById", "description": "Get a single asset's information", "parameters": [ { - "name": "assetId", + "name": "id", "required": true, "in": "path", "schema": { @@ -3614,13 +3614,13 @@ ] } }, - "/asset/{assetId}": { + "/asset/{id}": { "put": { "operationId": "updateAsset", "description": "Update an asset", "parameters": [ { - "name": "assetId", + "name": "id", "required": true, "in": "path", "schema": { diff --git a/web/src/api/open-api/api.ts b/web/src/api/open-api/api.ts index b1aeb20cda..b777df42c1 100644 --- a/web/src/api/open-api/api.ts +++ b/web/src/api/open-api/api.ts @@ -4847,16 +4847,16 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {string} assetId + * @param {string} id * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - downloadFile: async (assetId: string, key?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'assetId' is not null or undefined - assertParamExists('downloadFile', 'assetId', assetId) - const localVarPath = `/asset/download/{assetId}` - .replace(`{${"assetId"}}`, encodeURIComponent(String(assetId))); + downloadFile: async (id: string, key?: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('downloadFile', 'id', id) + const localVarPath = `/asset/download/{id}` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -5097,16 +5097,16 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * Get a single asset\'s information - * @param {string} assetId + * @param {string} id * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetById: async (assetId: string, key?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'assetId' is not null or undefined - assertParamExists('getAssetById', 'assetId', assetId) - const localVarPath = `/asset/assetById/{assetId}` - .replace(`{${"assetId"}}`, encodeURIComponent(String(assetId))); + getAssetById: async (id: string, key?: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('getAssetById', 'id', id) + const localVarPath = `/asset/assetById/{id}` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -5308,17 +5308,17 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {string} assetId + * @param {string} id * @param {ThumbnailFormat} [format] * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetThumbnail: async (assetId: string, format?: ThumbnailFormat, key?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'assetId' is not null or undefined - assertParamExists('getAssetThumbnail', 'assetId', assetId) - const localVarPath = `/asset/thumbnail/{assetId}` - .replace(`{${"assetId"}}`, encodeURIComponent(String(assetId))); + getAssetThumbnail: async (id: string, format?: ThumbnailFormat, key?: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('getAssetThumbnail', 'id', id) + const localVarPath = `/asset/thumbnail/{id}` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -5628,18 +5628,18 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {string} assetId + * @param {string} id * @param {boolean} [isThumb] * @param {boolean} [isWeb] * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - serveFile: async (assetId: string, isThumb?: boolean, isWeb?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'assetId' is not null or undefined - assertParamExists('serveFile', 'assetId', assetId) - const localVarPath = `/asset/file/{assetId}` - .replace(`{${"assetId"}}`, encodeURIComponent(String(assetId))); + serveFile: async (id: string, isThumb?: boolean, isWeb?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('serveFile', 'id', id) + const localVarPath = `/asset/file/{id}` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -5685,18 +5685,18 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * Update an asset - * @param {string} assetId + * @param {string} id * @param {UpdateAssetDto} updateAssetDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - updateAsset: async (assetId: string, updateAssetDto: UpdateAssetDto, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'assetId' is not null or undefined - assertParamExists('updateAsset', 'assetId', assetId) + updateAsset: async (id: string, updateAssetDto: UpdateAssetDto, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'id' is not null or undefined + assertParamExists('updateAsset', 'id', id) // verify required parameter 'updateAssetDto' is not null or undefined assertParamExists('updateAsset', 'updateAssetDto', updateAssetDto) - const localVarPath = `/asset/{assetId}` - .replace(`{${"assetId"}}`, encodeURIComponent(String(assetId))); + const localVarPath = `/asset/{id}` + .replace(`{${"id"}}`, encodeURIComponent(String(id))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -5933,13 +5933,13 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * - * @param {string} assetId + * @param {string} id * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async downloadFile(assetId: string, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.downloadFile(assetId, key, options); + async downloadFile(id: string, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.downloadFile(id, key, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -5990,13 +5990,13 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * Get a single asset\'s information - * @param {string} assetId + * @param {string} id * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAssetById(assetId: string, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetById(assetId, key, options); + async getAssetById(id: string, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetById(id, key, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -6039,14 +6039,14 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * - * @param {string} assetId + * @param {string} id * @param {ThumbnailFormat} [format] * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAssetThumbnail(assetId: string, format?: ThumbnailFormat, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetThumbnail(assetId, format, key, options); + async getAssetThumbnail(id: string, format?: ThumbnailFormat, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetThumbnail(id, format, key, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -6112,26 +6112,26 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * - * @param {string} assetId + * @param {string} id * @param {boolean} [isThumb] * @param {boolean} [isWeb] * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async serveFile(assetId: string, isThumb?: boolean, isWeb?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.serveFile(assetId, isThumb, isWeb, key, options); + async serveFile(id: string, isThumb?: boolean, isWeb?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.serveFile(id, isThumb, isWeb, key, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** * Update an asset - * @param {string} assetId + * @param {string} id * @param {UpdateAssetDto} updateAssetDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async updateAsset(assetId: string, updateAssetDto: UpdateAssetDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.updateAsset(assetId, updateAssetDto, options); + async updateAsset(id: string, updateAssetDto: UpdateAssetDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.updateAsset(id, updateAssetDto, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -6225,13 +6225,13 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }, /** * - * @param {string} assetId + * @param {string} id * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - downloadFile(assetId: string, key?: string, options?: any): AxiosPromise { - return localVarFp.downloadFile(assetId, key, options).then((request) => request(axios, basePath)); + downloadFile(id: string, key?: string, options?: any): AxiosPromise { + return localVarFp.downloadFile(id, key, options).then((request) => request(axios, basePath)); }, /** * @@ -6277,13 +6277,13 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }, /** * Get a single asset\'s information - * @param {string} assetId + * @param {string} id * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetById(assetId: string, key?: string, options?: any): AxiosPromise { - return localVarFp.getAssetById(assetId, key, options).then((request) => request(axios, basePath)); + getAssetById(id: string, key?: string, options?: any): AxiosPromise { + return localVarFp.getAssetById(id, key, options).then((request) => request(axios, basePath)); }, /** * @@ -6321,14 +6321,14 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }, /** * - * @param {string} assetId + * @param {string} id * @param {ThumbnailFormat} [format] * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAssetThumbnail(assetId: string, format?: ThumbnailFormat, key?: string, options?: any): AxiosPromise { - return localVarFp.getAssetThumbnail(assetId, format, key, options).then((request) => request(axios, basePath)); + getAssetThumbnail(id: string, format?: ThumbnailFormat, key?: string, options?: any): AxiosPromise { + return localVarFp.getAssetThumbnail(id, format, key, options).then((request) => request(axios, basePath)); }, /** * @@ -6387,25 +6387,25 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath }, /** * - * @param {string} assetId + * @param {string} id * @param {boolean} [isThumb] * @param {boolean} [isWeb] * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - serveFile(assetId: string, isThumb?: boolean, isWeb?: boolean, key?: string, options?: any): AxiosPromise { - return localVarFp.serveFile(assetId, isThumb, isWeb, key, options).then((request) => request(axios, basePath)); + serveFile(id: string, isThumb?: boolean, isWeb?: boolean, key?: string, options?: any): AxiosPromise { + return localVarFp.serveFile(id, isThumb, isWeb, key, options).then((request) => request(axios, basePath)); }, /** * Update an asset - * @param {string} assetId + * @param {string} id * @param {UpdateAssetDto} updateAssetDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - updateAsset(assetId: string, updateAssetDto: UpdateAssetDto, options?: any): AxiosPromise { - return localVarFp.updateAsset(assetId, updateAssetDto, options).then((request) => request(axios, basePath)); + updateAsset(id: string, updateAssetDto: UpdateAssetDto, options?: any): AxiosPromise { + return localVarFp.updateAsset(id, updateAssetDto, options).then((request) => request(axios, basePath)); }, /** * @@ -6541,7 +6541,7 @@ export interface AssetApiDownloadFileRequest { * @type {string} * @memberof AssetApiDownloadFile */ - readonly assetId: string + readonly id: string /** * @@ -6653,7 +6653,7 @@ export interface AssetApiGetAssetByIdRequest { * @type {string} * @memberof AssetApiGetAssetById */ - readonly assetId: string + readonly id: string /** * @@ -6702,7 +6702,7 @@ export interface AssetApiGetAssetThumbnailRequest { * @type {string} * @memberof AssetApiGetAssetThumbnail */ - readonly assetId: string + readonly id: string /** * @@ -6807,7 +6807,7 @@ export interface AssetApiServeFileRequest { * @type {string} * @memberof AssetApiServeFile */ - readonly assetId: string + readonly id: string /** * @@ -6842,7 +6842,7 @@ export interface AssetApiUpdateAssetRequest { * @type {string} * @memberof AssetApiUpdateAsset */ - readonly assetId: string + readonly id: string /** * @@ -7038,7 +7038,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public downloadFile(requestParameters: AssetApiDownloadFileRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).downloadFile(requestParameters.assetId, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).downloadFile(requestParameters.id, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7092,7 +7092,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getAssetById(requestParameters: AssetApiGetAssetByIdRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetById(requestParameters.assetId, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getAssetById(requestParameters.id, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7145,7 +7145,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ 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)); + return AssetApiFp(this.configuration).getAssetThumbnail(requestParameters.id, requestParameters.format, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7220,7 +7220,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ 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)); + return AssetApiFp(this.configuration).serveFile(requestParameters.id, requestParameters.isThumb, requestParameters.isWeb, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7231,7 +7231,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public updateAsset(requestParameters: AssetApiUpdateAssetRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).updateAsset(requestParameters.assetId, requestParameters.updateAssetDto, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).updateAsset(requestParameters.id, requestParameters.updateAssetDto, options).then((request) => request(this.axios, this.basePath)); } /** 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 f4b6227e90..1270e2f1b1 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 @@ -87,7 +87,7 @@ describe('AlbumCard component', () => { expect(apiMock.assetApi.getAssetThumbnail).toHaveBeenCalledTimes(1); expect(apiMock.assetApi.getAssetThumbnail).toHaveBeenCalledWith( { - assetId: 'thumbnailIdOne', + id: 'thumbnailIdOne', format: ThumbnailFormat.Jpeg }, { responseType: 'blob' } diff --git a/web/src/lib/components/album-page/album-card.svelte b/web/src/lib/components/album-page/album-card.svelte index 0fc24ce34e..8249810ca6 100644 --- a/web/src/lib/components/album-page/album-card.svelte +++ b/web/src/lib/components/album-page/album-card.svelte @@ -37,7 +37,7 @@ const { data } = await api.assetApi.getAssetThumbnail( { - assetId: thubmnailId, + id: thubmnailId, format: ThumbnailFormat.Jpeg }, { diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte index 7cdf6683d3..2d153a3158 100644 --- a/web/src/lib/components/asset-viewer/asset-viewer.svelte +++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte @@ -138,7 +138,7 @@ $downloadAssets[imageFileName] = 0; const { data, status } = await api.assetApi.downloadFile( - { assetId, key }, + { id: assetId, key }, { responseType: 'blob', onDownloadProgress: (progressEvent) => { @@ -216,7 +216,7 @@ const toggleFavorite = async () => { const { data } = await api.assetApi.updateAsset({ - assetId: asset.id, + id: asset.id, updateAssetDto: { isFavorite: !asset.isFavorite } @@ -269,7 +269,7 @@ const toggleArchive = async () => { try { const { data } = await api.assetApi.updateAsset({ - assetId: asset.id, + id: asset.id, updateAssetDto: { isArchived: !asset.isArchived } diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte index 6656fcf6b5..c2257fb2e5 100644 --- a/web/src/lib/components/asset-viewer/detail-panel.svelte +++ b/web/src/lib/components/asset-viewer/detail-panel.svelte @@ -22,7 +22,7 @@ $: { // Get latest description from server if (asset.id) { - api.assetApi.getAssetById({ assetId: asset.id }).then((res) => { + api.assetApi.getAssetById({ id: asset.id }).then((res) => { people = res.data?.people || []; textarea.value = res.data?.exifInfo?.description || ''; }); @@ -66,7 +66,7 @@ dispatch('description-focus-out'); try { await api.assetApi.updateAsset({ - assetId: asset.id, + id: asset.id, updateAssetDto: { description: description } diff --git a/web/src/lib/components/asset-viewer/photo-viewer.svelte b/web/src/lib/components/asset-viewer/photo-viewer.svelte index 7422c1047a..a9cb7f0e6b 100644 --- a/web/src/lib/components/asset-viewer/photo-viewer.svelte +++ b/web/src/lib/components/asset-viewer/photo-viewer.svelte @@ -29,7 +29,7 @@ const loadAssetData = async () => { try { const { data } = await api.assetApi.serveFile( - { assetId: asset.id, isThumb: false, isWeb: true, key: publicSharedKey }, + { id: asset.id, isThumb: false, isWeb: true, key: publicSharedKey }, { responseType: 'blob' } 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 7c5e5f5982..9f485f6cc2 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({ assetId: asset.id, updateAssetDto: { isArchived } }); + api.assetApi.updateAsset({ id: asset.id, updateAssetDto: { isArchived } }); onAssetArchive(asset, isArchived); cnt = cnt + 1; 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 e7e768ebe4..7ce532444a 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({ assetId: asset.id, updateAssetDto: { isFavorite } }); + api.assetApi.updateAsset({ id: asset.id, updateAssetDto: { isFavorite } }); onAssetFavorite(asset, isFavorite); cnt = cnt + 1; } 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 6c1f7a7dca..fc9ab4806d 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({ id: assetId }); return data; };