Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2026-04-19 15:28:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: redirect original (#27759)

Browse Source
This commit is contained in:
Daniel Dietzler 2026-04-15 15:43:09 +02:00 committed by GitHub
parent ed70e0febf
commit 603fc7401f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
open-api/immich-openapi-specs.json
View File

@ -4214,6 +4214,13 @@
"name": "size",
"required": false,
"in": "query",
"x-immich-history": [
{
"version": "v3",
"state": "Updated",
"description": "Specifying 'original' is deprecated. Use the original endpoint directly instead"
}
],
"schema": {
"$ref": "#/components/schemas/AssetMediaSize"
}

9
server/src/controllers/asset-media.controller.spec.ts
View File

@ -166,11 +166,16 @@ describe(AssetMediaController.name, () => {
});
// TODO figure out how to deal with `sendFile`
describe.skip('GET /assets/:id/thumbnail', () => {
it('should be an authenticated route', async () => {
describe('GET /assets/:id/thumbnail', () => {
it.skip('should be an authenticated route', async () => {
await request(ctx.getHttpServer()).get(`/assets/${factory.uuid()}/thumbnail`);
expect(ctx.authenticate).toHaveBeenCalled();
});
it('should redirect if size=original is requested', async () => {
const { status } = await request(ctx.getHttpServer()).get(`/assets/${factory.uuid()}/thumbnail?size=original`);
expect(status).toBe(302);
});
});
});
});

10
server/src/controllers/asset-media.controller.ts
View File

@ -126,6 +126,16 @@ export class AssetMediaController {
@Res() res: Response,
@Next() next: NextFunction,
) {
if (dto.size === AssetMediaSize.Original) {
this.logger.deprecate(
'Calling the thumbnail endpoint with size=original is deprecated. Use the :id/original endpoint instead',
);
const [_, reqSearch] = req.url.split('?');
const redirSearchParams = new URLSearchParams(reqSearch);
redirSearchParams.delete('size');
return res.redirect('original' + '?' + redirSearchParams.toString());
}
const viewThumbnailRes = await this.service.viewThumbnail(auth, id, dto);
if (viewThumbnailRes instanceof ImmichFileResponse) {

7
server/src/dtos/asset-media.dto.ts
View File

@ -1,4 +1,5 @@
import { createZodDto } from 'nestjs-zod';
import { HistoryBuilder } from 'src/decorators';
import { AssetMetadataUpsertItemSchema } from 'src/dtos/asset.dto';
import { AssetVisibilitySchema } from 'src/enum';
import { isoDatetimeToDate, JsonParsed, stringToBool } from 'src/validation';
@ -19,7 +20,11 @@ const AssetMediaSizeSchema = z.enum(AssetMediaSize).describe('Asset media size')
const AssetMediaOptionsSchema = z
.object({
size: AssetMediaSizeSchema.optional(),
size: AssetMediaSizeSchema.optional().meta(
new HistoryBuilder()
.updated('v3', "Specifying 'original' is deprecated. Use the original endpoint directly instead")
.getExtensions(),
),
edited: stringToBool.default(false).optional().describe('Return edited asset if available'),
})
.meta({ id: 'AssetMediaOptionsDto' });