High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(web): properly encode shared link slug (#25564)
Daniel Dietzler212c03ceff15
diff --git a/web/src/lib/services/shared-link.service.spec.ts b/web/src/lib/services/shared-link.service.spec.tsnew file mode 100644index 0000000000..891bdd7672--- /dev/null+++ b/web/src/lib/services/shared-link.service.spec.ts@@ -0,0 +1,21 @@+import { asUrl } from '$lib/services/shared-link.service';+import type { ServerConfigDto } from '@immich/sdk';+import { sharedLinkFactory } from '@test-data/factories/shared-link-factory';++describe('SharedLinkService', () => {+ beforeAll(() => {+ vi.mock(import('$lib/managers/server-config-manager.svelte'), () => ({+ serverConfigManager: {+ value: { externalDomain: 'http://localhost:2283' } as ServerConfigDto,+ init: vi.fn(),+ loadServerConfig: vi.fn(),+ },+ }));+ });++ describe('asUrl', () => {+ it('should properly encode characters in slug', () => {+ expect(asUrl(sharedLinkFactory.build({ slug: 'foo/bar' }))).toBe('http://localhost:2283/s/foo%2Fbar');+ });+ });+});diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.tsindex 9afaf5ce1b..fc4bbe11c0 100644--- a/web/src/lib/services/shared-link.service.ts+++ b/web/src/lib/services/shared-link.service.ts@@ -60,8 +60,10 @@ export const getSharedLinkActions = ($t: MessageFormatter, sharedLink: SharedLinreturn { Edit, Delete, Copy, ViewQrCode };};-const asUrl = (sharedLink: SharedLinkResponseDto) => {- const path = sharedLink.slug ? `s/${sharedLink.slug}` : `share/${sharedLink.key}`;+export const asUrl = (sharedLink: SharedLinkResponseDto) => {+ const path = sharedLink.slug+ ? `s/${encodeURIComponent(sharedLink.slug)}`+ : `share/${encodeURIComponent(sharedLink.key)}`;return new URL(path, serverConfigManager.value.externalDomain || globalThis.location.origin).href;};