c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-28 14:41:59 +00:00
Code Releases Activity

fix(web): auth on navigation from shared link to timeline (#12385)

Browse source
This commit is contained in:
Michel Heusschen 2024-09-06 15:15:48 +02:00 committed by GitHub
parent aa0097bde2
commit 9fc30d6bf6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
e2e/src/web/specs/shared-link.e2e-spec.ts
View file

@ -69,4 +69,15 @@ test.describe('Shared Links', () => {
await page.goto('/share/invalid');
await page.getByRole('heading', { name: 'Invalid share key' }).waitFor();
});
test('auth on navigation from shared link to timeline', async ({ context, page }) => {
await utils.setAuthCookies(context, admin.accessToken);
await page.goto(`/share/${sharedLink.key}`);
await page.getByRole('heading', { name: 'Test Album' }).waitFor();
await page.locator('a[href="/"]').click();
await page.waitForURL('/photos');
await page.locator(`[data-asset-id="${asset.id}"]`).waitFor();
});
});

2
web/src/lib/utils.ts
View file

@ -156,7 +156,7 @@ export const getJobName = derived(t, ($t) => {
let _key: string | undefined;
let _sharedLink: SharedLinkResponseDto | undefined;
export const setKey = (key: string) => (_key = key);
export const setKey = (key?: string) => (_key = key);
export const getKey = (): string | undefined => _key;
export const setSharedLink = (sharedLink: SharedLinkResponseDto) => (_sharedLink = sharedLink);
export const getSharedLink = (): SharedLinkResponseDto | undefined => _sharedLink;

2
web/src/routes/+layout.svelte
View file

@ -71,6 +71,8 @@
}
beforeNavigate(({ from, to }) => {
setKey(isSharedLinkRoute(to?.route.id) ? to?.params?.key : undefined);
if (isAssetViewerRoute(from) && isAssetViewerRoute(to)) {
return;
}