From 62fc5b3c7db526856832a778fe877305a51e34d0 Mon Sep 17 00:00:00 2001 From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> Date: Sat, 3 May 2025 00:41:42 +0200 Subject: [PATCH 01/66] refactor: introduce modal manager (#18039) --- web/package-lock.json | 8 +- web/package.json | 2 +- web/src/app.css | 3 +- .../components/forms/create-user-form.svelte | 126 ++++++++------- .../components/forms/edit-user-form.svelte | 148 +++++++++--------- .../shared-components/change-location.svelte | 2 +- .../dialog/confirm-dialog.svelte | 35 +++-- .../lib/forms/password-reset-success.svelte | 43 +++++ web/src/lib/managers/modal-manager.svelte.ts | 33 ++++ .../routes/admin/user-management/+page.svelte | 99 +++--------- web/tailwind.config.js | 2 +- 11 files changed, 265 insertions(+), 236 deletions(-) create mode 100644 web/src/lib/forms/password-reset-success.svelte create mode 100644 web/src/lib/managers/modal-manager.svelte.ts diff --git a/web/package-lock.json b/web/package-lock.json index c76dd64840..75c55aa779 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@formatjs/icu-messageformat-parser": "^2.9.8", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.18.1", + "@immich/ui": "^0.19.0", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.11.5", @@ -1320,9 +1320,9 @@ "link": true }, "node_modules/@immich/ui": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.18.1.tgz", - "integrity": "sha512-XWWO6OTfH3MektyxCn0hWefZyOGyWwwx/2zHinuShpxTHSyfveJ4mOkFP8DkyMz0dnvJ1EfdkPBMkld3y5R/Hw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.19.0.tgz", + "integrity": "sha512-XVjSUoQVIoe83pxM4q8kmlejb2xep/TZEfoGbasI7takEGKNiWEyXr5eZaXZCSVgq78fcNRr4jyWz290ZAXh7A==", "license": "GNU Affero General Public License version 3", "dependencies": { "@mdi/js": "^7.4.47", diff --git a/web/package.json b/web/package.json index 9aa9bee6bc..7c5a0147bb 100644 --- a/web/package.json +++ b/web/package.json @@ -27,7 +27,7 @@ "dependencies": { "@formatjs/icu-messageformat-parser": "^2.9.8", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.18.1", + "@immich/ui": "^0.19.0", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.11.5", diff --git a/web/src/app.css b/web/src/app.css index 2c8d150b4f..61759eb1b0 100644 --- a/web/src/app.css +++ b/web/src/app.css @@ -8,7 +8,6 @@ --immich-primary: 66 80 175; --immich-bg: 255 255 255; --immich-fg: 0 0 0; - --immich-gray: 246 246 244; --immich-error: 229 115 115; --immich-success: 129 199 132; --immich-warning: 255 183 77; @@ -33,6 +32,7 @@ --immich-ui-warning: 255 170 0; --immich-ui-info: 14 165 233; --immich-ui-default-border: 209 213 219; + --immich-ui-gray: 246 246 246; } .dark { @@ -45,6 +45,7 @@ --immich-ui-warning: 255 170 0; --immich-ui-info: 14 165 233; --immich-ui-default-border: 55 65 81; + --immich-ui-gray: 33 33 33; } } diff --git a/web/src/lib/components/forms/create-user-form.svelte b/web/src/lib/components/forms/create-user-form.svelte index 83b3154d4b..34e498ce1c 100644 --- a/web/src/lib/components/forms/create-user-form.svelte +++ b/web/src/lib/components/forms/create-user-form.svelte @@ -1,21 +1,29 @@ -
- - {#if error} - - {/if} - - {#if success} -

{$t('new_user_created')}

- {/if} - - - - - - - {#if $featureFlags.email} - - - + + + + {#if error} + {/if} - - - + {#if success} +

{$t('new_user_created')}

+ {/if} - - - {passwordMismatchMessage} - + + + + - - - - - - - - - - - {#if quotaSizeWarning} - {$t('errors.quota_higher_than_disk_size')} + {#if $featureFlags.email} + + + {/if} - - - {#snippet stickyBottom()} - - - {/snippet} - -
+ + + + + + + {passwordMismatchMessage} + + + + + + + + + + + + + {#if quotaSizeWarning} + {$t('errors.quota_higher_than_disk_size')} + {/if} + + + + + + +
+ + +
+ + diff --git a/web/src/lib/components/forms/edit-user-form.svelte b/web/src/lib/components/forms/edit-user-form.svelte index ab914e6430..d2f56a974a 100644 --- a/web/src/lib/components/forms/edit-user-form.svelte +++ b/web/src/lib/components/forms/edit-user-form.svelte @@ -1,34 +1,26 @@ - -
-
- - + + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +

+ {$t('admin.note_apply_storage_label_previous_assets')} + + {$t('admin.storage_template_migration_job')} + +

+
+ + + + +
+ {#if canResetPassword} + + {/if} +
- -
- - -
- -
- - -
- -
- - - -

- {$t('admin.note_apply_storage_label_previous_assets')} - - {$t('admin.storage_template_migration_job')} - -

-
- - - {#snippet stickyBottom()} - {#if canResetPassword} - - {/if} - - {/snippet} - + + diff --git a/web/src/lib/components/shared-components/change-location.svelte b/web/src/lib/components/shared-components/change-location.svelte index 1987596026..3539945911 100644 --- a/web/src/lib/components/shared-components/change-location.svelte +++ b/web/src/lib/components/shared-components/change-location.svelte @@ -115,7 +115,7 @@ (confirmed ? handleConfirm() : onCancel())} > {#snippet promptSnippet()} diff --git a/web/src/lib/components/shared-components/dialog/confirm-dialog.svelte b/web/src/lib/components/shared-components/dialog/confirm-dialog.svelte index 32f4b6a8f4..75c07aebc6 100644 --- a/web/src/lib/components/shared-components/dialog/confirm-dialog.svelte +++ b/web/src/lib/components/shared-components/dialog/confirm-dialog.svelte @@ -1,8 +1,7 @@ - onClose(false)} {width}> -
+ onClose(false)} {size} class="bg-light text-dark"> + {#if promptSnippet}{@render promptSnippet()}{:else}

{prompt}

{/if} -
+ - {#snippet stickyBottom()} - {#if !hideCancelButton} - + {/if} + - {/if} - - {/snippet} - +
+ + diff --git a/web/src/lib/forms/password-reset-success.svelte b/web/src/lib/forms/password-reset-success.svelte new file mode 100644 index 0000000000..7091047eb8 --- /dev/null +++ b/web/src/lib/forms/password-reset-success.svelte @@ -0,0 +1,43 @@ + + + + {#snippet promptSnippet()} +
+ {$t('admin.user_password_has_been_reset')} + +
+ {newPassword} + copyToClipboard(newPassword)} + title={$t('copy_password')} + aria-label={$t('copy_password')} + /> +
+ + {$t('admin.user_password_reset_description')} +
+ {/snippet} + diff --git a/web/src/lib/managers/modal-manager.svelte.ts b/web/src/lib/managers/modal-manager.svelte.ts new file mode 100644 index 0000000000..c8cefe8a58 --- /dev/null +++ b/web/src/lib/managers/modal-manager.svelte.ts @@ -0,0 +1,33 @@ +import ConfirmDialog from '$lib/components/shared-components/dialog/confirm-dialog.svelte'; +import { mount, unmount, type Component, type ComponentProps } from 'svelte'; + +type OnCloseData = T extends { onClose: (data: infer R) => void } ? R : never; +// TODO make `props` optional if component only has `onClose` +// type OptionalIfEmpty = keyof T extends never ? undefined : T; + +class ModalManager { + open>(Component: Component, props: Omit) { + return new Promise((resolve) => { + let modal: object = {}; + + const onClose = async (data: K) => { + await unmount(modal); + resolve(data); + }; + + modal = mount(Component, { + target: document.body, + props: { + ...(props as T), + onClose, + }, + }); + }); + } + + openDialog(options: Omit, 'onClose'>) { + return this.open(ConfirmDialog, options); + } +} + +export const modalManager = new ModalManager(); diff --git a/web/src/routes/admin/user-management/+page.svelte b/web/src/routes/admin/user-management/+page.svelte index 8b96c6c922..42d1404177 100644 --- a/web/src/routes/admin/user-management/+page.svelte +++ b/web/src/routes/admin/user-management/+page.svelte @@ -6,20 +6,20 @@ import CreateUserForm from '$lib/components/forms/create-user-form.svelte'; import EditUserForm from '$lib/components/forms/edit-user-form.svelte'; import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte'; - import ConfirmDialog from '$lib/components/shared-components/dialog/confirm-dialog.svelte'; import { NotificationType, notificationController, } from '$lib/components/shared-components/notification/notification'; + import PasswordResetSuccess from '$lib/forms/password-reset-success.svelte'; + import { modalManager } from '$lib/managers/modal-manager.svelte'; import { locale } from '$lib/stores/preferences.store'; - import { featureFlags, serverConfig } from '$lib/stores/server-config.store'; + import { serverConfig } from '$lib/stores/server-config.store'; import { user } from '$lib/stores/user.store'; import { websocketEvents } from '$lib/stores/websocket'; - import { copyToClipboard } from '$lib/utils'; import { getByteUnitString } from '$lib/utils/byte-units'; import { UserStatus, searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk'; - import { Button, Code, IconButton, Text } from '@immich/ui'; - import { mdiContentCopy, mdiDeleteRestore, mdiInfinity, mdiPencilOutline, mdiTrashCanOutline } from '@mdi/js'; + import { Button, IconButton } from '@immich/ui'; + import { mdiDeleteRestore, mdiInfinity, mdiPencilOutline, mdiTrashCanOutline } from '@mdi/js'; import { DateTime } from 'luxon'; import { onMount } from 'svelte'; import { t } from 'svelte-i18n'; @@ -32,13 +32,9 @@ let { data }: Props = $props(); let allUsers: UserAdminResponseDto[] = $state([]); - let shouldShowEditUserForm = $state(false); - let shouldShowCreateUserForm = $state(false); - let shouldShowPasswordResetSuccess = $state(false); let shouldShowDeleteConfirmDialog = $state(false); let shouldShowRestoreDialog = $state(false); let selectedUser = $state(); - let newPassword = $state(''); const refresh = async () => { allUsers = await searchUsersAdmin({ withDeleted: true }); @@ -65,25 +61,23 @@ return DateTime.fromISO(deletedAt).plus({ days: $serverConfig.userDeleteDelay }).toJSDate(); }; - const onUserCreated = async () => { + const handleCreate = async () => { + await modalManager.open(CreateUserForm, {}); await refresh(); - shouldShowCreateUserForm = false; }; - const editUserHandler = (user: UserAdminResponseDto) => { - selectedUser = user; - shouldShowEditUserForm = true; - }; - - const onEditUserSuccess = async () => { - await refresh(); - shouldShowEditUserForm = false; - }; - - const onEditPasswordSuccess = async () => { - await refresh(); - shouldShowEditUserForm = false; - shouldShowPasswordResetSuccess = true; + const handleEdit = async (dto: UserAdminResponseDto) => { + const result = await modalManager.open(EditUserForm, { user: dto, canResetPassword: dto.id !== $user.id }); + switch (result?.action) { + case 'resetPassword': { + await modalManager.open(PasswordResetSuccess, { newPassword: result.data }); + break; + } + case 'update': { + await refresh(); + break; + } + } }; const deleteUserHandler = (user: UserAdminResponseDto) => { @@ -110,26 +104,6 @@
- {#if shouldShowCreateUserForm} - (shouldShowCreateUserForm = false)} - onClose={() => (shouldShowCreateUserForm = false)} - oauthEnabled={$featureFlags.oauth} - /> - {/if} - - {#if shouldShowEditUserForm && selectedUser} - (shouldShowEditUserForm = false)} - /> - {/if} - {#if shouldShowDeleteConfirmDialog && selectedUser} {/if} - {#if shouldShowPasswordResetSuccess} - (shouldShowPasswordResetSuccess = false)} - hideCancelButton={true} - confirmColor="success" - > - {#snippet promptSnippet()} -
- {$t('admin.user_password_has_been_reset')} - -
- {newPassword} - copyToClipboard(newPassword)} - title={$t('copy_password')} - aria-label={$t('copy_password')} - /> -
- - {$t('admin.user_password_reset_description')} -
- {/snippet} - - {/if} - editUserHandler(immichUser)} + onclick={() => handleEdit(immichUser)} aria-label={$t('edit_user')} /> {#if immichUser.id !== $user.id} @@ -256,7 +199,7 @@ {/if}
- +
diff --git a/web/tailwind.config.js b/web/tailwind.config.js index 95611d486d..2e13e5997d 100644 --- a/web/tailwind.config.js +++ b/web/tailwind.config.js @@ -36,7 +36,7 @@ export default { danger: 'rgb(var(--immich-ui-danger) / )', warning: 'rgb(var(--immich-ui-warning) / )', info: 'rgb(var(--immich-ui-info) / )', - subtle: 'rgb(var(--immich-gray) / )', + subtle: 'rgb(var(--immich-ui-gray) / )', }, borderColor: ({ theme }) => ({ ...theme('colors'), From ea9f11bf3922907b509e233a015dd3ac247de090 Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Sat, 3 May 2025 09:39:44 -0400 Subject: [PATCH 02/66] refactor: controller tests (#18035) * feat: controller unit tests * refactor: controller tests --- e2e/src/api/specs/activity.e2e-spec.ts | 70 ------ e2e/src/api/specs/album.e2e-spec.ts | 72 +------ e2e/src/api/specs/api-key.e2e-spec.ts | 57 +---- e2e/src/api/specs/asset.e2e-spec.ts | 161 -------------- e2e/src/api/specs/search.e2e-spec.ts | 99 --------- .../controllers/activity.controller.spec.ts | 81 +++++++ .../src/controllers/album.controller.spec.ts | 86 ++++++++ .../controllers/api-key.controller.spec.ts | 73 +++++++ server/src/controllers/app.controller.spec.ts | 49 +++++ .../asset-media.controller.spec.ts | 137 ++++++++++++ .../src/controllers/asset.controller.spec.ts | 118 ++++++++++ .../src/controllers/auth.controller.spec.ts | 60 ++++++ .../notification.controller.spec.ts | 64 ++++++ .../src/controllers/search.controller.spec.ts | 201 ++++++++++++++++++ .../src/controllers/server.controller.spec.ts | 28 +++ .../src/controllers/user.controller.spec.ts | 77 +++++++ server/test/medium/responses.ts | 1 - .../specs/controllers/auth.controller.spec.ts | 60 ------ .../notification.controller.spec.ts | 86 -------- .../specs/controllers/user.controller.spec.ts | 100 --------- server/test/medium/utils.ts | 100 --------- server/test/small.factory.ts | 7 + server/test/utils.ts | 53 ++++- 23 files changed, 1035 insertions(+), 805 deletions(-) create mode 100644 server/src/controllers/activity.controller.spec.ts create mode 100644 server/src/controllers/album.controller.spec.ts create mode 100644 server/src/controllers/api-key.controller.spec.ts create mode 100644 server/src/controllers/app.controller.spec.ts create mode 100644 server/src/controllers/asset-media.controller.spec.ts create mode 100644 server/src/controllers/asset.controller.spec.ts create mode 100644 server/src/controllers/auth.controller.spec.ts create mode 100644 server/src/controllers/notification.controller.spec.ts create mode 100644 server/src/controllers/search.controller.spec.ts create mode 100644 server/src/controllers/server.controller.spec.ts create mode 100644 server/src/controllers/user.controller.spec.ts delete mode 100644 server/test/medium/specs/controllers/auth.controller.spec.ts delete mode 100644 server/test/medium/specs/controllers/notification.controller.spec.ts delete mode 100644 server/test/medium/specs/controllers/user.controller.spec.ts delete mode 100644 server/test/medium/utils.ts diff --git a/e2e/src/api/specs/activity.e2e-spec.ts b/e2e/src/api/specs/activity.e2e-spec.ts index ee75d6070b..70c32313f1 100644 --- a/e2e/src/api/specs/activity.e2e-spec.ts +++ b/e2e/src/api/specs/activity.e2e-spec.ts @@ -46,38 +46,6 @@ describe('/activities', () => { }); describe('GET /activities', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/activities'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - it('should require an albumId', async () => { - const { status, body } = await request(app) - .get('/activities') - .set('Authorization', `Bearer ${admin.accessToken}`); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID']))); - }); - - it('should reject an invalid albumId', async () => { - const { status, body } = await request(app) - .get('/activities') - .query({ albumId: uuidDto.invalid }) - .set('Authorization', `Bearer ${admin.accessToken}`); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID']))); - }); - - it('should reject an invalid assetId', async () => { - const { status, body } = await request(app) - .get('/activities') - .query({ albumId: uuidDto.notFound, assetId: uuidDto.invalid }) - .set('Authorization', `Bearer ${admin.accessToken}`); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['assetId must be a UUID']))); - }); - it('should start off empty', async () => { const { status, body } = await request(app) .get('/activities') @@ -192,30 +160,6 @@ describe('/activities', () => { }); describe('POST /activities', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).post('/activities'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - it('should require an albumId', async () => { - const { status, body } = await request(app) - .post('/activities') - .set('Authorization', `Bearer ${admin.accessToken}`) - .send({ albumId: uuidDto.invalid }); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID']))); - }); - - it('should require a comment when type is comment', async () => { - const { status, body } = await request(app) - .post('/activities') - .set('Authorization', `Bearer ${admin.accessToken}`) - .send({ albumId: uuidDto.notFound, type: 'comment', comment: null }); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest(['comment must be a string', 'comment should not be empty'])); - }); - it('should add a comment to an album', async () => { const { status, body } = await request(app) .post('/activities') @@ -330,20 +274,6 @@ describe('/activities', () => { }); describe('DELETE /activities/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).delete(`/activities/${uuidDto.notFound}`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - it('should require a valid uuid', async () => { - const { status, body } = await request(app) - .delete(`/activities/${uuidDto.invalid}`) - .set('Authorization', `Bearer ${admin.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest(['id must be a UUID'])); - }); - it('should remove a comment from an album', async () => { const reaction = await createActivity({ albumId: album.id, diff --git a/e2e/src/api/specs/album.e2e-spec.ts b/e2e/src/api/specs/album.e2e-spec.ts index cede49f469..65a94122fa 100644 --- a/e2e/src/api/specs/album.e2e-spec.ts +++ b/e2e/src/api/specs/album.e2e-spec.ts @@ -9,7 +9,7 @@ import { LoginResponseDto, SharedLinkType, } from '@immich/sdk'; -import { createUserDto, uuidDto } from 'src/fixtures'; +import { createUserDto } from 'src/fixtures'; import { errorDto } from 'src/responses'; import { app, asBearerAuth, utils } from 'src/utils'; import request from 'supertest'; @@ -128,28 +128,6 @@ describe('/albums', () => { }); describe('GET /albums', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/albums'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - it('should reject an invalid shared param', async () => { - const { status, body } = await request(app) - .get('/albums?shared=invalid') - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest(['shared must be a boolean value'])); - }); - - it('should reject an invalid assetId param', async () => { - const { status, body } = await request(app) - .get('/albums?assetId=invalid') - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest(['assetId must be a UUID'])); - }); - it("should not show other users' favorites", async () => { const { status, body } = await request(app) .get(`/albums/${user1Albums[0].id}?withoutAssets=false`) @@ -323,12 +301,6 @@ describe('/albums', () => { }); describe('GET /albums/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get(`/albums/${user1Albums[0].id}`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should return album info for own album', async () => { const { status, body } = await request(app) .get(`/albums/${user1Albums[0].id}?withoutAssets=false`) @@ -421,12 +393,6 @@ describe('/albums', () => { }); describe('GET /albums/statistics', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/albums/statistics'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should return total count of albums the user has access to', async () => { const { status, body } = await request(app) .get('/albums/statistics') @@ -438,12 +404,6 @@ describe('/albums', () => { }); describe('POST /albums', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).post('/albums').send({ albumName: 'New album' }); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should create an album', async () => { const { status, body } = await request(app) .post('/albums') @@ -471,12 +431,6 @@ describe('/albums', () => { }); describe('PUT /albums/:id/assets', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).put(`/albums/${user1Albums[0].id}/assets`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should be able to add own asset to own album', async () => { const asset = await utils.createAsset(user1.accessToken); const { status, body } = await request(app) @@ -526,14 +480,6 @@ describe('/albums', () => { }); describe('PATCH /albums/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(app) - .patch(`/albums/${uuidDto.notFound}`) - .send({ albumName: 'New album name' }); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should update an album', async () => { const album = await utils.createAlbum(user1.accessToken, { albumName: 'New album', @@ -576,15 +522,6 @@ describe('/albums', () => { }); describe('DELETE /albums/:id/assets', () => { - it('should require authentication', async () => { - const { status, body } = await request(app) - .delete(`/albums/${user1Albums[0].id}/assets`) - .send({ ids: [user1Asset1.id] }); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should require authorization', async () => { const { status, body } = await request(app) .delete(`/albums/${user1Albums[1].id}/assets`) @@ -679,13 +616,6 @@ describe('/albums', () => { }); }); - it('should require authentication', async () => { - const { status, body } = await request(app).put(`/albums/${user1Albums[0].id}/users`).send({ sharedUserIds: [] }); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should be able to add user to own album', async () => { const { status, body } = await request(app) .put(`/albums/${album.id}/users`) diff --git a/e2e/src/api/specs/api-key.e2e-spec.ts b/e2e/src/api/specs/api-key.e2e-spec.ts index 1748276625..e86edddcdf 100644 --- a/e2e/src/api/specs/api-key.e2e-spec.ts +++ b/e2e/src/api/specs/api-key.e2e-spec.ts @@ -1,5 +1,5 @@ import { LoginResponseDto, Permission, createApiKey } from '@immich/sdk'; -import { createUserDto, uuidDto } from 'src/fixtures'; +import { createUserDto } from 'src/fixtures'; import { errorDto } from 'src/responses'; import { app, asBearerAuth, utils } from 'src/utils'; import request from 'supertest'; @@ -24,12 +24,6 @@ describe('/api-keys', () => { }); describe('POST /api-keys', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).post('/api-keys').send({ name: 'API Key' }); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should not work without permission', async () => { const { secret } = await create(user.accessToken, [Permission.ApiKeyRead]); const { status, body } = await request(app).post('/api-keys').set('x-api-key', secret).send({ name: 'API Key' }); @@ -99,12 +93,6 @@ describe('/api-keys', () => { }); describe('GET /api-keys', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/api-keys'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should start off empty', async () => { const { status, body } = await request(app).get('/api-keys').set('Authorization', `Bearer ${admin.accessToken}`); expect(body).toEqual([]); @@ -125,12 +113,6 @@ describe('/api-keys', () => { }); describe('GET /api-keys/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get(`/api-keys/${uuidDto.notFound}`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should require authorization', async () => { const { apiKey } = await create(user.accessToken, [Permission.All]); const { status, body } = await request(app) @@ -140,14 +122,6 @@ describe('/api-keys', () => { expect(body).toEqual(errorDto.badRequest('API Key not found')); }); - it('should require a valid uuid', async () => { - const { status, body } = await request(app) - .get(`/api-keys/${uuidDto.invalid}`) - .set('Authorization', `Bearer ${admin.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest(['id must be a UUID'])); - }); - it('should get api key details', async () => { const { apiKey } = await create(user.accessToken, [Permission.All]); const { status, body } = await request(app) @@ -165,12 +139,6 @@ describe('/api-keys', () => { }); describe('PUT /api-keys/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).put(`/api-keys/${uuidDto.notFound}`).send({ name: 'new name' }); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should require authorization', async () => { const { apiKey } = await create(user.accessToken, [Permission.All]); const { status, body } = await request(app) @@ -181,15 +149,6 @@ describe('/api-keys', () => { expect(body).toEqual(errorDto.badRequest('API Key not found')); }); - it('should require a valid uuid', async () => { - const { status, body } = await request(app) - .put(`/api-keys/${uuidDto.invalid}`) - .send({ name: 'new name' }) - .set('Authorization', `Bearer ${admin.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest(['id must be a UUID'])); - }); - it('should update api key details', async () => { const { apiKey } = await create(user.accessToken, [Permission.All]); const { status, body } = await request(app) @@ -208,12 +167,6 @@ describe('/api-keys', () => { }); describe('DELETE /api-keys/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).delete(`/api-keys/${uuidDto.notFound}`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should require authorization', async () => { const { apiKey } = await create(user.accessToken, [Permission.All]); const { status, body } = await request(app) @@ -223,14 +176,6 @@ describe('/api-keys', () => { expect(body).toEqual(errorDto.badRequest('API Key not found')); }); - it('should require a valid uuid', async () => { - const { status, body } = await request(app) - .delete(`/api-keys/${uuidDto.invalid}`) - .set('Authorization', `Bearer ${admin.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest(['id must be a UUID'])); - }); - it('should delete an api key', async () => { const { apiKey } = await create(user.accessToken, [Permission.All]); const { status } = await request(app) diff --git a/e2e/src/api/specs/asset.e2e-spec.ts b/e2e/src/api/specs/asset.e2e-spec.ts index 01129b3299..f5cf78bb8a 100644 --- a/e2e/src/api/specs/asset.e2e-spec.ts +++ b/e2e/src/api/specs/asset.e2e-spec.ts @@ -22,24 +22,6 @@ import { app, asBearerAuth, tempDir, TEN_TIMES, testAssetDir, utils } from 'src/ import request from 'supertest'; import { afterAll, beforeAll, describe, expect, it } from 'vitest'; -const makeUploadDto = (options?: { omit: string }): Record => { - const dto: Record = { - deviceAssetId: 'example-image', - deviceId: 'TEST', - fileCreatedAt: new Date().toISOString(), - fileModifiedAt: new Date().toISOString(), - isFavorite: 'testing', - duration: '0:00:00.000000', - }; - - const omit = options?.omit; - if (omit) { - delete dto[omit]; - } - - return dto; -}; - const locationAssetFilepath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`; const ratingAssetFilepath = `${testAssetDir}/metadata/rating/mongolels.jpg`; const facesAssetFilepath = `${testAssetDir}/metadata/faces/portrait.jpg`; @@ -160,13 +142,6 @@ describe('/asset', () => { }); describe('GET /assets/:id/original', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get(`/assets/${uuidDto.notFound}/original`); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should download the file', async () => { const response = await request(app) .get(`/assets/${user1Assets[0].id}/original`) @@ -178,20 +153,6 @@ describe('/asset', () => { }); describe('GET /assets/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get(`/assets/${uuidDto.notFound}`); - expect(body).toEqual(errorDto.unauthorized); - expect(status).toBe(401); - }); - - it('should require a valid id', async () => { - const { status, body } = await request(app) - .get(`/assets/${uuidDto.invalid}`) - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest(['id must be a UUID'])); - }); - it('should require access', async () => { const { status, body } = await request(app) .get(`/assets/${user2Assets[0].id}`) @@ -354,13 +315,6 @@ describe('/asset', () => { }); describe('GET /assets/statistics', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/assets/statistics'); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should return stats of all assets', async () => { const { status, body } = await request(app) .get('/assets/statistics') @@ -425,13 +379,6 @@ describe('/asset', () => { await utils.waitForQueueFinish(admin.accessToken, 'thumbnailGeneration'); }); - it('should require authentication', async () => { - const { status, body } = await request(app).get('/assets/random'); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it.each(TEN_TIMES)('should return 1 random assets', async () => { const { status, body } = await request(app) .get('/assets/random') @@ -467,14 +414,6 @@ describe('/asset', () => { expect(status).toBe(200); expect(body).toEqual([expect.objectContaining({ id: user2Assets[0].id })]); }); - - it('should return error', async () => { - const { status } = await request(app) - .get('/assets/random?count=ABC') - .set('Authorization', `Bearer ${user1.accessToken}`); - - expect(status).toBe(400); - }); }); describe('PUT /assets/:id', () => { @@ -619,28 +558,6 @@ describe('/asset', () => { expect(status).toEqual(200); }); - it('should reject invalid gps coordinates', async () => { - for (const test of [ - { latitude: 12 }, - { longitude: 12 }, - { latitude: 12, longitude: 'abc' }, - { latitude: 'abc', longitude: 12 }, - { latitude: null, longitude: 12 }, - { latitude: 12, longitude: null }, - { latitude: 91, longitude: 12 }, - { latitude: -91, longitude: 12 }, - { latitude: 12, longitude: -181 }, - { latitude: 12, longitude: 181 }, - ]) { - const { status, body } = await request(app) - .put(`/assets/${user1Assets[0].id}`) - .send(test) - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest()); - } - }); - it('should update gps data', async () => { const { status, body } = await request(app) .put(`/assets/${user1Assets[0].id}`) @@ -712,17 +629,6 @@ describe('/asset', () => { expect(status).toEqual(200); }); - it('should reject invalid rating', async () => { - for (const test of [{ rating: 7 }, { rating: 3.5 }, { rating: null }]) { - const { status, body } = await request(app) - .put(`/assets/${user1Assets[0].id}`) - .send(test) - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest()); - } - }); - it('should return tagged people', async () => { const { status, body } = await request(app) .put(`/assets/${user1Assets[0].id}`) @@ -746,25 +652,6 @@ describe('/asset', () => { }); describe('DELETE /assets', () => { - it('should require authentication', async () => { - const { status, body } = await request(app) - .delete(`/assets`) - .send({ ids: [uuidDto.notFound] }); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - it('should require a valid uuid', async () => { - const { status, body } = await request(app) - .delete(`/assets`) - .send({ ids: [uuidDto.invalid] }) - .set('Authorization', `Bearer ${admin.accessToken}`); - - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID'])); - }); - it('should throw an error when the id is not found', async () => { const { status, body } = await request(app) .delete(`/assets`) @@ -877,13 +764,6 @@ describe('/asset', () => { }); describe('GET /assets/:id/thumbnail', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get(`/assets/${locationAsset.id}/thumbnail`); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should not include gps data for webp thumbnails', async () => { await utils.waitForWebsocketEvent({ event: 'assetUpload', @@ -919,13 +799,6 @@ describe('/asset', () => { }); describe('GET /assets/:id/original', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get(`/assets/${locationAsset.id}/original`); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should download the original', async () => { const { status, body, type } = await request(app) .get(`/assets/${locationAsset.id}/original`) @@ -946,43 +819,9 @@ describe('/asset', () => { }); }); - describe('PUT /assets', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).put('/assets'); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - }); - describe('POST /assets', () => { beforeAll(setupTests, 30_000); - it('should require authentication', async () => { - const { status, body } = await request(app).post(`/assets`); - expect(body).toEqual(errorDto.unauthorized); - expect(status).toBe(401); - }); - - it.each([ - { should: 'require `deviceAssetId`', dto: { ...makeUploadDto({ omit: 'deviceAssetId' }) } }, - { should: 'require `deviceId`', dto: { ...makeUploadDto({ omit: 'deviceId' }) } }, - { should: 'require `fileCreatedAt`', dto: { ...makeUploadDto({ omit: 'fileCreatedAt' }) } }, - { should: 'require `fileModifiedAt`', dto: { ...makeUploadDto({ omit: 'fileModifiedAt' }) } }, - { should: 'require `duration`', dto: { ...makeUploadDto({ omit: 'duration' }) } }, - { should: 'throw if `isFavorite` is not a boolean', dto: { ...makeUploadDto(), isFavorite: 'not-a-boolean' } }, - { should: 'throw if `isVisible` is not a boolean', dto: { ...makeUploadDto(), isVisible: 'not-a-boolean' } }, - { should: 'throw if `isArchived` is not a boolean', dto: { ...makeUploadDto(), isArchived: 'not-a-boolean' } }, - ])('should $should', async ({ dto }) => { - const { status, body } = await request(app) - .post('/assets') - .set('Authorization', `Bearer ${user1.accessToken}`) - .attach('assetData', makeRandomImage(), 'example.png') - .field(dto); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest()); - }); - const tests = [ { input: 'formats/avif/8bit-sRGB.avif', diff --git a/e2e/src/api/specs/search.e2e-spec.ts b/e2e/src/api/specs/search.e2e-spec.ts index 1031390ee9..23f8c65fa8 100644 --- a/e2e/src/api/specs/search.e2e-spec.ts +++ b/e2e/src/api/specs/search.e2e-spec.ts @@ -3,7 +3,6 @@ import { DateTime } from 'luxon'; import { readFile } from 'node:fs/promises'; import { join } from 'node:path'; import { Socket } from 'socket.io-client'; -import { errorDto } from 'src/responses'; import { app, asBearerAuth, TEN_TIMES, testAssetDir, utils } from 'src/utils'; import request from 'supertest'; import { afterAll, beforeAll, describe, expect, it } from 'vitest'; @@ -141,65 +140,6 @@ describe('/search', () => { }); describe('POST /search/metadata', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).post('/search/metadata'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - const badTests = [ - { - should: 'should reject page as a string', - dto: { page: 'abc' }, - expected: ['page must not be less than 1', 'page must be an integer number'], - }, - { - should: 'should reject page as a decimal', - dto: { page: 1.5 }, - expected: ['page must be an integer number'], - }, - { - should: 'should reject page as a negative number', - dto: { page: -10 }, - expected: ['page must not be less than 1'], - }, - { - should: 'should reject page as 0', - dto: { page: 0 }, - expected: ['page must not be less than 1'], - }, - { - should: 'should reject size as a string', - dto: { size: 'abc' }, - expected: [ - 'size must not be greater than 1000', - 'size must not be less than 1', - 'size must be an integer number', - ], - }, - { - should: 'should reject an invalid size', - dto: { size: -1.5 }, - expected: ['size must not be less than 1', 'size must be an integer number'], - }, - ...['isArchived', 'isFavorite', 'isEncoded', 'isOffline', 'isMotion', 'isVisible'].map((value) => ({ - should: `should reject ${value} not a boolean`, - dto: { [value]: 'immich' }, - expected: [`${value} must be a boolean value`], - })), - ]; - - for (const { should, dto, expected } of badTests) { - it(should, async () => { - const { status, body } = await request(app) - .post('/search/metadata') - .set('Authorization', `Bearer ${admin.accessToken}`) - .send(dto); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest(expected)); - }); - } - const searchTests = [ { should: 'should get my assets', @@ -454,14 +394,6 @@ describe('/search', () => { } }); - describe('POST /search/smart', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).post('/search/smart'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - }); - describe('POST /search/random', () => { beforeAll(async () => { await Promise.all([ @@ -476,13 +408,6 @@ describe('/search', () => { await utils.waitForQueueFinish(admin.accessToken, 'thumbnailGeneration'); }); - it('should require authentication', async () => { - const { status, body } = await request(app).post('/search/random').send({ size: 1 }); - - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it.each(TEN_TIMES)('should return 1 random assets', async () => { const { status, body } = await request(app) .post('/search/random') @@ -512,12 +437,6 @@ describe('/search', () => { }); describe('GET /search/explore', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/search/explore'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should get explore data', async () => { const { status, body } = await request(app) .get('/search/explore') @@ -528,12 +447,6 @@ describe('/search', () => { }); describe('GET /search/places', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/search/places'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should get relevant places', async () => { const name = 'Paris'; @@ -552,12 +465,6 @@ describe('/search', () => { }); describe('GET /search/cities', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/search/cities'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should get all cities', async () => { const { status, body } = await request(app) .get('/search/cities') @@ -576,12 +483,6 @@ describe('/search', () => { }); describe('GET /search/suggestions', () => { - it('should require authentication', async () => { - const { status, body } = await request(app).get('/search/suggestions'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - it('should get suggestions for country (including null)', async () => { const { status, body } = await request(app) .get('/search/suggestions?type=country&includeNull=true') diff --git a/server/src/controllers/activity.controller.spec.ts b/server/src/controllers/activity.controller.spec.ts new file mode 100644 index 0000000000..fdf1c34d06 --- /dev/null +++ b/server/src/controllers/activity.controller.spec.ts @@ -0,0 +1,81 @@ +import { ActivityController } from 'src/controllers/activity.controller'; +import { ActivityService } from 'src/services/activity.service'; +import request from 'supertest'; +import { factory } from 'test/small.factory'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(ActivityController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(ActivityController, [ + { provide: ActivityService, useValue: mockBaseService(ActivityService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('GET /activities', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/activities'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require an albumId', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/activities'); + expect(status).toEqual(400); + expect(body).toEqual(factory.responses.badRequest(expect.arrayContaining(['albumId must be a UUID']))); + }); + + it('should reject an invalid albumId', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/activities').query({ albumId: '123' }); + expect(status).toEqual(400); + expect(body).toEqual(factory.responses.badRequest(expect.arrayContaining(['albumId must be a UUID']))); + }); + + it('should reject an invalid assetId', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .get('/activities') + .query({ albumId: factory.uuid(), assetId: '123' }); + expect(status).toEqual(400); + expect(body).toEqual(factory.responses.badRequest(expect.arrayContaining(['assetId must be a UUID']))); + }); + }); + + describe('POST /activities', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/activities'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require an albumId', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/activities').send({ albumId: '123' }); + expect(status).toEqual(400); + expect(body).toEqual(factory.responses.badRequest(expect.arrayContaining(['albumId must be a UUID']))); + }); + + it('should require a comment when type is comment', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/activities') + .send({ albumId: factory.uuid(), type: 'comment', comment: null }); + expect(status).toEqual(400); + expect(body).toEqual(factory.responses.badRequest(['comment must be a string', 'comment should not be empty'])); + }); + }); + + describe('DELETE /activities/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).delete(`/activities/${factory.uuid()}`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid uuid', async () => { + const { status, body } = await request(ctx.getHttpServer()).delete(`/activities/123`); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest(['id must be a UUID'])); + }); + }); +}); diff --git a/server/src/controllers/album.controller.spec.ts b/server/src/controllers/album.controller.spec.ts new file mode 100644 index 0000000000..5aee4dfdd5 --- /dev/null +++ b/server/src/controllers/album.controller.spec.ts @@ -0,0 +1,86 @@ +import { AlbumController } from 'src/controllers/album.controller'; +import { AlbumService } from 'src/services/album.service'; +import request from 'supertest'; +import { factory } from 'test/small.factory'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(AlbumController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(AlbumController, [{ provide: AlbumService, useValue: mockBaseService(AlbumService) }]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('GET /albums', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/albums'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should reject an invalid shared param', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/albums?shared=invalid'); + expect(status).toEqual(400); + expect(body).toEqual(factory.responses.badRequest(['shared must be a boolean value'])); + }); + + it('should reject an invalid assetId param', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/albums?assetId=invalid'); + expect(status).toEqual(400); + expect(body).toEqual(factory.responses.badRequest(['assetId must be a UUID'])); + }); + }); + + describe('GET /albums/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/albums/${factory.uuid()}`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('GET /albums/statistics', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/albums/statistics'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('POST /albums', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/albums').send({ albumName: 'New album' }); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('PUT /albums/:id/assets', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).put(`/albums/${factory.uuid()}/assets`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('PATCH /albums/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).patch(`/albums/${factory.uuid()}`).send({ albumName: 'New album name' }); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('DELETE /albums/:id/assets', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).delete(`/albums/${factory.uuid()}/assets`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('PUT :id/users', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).put(`/albums/${factory.uuid()}/users`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); +}); diff --git a/server/src/controllers/api-key.controller.spec.ts b/server/src/controllers/api-key.controller.spec.ts new file mode 100644 index 0000000000..b481d1e63d --- /dev/null +++ b/server/src/controllers/api-key.controller.spec.ts @@ -0,0 +1,73 @@ +import { APIKeyController } from 'src/controllers/api-key.controller'; +import { ApiKeyService } from 'src/services/api-key.service'; +import request from 'supertest'; +import { factory } from 'test/small.factory'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(APIKeyController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(APIKeyController, [ + { provide: ApiKeyService, useValue: mockBaseService(ApiKeyService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('POST /api-keys', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/api-keys').send({ name: 'API Key' }); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('GET /api-keys', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/api-keys'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('GET /api-keys/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/api-keys/${factory.uuid()}`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid uuid', async () => { + const { status, body } = await request(ctx.getHttpServer()).get(`/api-keys/123`); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest(['id must be a UUID'])); + }); + }); + + describe('PUT /api-keys/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).put(`/api-keys/${factory.uuid()}`).send({ name: 'new name' }); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid uuid', async () => { + const { status, body } = await request(ctx.getHttpServer()).put(`/api-keys/123`).send({ name: 'new name' }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest(['id must be a UUID'])); + }); + }); + + describe('DELETE /api-keys/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).delete(`/api-keys/${factory.uuid()}`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid uuid', async () => { + const { status, body } = await request(ctx.getHttpServer()).delete(`/api-keys/123`); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest(['id must be a UUID'])); + }); + }); +}); diff --git a/server/src/controllers/app.controller.spec.ts b/server/src/controllers/app.controller.spec.ts new file mode 100644 index 0000000000..4cc00e78c5 --- /dev/null +++ b/server/src/controllers/app.controller.spec.ts @@ -0,0 +1,49 @@ +import { AppController } from 'src/controllers/app.controller'; +import { SystemConfigService } from 'src/services/system-config.service'; +import request from 'supertest'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(AppController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(AppController, [ + { provide: SystemConfigService, useValue: mockBaseService(SystemConfigService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('GET /.well-known/immich', () => { + it('should not be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/.well-known/immich'); + expect(ctx.authenticate).not.toHaveBeenCalled(); + }); + + it('should return a 200 status code', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/.well-known/immich'); + expect(status).toBe(200); + expect(body).toEqual({ + api: { + endpoint: '/api', + }, + }); + }); + }); + + describe('GET /custom.css', () => { + it('should not be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/custom.css'); + expect(ctx.authenticate).not.toHaveBeenCalled(); + }); + + it('should reply with text/css', async () => { + const { status, headers } = await request(ctx.getHttpServer()).get('/custom.css'); + expect(status).toBe(200); + expect(headers['content-type']).toEqual('text/css; charset=utf-8'); + }); + }); +}); diff --git a/server/src/controllers/asset-media.controller.spec.ts b/server/src/controllers/asset-media.controller.spec.ts new file mode 100644 index 0000000000..c674dc1f2c --- /dev/null +++ b/server/src/controllers/asset-media.controller.spec.ts @@ -0,0 +1,137 @@ +import { AssetMediaController } from 'src/controllers/asset-media.controller'; +import { LoggingRepository } from 'src/repositories/logging.repository'; +import { AssetMediaService } from 'src/services/asset-media.service'; +import request from 'supertest'; +import { factory } from 'test/small.factory'; +import { automock, ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +const makeUploadDto = (options?: { omit: string }): Record => { + const dto: Record = { + deviceAssetId: 'example-image', + deviceId: 'TEST', + fileCreatedAt: new Date().toISOString(), + fileModifiedAt: new Date().toISOString(), + isFavorite: 'testing', + duration: '0:00:00.000000', + }; + + const omit = options?.omit; + if (omit) { + delete dto[omit]; + } + + return dto; +}; + +describe(AssetMediaController.name, () => { + let ctx: ControllerContext; + const assetData = Buffer.from('123'); + const filename = 'example.png'; + + beforeAll(async () => { + ctx = await controllerSetup(AssetMediaController, [ + { provide: LoggingRepository, useValue: automock(LoggingRepository, { strict: false }) }, + { provide: AssetMediaService, useValue: mockBaseService(AssetMediaService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('POST /assets', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post(`/assets`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require `deviceAssetId`', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto({ omit: 'deviceAssetId' }) }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + + it('should require `deviceId`', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto({ omit: 'deviceId' }) }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + + it('should require `fileCreatedAt`', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto({ omit: 'fileCreatedAt' }) }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + + it('should require `fileModifiedAt`', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto({ omit: 'fileModifiedAt' }) }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + + it('should require `duration`', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto({ omit: 'duration' }) }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + + it('should throw if `isFavorite` is not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto(), isFavorite: 'not-a-boolean' }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + + it('should throw if `isVisible` is not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto(), isVisible: 'not-a-boolean' }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + + it('should throw if `isArchived` is not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/assets') + .attach('assetData', assetData, filename) + .field({ ...makeUploadDto(), isArchived: 'not-a-boolean' }); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + }); + }); + + // TODO figure out how to deal with `sendFile` + describe.skip('GET /assets/:id/original', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/assets/${factory.uuid()}/original`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + // TODO figure out how to deal with `sendFile` + describe.skip('GET /assets/:id/thumbnail', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/assets/${factory.uuid()}/thumbnail`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); +}); diff --git a/server/src/controllers/asset.controller.spec.ts b/server/src/controllers/asset.controller.spec.ts new file mode 100644 index 0000000000..66d2d7c206 --- /dev/null +++ b/server/src/controllers/asset.controller.spec.ts @@ -0,0 +1,118 @@ +import { AssetController } from 'src/controllers/asset.controller'; +import { AssetService } from 'src/services/asset.service'; +import request from 'supertest'; +import { factory } from 'test/small.factory'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(AssetController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(AssetController, [{ provide: AssetService, useValue: mockBaseService(AssetService) }]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('PUT /assets', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).put(`/assets`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('DELETE /assets', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()) + .delete(`/assets`) + .send({ ids: [factory.uuid()] }); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid uuid', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .delete(`/assets`) + .send({ ids: ['123'] }); + + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest(['each value in ids must be a UUID'])); + }); + }); + + describe('GET /assets/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/assets/${factory.uuid()}`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid id', async () => { + const { status, body } = await request(ctx.getHttpServer()).get(`/assets/123`); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest(['id must be a UUID'])); + }); + }); + + describe('PUT /assets/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/assets/123`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid id', async () => { + const { status, body } = await request(ctx.getHttpServer()).put(`/assets/123`); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest(['id must be a UUID'])); + }); + + it('should reject invalid gps coordinates', async () => { + for (const test of [ + { latitude: 12 }, + { longitude: 12 }, + { latitude: 12, longitude: 'abc' }, + { latitude: 'abc', longitude: 12 }, + { latitude: null, longitude: 12 }, + { latitude: 12, longitude: null }, + { latitude: 91, longitude: 12 }, + { latitude: -91, longitude: 12 }, + { latitude: 12, longitude: -181 }, + { latitude: 12, longitude: 181 }, + ]) { + const { status, body } = await request(ctx.getHttpServer()).put(`/assets/${factory.uuid()}`).send(test); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + } + }); + + it('should reject invalid rating', async () => { + for (const test of [{ rating: 7 }, { rating: 3.5 }, { rating: null }]) { + const { status, body } = await request(ctx.getHttpServer()).put(`/assets/${factory.uuid()}`).send(test); + expect(status).toBe(400); + expect(body).toEqual(factory.responses.badRequest()); + } + }); + }); + + describe('GET /assets/statistics', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/assets/statistics`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('GET /assets/random', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/assets/random`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should not allow count to be a string', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/assets/random?count=ABC'); + expect(status).toBe(400); + expect(body).toEqual( + factory.responses.badRequest(['count must be a positive number', 'count must be an integer number']), + ); + }); + }); +}); diff --git a/server/src/controllers/auth.controller.spec.ts b/server/src/controllers/auth.controller.spec.ts new file mode 100644 index 0000000000..d8ee5ab27d --- /dev/null +++ b/server/src/controllers/auth.controller.spec.ts @@ -0,0 +1,60 @@ +import { AuthController } from 'src/controllers/auth.controller'; +import { AuthService } from 'src/services/auth.service'; +import request from 'supertest'; +import { errorDto } from 'test/medium/responses'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(AuthController.name, () => { + let ctx: ControllerContext; + const service = mockBaseService(AuthService); + + beforeAll(async () => { + ctx = await controllerSetup(AuthController, [{ provide: AuthService, useValue: service }]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('POST /auth/admin-sign-up', () => { + const name = 'admin'; + const email = 'admin@immich.cloud'; + const password = 'password'; + + it('should require an email address', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/auth/admin-sign-up').send({ name, password }); + expect(status).toEqual(400); + expect(body).toEqual(errorDto.badRequest()); + }); + + it('should require a password', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/auth/admin-sign-up').send({ name, email }); + expect(status).toEqual(400); + expect(body).toEqual(errorDto.badRequest()); + }); + + it('should require a name', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/auth/admin-sign-up').send({ email, password }); + expect(status).toEqual(400); + expect(body).toEqual(errorDto.badRequest()); + }); + + it('should require a valid email', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/auth/admin-sign-up') + .send({ name, email: 'immich', password }); + expect(status).toEqual(400); + expect(body).toEqual(errorDto.badRequest()); + }); + + it('should transform email to lower case', async () => { + service.adminSignUp.mockReset(); + const { status } = await request(ctx.getHttpServer()) + .post('/auth/admin-sign-up') + .send({ name: 'admin', password: 'password', email: 'aDmIn@IMMICH.cloud' }); + expect(status).toEqual(201); + expect(service.adminSignUp).toHaveBeenCalledWith(expect.objectContaining({ email: 'admin@immich.cloud' })); + }); + }); +}); diff --git a/server/src/controllers/notification.controller.spec.ts b/server/src/controllers/notification.controller.spec.ts new file mode 100644 index 0000000000..4eac7d3451 --- /dev/null +++ b/server/src/controllers/notification.controller.spec.ts @@ -0,0 +1,64 @@ +import { NotificationController } from 'src/controllers/notification.controller'; +import { NotificationService } from 'src/services/notification.service'; +import request from 'supertest'; +import { errorDto } from 'test/medium/responses'; +import { factory } from 'test/small.factory'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(NotificationController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(NotificationController, [ + { provide: NotificationService, useValue: mockBaseService(NotificationService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('GET /notifications', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/notifications'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it(`should reject an invalid notification level`, async () => { + const { status, body } = await request(ctx.getHttpServer()) + .get(`/notifications`) + .query({ level: 'invalid' }) + .set('Authorization', `Bearer token`); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest([expect.stringContaining('level must be one of the following values')])); + }); + }); + + describe('PUT /notifications', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/notifications'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('GET /notifications/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/notifications/${factory.uuid()}`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a valid uuid', async () => { + const { status, body } = await request(ctx.getHttpServer()).get(`/notifications/123`); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest([expect.stringContaining('id must be a UUID')])); + }); + }); + + describe('PUT /notifications/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).put(`/notifications/${factory.uuid()}`).send({ readAt: factory.date() }); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); +}); diff --git a/server/src/controllers/search.controller.spec.ts b/server/src/controllers/search.controller.spec.ts new file mode 100644 index 0000000000..2388f93e53 --- /dev/null +++ b/server/src/controllers/search.controller.spec.ts @@ -0,0 +1,201 @@ +import { SearchController } from 'src/controllers/search.controller'; +import { SearchService } from 'src/services/search.service'; +import request from 'supertest'; +import { errorDto } from 'test/medium/responses'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(SearchController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(SearchController, [ + { provide: SearchService, useValue: mockBaseService(SearchService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('POST /search/metadata', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/search/metadata'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should reject page as a string', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/metadata').send({ page: 'abc' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['page must not be less than 1', 'page must be an integer number'])); + }); + + it('should reject page as a negative number', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/metadata').send({ page: -10 }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['page must not be less than 1'])); + }); + + it('should reject page as 0', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/metadata').send({ page: 0 }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['page must not be less than 1'])); + }); + + it('should reject size as a string', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/metadata').send({ size: 'abc' }); + expect(status).toBe(400); + expect(body).toEqual( + errorDto.badRequest([ + 'size must not be greater than 1000', + 'size must not be less than 1', + 'size must be an integer number', + ]), + ); + }); + + it('should reject an invalid size', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/metadata').send({ size: -1.5 }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['size must not be less than 1', 'size must be an integer number'])); + }); + + it('should reject an isArchived as not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/search/metadata') + .send({ isArchived: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['isArchived must be a boolean value'])); + }); + + it('should reject an isFavorite as not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/search/metadata') + .send({ isFavorite: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['isFavorite must be a boolean value'])); + }); + + it('should reject an isEncoded as not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/search/metadata') + .send({ isEncoded: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['isEncoded must be a boolean value'])); + }); + + it('should reject an isOffline as not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/search/metadata') + .send({ isOffline: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['isOffline must be a boolean value'])); + }); + + it('should reject an isMotion as not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/metadata').send({ isMotion: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['isMotion must be a boolean value'])); + }); + + it('should reject an isVisible as not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/search/metadata') + .send({ isVisible: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['isVisible must be a boolean value'])); + }); + }); + + describe('POST /search/random', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/search/random'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should reject if withStacked is not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()) + .post('/search/random') + .send({ withStacked: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['withStacked must be a boolean value'])); + }); + + it('should reject if withPeople is not a boolean', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/random').send({ withPeople: 'immich' }); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['withPeople must be a boolean value'])); + }); + }); + + describe('POST /search/smart', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).post('/search/smart'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a query', async () => { + const { status, body } = await request(ctx.getHttpServer()).post('/search/smart').send({}); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['query should not be empty', 'query must be a string'])); + }); + }); + + describe('GET /search/explore', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/search/explore'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('POST /search/person', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/search/person'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a name', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/search/person').send({}); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['name should not be empty', 'name must be a string'])); + }); + }); + + describe('GET /search/places', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/search/places'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a name', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/search/places').send({}); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest(['name should not be empty', 'name must be a string'])); + }); + }); + + describe('GET /search/cities', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/search/cities'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('GET /search/suggestions', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/search/suggestions'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + it('should require a type', async () => { + const { status, body } = await request(ctx.getHttpServer()).get('/search/suggestions').send({}); + expect(status).toBe(400); + expect(body).toEqual( + errorDto.badRequest([ + 'type should not be empty', + expect.stringContaining('type must be one of the following values:'), + ]), + ); + }); + }); +}); diff --git a/server/src/controllers/server.controller.spec.ts b/server/src/controllers/server.controller.spec.ts new file mode 100644 index 0000000000..49edee061a --- /dev/null +++ b/server/src/controllers/server.controller.spec.ts @@ -0,0 +1,28 @@ +import { ServerController } from 'src/controllers/server.controller'; +import { ServerService } from 'src/services/server.service'; +import { VersionService } from 'src/services/version.service'; +import request from 'supertest'; +import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(ServerController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(ServerController, [ + { provide: ServerService, useValue: mockBaseService(ServerService) }, + { provide: VersionService, useValue: mockBaseService(VersionService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('GET /server/license', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/server/license'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); +}); diff --git a/server/src/controllers/user.controller.spec.ts b/server/src/controllers/user.controller.spec.ts new file mode 100644 index 0000000000..bb3e709e68 --- /dev/null +++ b/server/src/controllers/user.controller.spec.ts @@ -0,0 +1,77 @@ +import { UserController } from 'src/controllers/user.controller'; +import { LoggingRepository } from 'src/repositories/logging.repository'; +import { UserService } from 'src/services/user.service'; +import request from 'supertest'; +import { errorDto } from 'test/medium/responses'; +import { factory } from 'test/small.factory'; +import { automock, ControllerContext, controllerSetup, mockBaseService } from 'test/utils'; + +describe(UserController.name, () => { + let ctx: ControllerContext; + + beforeAll(async () => { + ctx = await controllerSetup(UserController, [ + { provide: LoggingRepository, useValue: automock(LoggingRepository, { strict: false }) }, + { provide: UserService, useValue: mockBaseService(UserService) }, + ]); + return () => ctx.close(); + }); + + beforeEach(() => { + ctx.reset(); + }); + + describe('GET /users', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/users'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('GET /users/me', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get('/users/me'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('PUT /users/me', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).put('/users/me'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + + for (const key of ['email', 'name']) { + it(`should not allow null ${key}`, async () => { + const dto = { [key]: null }; + const { status, body } = await request(ctx.getHttpServer()) + .put(`/users/me`) + .set('Authorization', `Bearer token`) + .send(dto); + expect(status).toBe(400); + expect(body).toEqual(errorDto.badRequest()); + }); + } + }); + + describe('GET /users/:id', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).get(`/users/${factory.uuid()}`); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('PUT /users/me/license', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).put('/users/me/license'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); + + describe('DELETE /users/me/license', () => { + it('should be an authenticated route', async () => { + await request(ctx.getHttpServer()).delete('/users/me/license'); + expect(ctx.authenticate).toHaveBeenCalled(); + }); + }); +}); diff --git a/server/test/medium/responses.ts b/server/test/medium/responses.ts index 0148f2e1e9..15673ab54b 100644 --- a/server/test/medium/responses.ts +++ b/server/test/medium/responses.ts @@ -47,7 +47,6 @@ export const errorDto = { error: 'Bad Request', statusCode: 400, message: message ?? expect.anything(), - correlationId: expect.any(String), }), noPermission: { error: 'Bad Request', diff --git a/server/test/medium/specs/controllers/auth.controller.spec.ts b/server/test/medium/specs/controllers/auth.controller.spec.ts deleted file mode 100644 index ef2b904f48..0000000000 --- a/server/test/medium/specs/controllers/auth.controller.spec.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { AuthController } from 'src/controllers/auth.controller'; -import { AuthService } from 'src/services/auth.service'; -import request from 'supertest'; -import { errorDto } from 'test/medium/responses'; -import { createControllerTestApp, TestControllerApp } from 'test/medium/utils'; - -describe(AuthController.name, () => { - let app: TestControllerApp; - - beforeAll(async () => { - app = await createControllerTestApp(); - }); - - describe('POST /auth/admin-sign-up', () => { - const name = 'admin'; - const email = 'admin@immich.cloud'; - const password = 'password'; - - const invalid = [ - { - should: 'require an email address', - data: { name, password }, - }, - { - should: 'require a password', - data: { name, email }, - }, - { - should: 'require a name', - data: { email, password }, - }, - { - should: 'require a valid email', - data: { name, email: 'immich', password }, - }, - ]; - - for (const { should, data } of invalid) { - it(`should ${should}`, async () => { - const { status, body } = await request(app.getHttpServer()).post('/auth/admin-sign-up').send(data); - expect(status).toEqual(400); - expect(body).toEqual(errorDto.badRequest()); - }); - } - - it('should transform email to lower case', async () => { - const { status } = await request(app.getHttpServer()) - .post('/auth/admin-sign-up') - .send({ name: 'admin', password: 'password', email: 'aDmIn@IMMICH.cloud' }); - expect(status).toEqual(201); - expect(app.getMockedService(AuthService).adminSignUp).toHaveBeenCalledWith( - expect.objectContaining({ email: 'admin@immich.cloud' }), - ); - }); - }); - - afterAll(async () => { - await app.close(); - }); -}); diff --git a/server/test/medium/specs/controllers/notification.controller.spec.ts b/server/test/medium/specs/controllers/notification.controller.spec.ts deleted file mode 100644 index f4a0ec82d5..0000000000 --- a/server/test/medium/specs/controllers/notification.controller.spec.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { NotificationController } from 'src/controllers/notification.controller'; -import { AuthService } from 'src/services/auth.service'; -import { NotificationService } from 'src/services/notification.service'; -import request from 'supertest'; -import { errorDto } from 'test/medium/responses'; -import { createControllerTestApp, TestControllerApp } from 'test/medium/utils'; -import { factory } from 'test/small.factory'; - -describe(NotificationController.name, () => { - let realApp: TestControllerApp; - let mockApp: TestControllerApp; - - beforeEach(async () => { - realApp = await createControllerTestApp({ authType: 'real' }); - mockApp = await createControllerTestApp({ authType: 'mock' }); - }); - - describe('GET /notifications', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()).get('/notifications'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - it('should call the service with an auth dto', async () => { - const auth = factory.auth({ user: factory.user() }); - mockApp.getMockedService(AuthService).authenticate.mockResolvedValue(auth); - const service = mockApp.getMockedService(NotificationService); - - const { status } = await request(mockApp.getHttpServer()) - .get('/notifications') - .set('Authorization', `Bearer token`); - - expect(status).toBe(200); - expect(service.search).toHaveBeenCalledWith(auth, {}); - }); - - it(`should reject an invalid notification level`, async () => { - const auth = factory.auth({ user: factory.user() }); - mockApp.getMockedService(AuthService).authenticate.mockResolvedValue(auth); - const service = mockApp.getMockedService(NotificationService); - - const { status, body } = await request(mockApp.getHttpServer()) - .get(`/notifications`) - .query({ level: 'invalid' }) - .set('Authorization', `Bearer token`); - - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest([expect.stringContaining('level must be one of the following values')])); - expect(service.search).not.toHaveBeenCalled(); - }); - }); - - describe('PUT /notifications', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()) - .put(`/notifications`) - .send({ ids: [], readAt: new Date().toISOString() }); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - }); - - describe('GET /notifications/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()).get(`/notifications/${factory.uuid()}`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - }); - - describe('PUT /notifications/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()) - .put(`/notifications/${factory.uuid()}`) - .send({ readAt: factory.date() }); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - }); - - afterAll(async () => { - await realApp.close(); - await mockApp.close(); - }); -}); diff --git a/server/test/medium/specs/controllers/user.controller.spec.ts b/server/test/medium/specs/controllers/user.controller.spec.ts deleted file mode 100644 index f4d90d5469..0000000000 --- a/server/test/medium/specs/controllers/user.controller.spec.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { UserController } from 'src/controllers/user.controller'; -import { AuthService } from 'src/services/auth.service'; -import { UserService } from 'src/services/user.service'; -import request from 'supertest'; -import { errorDto } from 'test/medium/responses'; -import { createControllerTestApp, TestControllerApp } from 'test/medium/utils'; -import { factory } from 'test/small.factory'; - -describe(UserController.name, () => { - let realApp: TestControllerApp; - let mockApp: TestControllerApp; - - beforeAll(async () => { - realApp = await createControllerTestApp({ authType: 'real' }); - mockApp = await createControllerTestApp({ authType: 'mock' }); - }); - - describe('GET /users', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()).get('/users'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - it('should call the service with an auth dto', async () => { - const user = factory.user(); - const authService = mockApp.getMockedService(AuthService); - const auth = factory.auth({ user }); - authService.authenticate.mockResolvedValue(auth); - - const userService = mockApp.getMockedService(UserService); - const { status } = await request(mockApp.getHttpServer()).get('/users').set('Authorization', `Bearer token`); - - expect(status).toBe(200); - expect(userService.search).toHaveBeenCalledWith(auth); - }); - }); - - describe('GET /users/me', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()).get(`/users/me`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - }); - - describe('PUT /users/me', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()).put(`/users/me`); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - - for (const key of ['email', 'name']) { - it(`should not allow null ${key}`, async () => { - const dto = { [key]: null }; - const { status, body } = await request(mockApp.getHttpServer()) - .put(`/users/me`) - .set('Authorization', `Bearer token`) - .send(dto); - expect(status).toBe(400); - expect(body).toEqual(errorDto.badRequest()); - }); - } - }); - - describe('GET /users/:id', () => { - it('should require authentication', async () => { - const { status } = await request(realApp.getHttpServer()).get(`/users/${factory.uuid()}`); - expect(status).toEqual(401); - }); - }); - - describe('GET /server/license', () => { - it('should require authentication', async () => { - const { status, body } = await request(realApp.getHttpServer()).get('/users/me/license'); - expect(status).toBe(401); - expect(body).toEqual(errorDto.unauthorized); - }); - }); - - describe('PUT /users/me/license', () => { - it('should require authentication', async () => { - const { status } = await request(realApp.getHttpServer()).put(`/users/me/license`); - expect(status).toEqual(401); - }); - }); - - describe('DELETE /users/me/license', () => { - it('should require authentication', async () => { - const { status } = await request(realApp.getHttpServer()).put(`/users/me/license`); - expect(status).toEqual(401); - }); - }); - - afterAll(async () => { - await realApp.close(); - await mockApp.close(); - }); -}); diff --git a/server/test/medium/utils.ts b/server/test/medium/utils.ts deleted file mode 100644 index 030780b35b..0000000000 --- a/server/test/medium/utils.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { Provider } from '@nestjs/common'; -import { SchedulerRegistry } from '@nestjs/schedule'; -import { Test } from '@nestjs/testing'; -import { ClassConstructor } from 'class-transformer'; -import { ClsService } from 'nestjs-cls'; -import { middleware } from 'src/app.module'; -import { controllers } from 'src/controllers'; -import { GlobalExceptionFilter } from 'src/middleware/global-exception.filter'; -import { LoggingRepository } from 'src/repositories/logging.repository'; -import { services } from 'src/services'; -import { ApiService } from 'src/services/api.service'; -import { AuthService } from 'src/services/auth.service'; -import { BaseService } from 'src/services/base.service'; -import { automock } from 'test/utils'; -import { Mocked } from 'vitest'; - -export const createControllerTestApp = async (options?: { authType?: 'mock' | 'real' }) => { - const { authType = 'mock' } = options || {}; - - const configMock = { getEnv: () => ({ noColor: true }) }; - const clsMock = { getId: vitest.fn().mockReturnValue('cls-id') }; - const loggerMock = automock(LoggingRepository, { args: [clsMock, configMock], strict: false }); - loggerMock.setContext.mockReturnValue(void 0); - loggerMock.error.mockImplementation((...args: any[]) => { - console.log('Logger.error was called with', ...args); - }); - - const mockBaseService = (service: ClassConstructor) => { - return automock(service, { args: [loggerMock], strict: false }); - }; - - const clsServiceMock = clsMock; - - const FAKE_MOCK = vitest.fn(); - - const providers: Provider[] = [ - ...middleware, - ...services.map((Service) => { - if ((authType === 'real' && Service === AuthService) || Service === ApiService) { - return Service; - } - return { provide: Service, useValue: mockBaseService(Service as ClassConstructor) }; - }), - GlobalExceptionFilter, - { provide: LoggingRepository, useValue: loggerMock }, - { provide: ClsService, useValue: clsServiceMock }, - ]; - - const moduleRef = await Test.createTestingModule({ - imports: [], - controllers: [...controllers], - providers, - }) - .useMocker((token) => { - if (token === LoggingRepository) { - return; - } - - if (token === SchedulerRegistry) { - return FAKE_MOCK; - } - - if (typeof token === 'function' && token.name.endsWith('Repository')) { - return FAKE_MOCK; - } - - if (typeof token === 'string' && token === 'KyselyModuleConnectionToken') { - return FAKE_MOCK; - } - }) - - .compile(); - - const app = moduleRef.createNestApplication(); - - await app.init(); - - const getMockedRepository = (token: ClassConstructor) => { - return app.get(token) as Mocked; - }; - - return { - getHttpServer: () => app.getHttpServer(), - getMockedService: (token: ClassConstructor) => { - if (authType === 'real' && token === AuthService) { - throw new Error('Auth type is real, cannot get mocked service'); - } - return app.get(token) as Mocked; - }, - getMockedRepository, - close: () => app.close(), - }; -}; - -export type TestControllerApp = { - getHttpServer: () => any; - getMockedService: (token: ClassConstructor) => Mocked; - getMockedRepository: (token: ClassConstructor) => Mocked; - close: () => Promise; -}; diff --git a/server/test/small.factory.ts b/server/test/small.factory.ts index d2742f7f80..81ada65b68 100644 --- a/server/test/small.factory.ts +++ b/server/test/small.factory.ts @@ -315,4 +315,11 @@ export const factory = { }, uuid: newUuid, date: newDate, + responses: { + badRequest: (message: any = null) => ({ + error: 'Bad Request', + statusCode: 400, + message: message ?? expect.anything(), + }), + }, }; diff --git a/server/test/utils.ts b/server/test/utils.ts index 2c444f491e..1f80c9bbe2 100644 --- a/server/test/utils.ts +++ b/server/test/utils.ts @@ -1,3 +1,6 @@ +import { CallHandler, Provider, ValidationPipe } from '@nestjs/common'; +import { APP_GUARD, APP_PIPE } from '@nestjs/core'; +import { Test } from '@nestjs/testing'; import { ClassConstructor } from 'class-transformer'; import { Kysely } from 'kysely'; import { ChildProcessWithoutNullStreams } from 'node:child_process'; @@ -5,6 +8,9 @@ import { Writable } from 'node:stream'; import { PNG } from 'pngjs'; import postgres from 'postgres'; import { DB } from 'src/db'; +import { AssetUploadInterceptor } from 'src/middleware/asset-upload.interceptor'; +import { AuthGuard } from 'src/middleware/auth.guard'; +import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor'; import { AccessRepository } from 'src/repositories/access.repository'; import { ActivityRepository } from 'src/repositories/activity.repository'; import { AlbumUserRepository } from 'src/repositories/album-user.repository'; @@ -48,6 +54,7 @@ import { TrashRepository } from 'src/repositories/trash.repository'; import { UserRepository } from 'src/repositories/user.repository'; import { VersionHistoryRepository } from 'src/repositories/version-history.repository'; import { ViewRepository } from 'src/repositories/view-repository'; +import { AuthService } from 'src/services/auth.service'; import { BaseService } from 'src/services/base.service'; import { RepositoryInterface } from 'src/types'; import { asPostgresConnectionConfig, getKyselyConfig } from 'src/utils/database'; @@ -64,7 +71,47 @@ import { newStorageRepositoryMock } from 'test/repositories/storage.repository.m import { newSystemMetadataRepositoryMock } from 'test/repositories/system-metadata.repository.mock'; import { ITelemetryRepositoryMock, newTelemetryRepositoryMock } from 'test/repositories/telemetry.repository.mock'; import { Readable } from 'typeorm/platform/PlatformTools'; -import { assert, Mocked, vitest } from 'vitest'; +import { assert, Mock, Mocked, vitest } from 'vitest'; + +export type ControllerContext = { + authenticate: Mock; + getHttpServer: () => any; + reset: () => void; + close: () => Promise; +}; + +export const controllerSetup = async (controller: ClassConstructor, providers: Provider[]) => { + const noopInterceptor = { intercept: (ctx: never, next: CallHandler) => next.handle() }; + const authenticate = vi.fn(); + const moduleRef = await Test.createTestingModule({ + controllers: [controller], + providers: [ + { provide: APP_PIPE, useValue: new ValidationPipe({ transform: true, whitelist: true }) }, + { provide: APP_GUARD, useClass: AuthGuard }, + { provide: LoggingRepository, useValue: LoggingRepository.create() }, + { provide: AuthService, useValue: { authenticate } }, + ...providers, + ], + }) + .overrideInterceptor(FileUploadInterceptor) + .useValue(noopInterceptor) + .overrideInterceptor(AssetUploadInterceptor) + .useValue(noopInterceptor) + .compile(); + const app = moduleRef.createNestApplication(); + await app.init(); + + return { + authenticate, + getHttpServer: () => app.getHttpServer(), + reset: () => { + authenticate.mockReset(); + }, + close: async () => { + await app.close(); + }, + }; +}; const mockFn = (label: string, { strict }: { strict: boolean }) => { const message = `Called a mock function without a mock implementation (${label})`; @@ -77,6 +124,10 @@ const mockFn = (label: string, { strict }: { strict: boolean }) => { }); }; +export const mockBaseService = (service: ClassConstructor) => { + return automock(service, { args: [{ setContext: () => {} }], strict: false }); +}; + export const automock = ( Dependency: ClassConstructor, options?: { From 8801ae58212dff91f97071b371d8ac45304e3d68 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 4 May 2025 07:30:21 -0500 Subject: [PATCH 03/66] fix(web): text dim in darkmode (#18072) --- .../shared-components/side-bar/server-status.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/lib/components/shared-components/side-bar/server-status.svelte b/web/src/lib/components/shared-components/side-bar/server-status.svelte index 500bce524e..49006dfe5a 100644 --- a/web/src/lib/components/shared-components/side-bar/server-status.svelte +++ b/web/src/lib/components/shared-components/side-bar/server-status.svelte @@ -1,18 +1,18 @@ + + + +{#if albumMapViewManager.isInMapView} +
+ +
+
+ {#await import('../shared-components/map/map.svelte')} + {#await delay(timeToLoadTheMap) then} + +
+ +
+ {/await} + {:then { default: Map }} + + {/await} +
+
+ +
+ + + {#if $showAssetViewer} + {#await import('../../../lib/components/asset-viewer/asset-viewer.svelte') then { default: AssetViewer }} + 1} + onNext={navigateNext} + onPrevious={navigatePrevious} + onRandom={navigateRandom} + onClose={() => { + assetViewingStore.showAssetViewer(false); + handlePromiseError(navigate({ targetRoute: 'current', assetId: null })); + }} + isShared={false} + /> + {/await} + {/if} + +{/if} diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 09ec67e92b..1f15e22d9e 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -20,6 +20,7 @@ import { t } from 'svelte-i18n'; import { onDestroy } from 'svelte'; import { AssetInteraction } from '$lib/stores/asset-interaction.svelte'; + import AlbumMap from '$lib/components/album-page/album-map.svelte'; interface Props { sharedLink: SharedLinkResponseDto; @@ -91,7 +92,9 @@ icon={mdiFolderDownloadOutline} /> {/if} - + {#if sharedLink.showMetadata} + + {/if} {/snippet} diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte index 7d496b7e3f..b454d89217 100644 --- a/web/src/lib/components/photos-page/asset-grid.svelte +++ b/web/src/lib/components/photos-page/asset-grid.svelte @@ -27,6 +27,7 @@ import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte'; import { mobileDevice } from '$lib/stores/mobile-device.svelte'; import { focusNext } from '$lib/utils/focus-util'; + import { albumMapViewManager } from '$lib/managers/album-view-map.manager.svelte'; interface Props { isSelectionMode?: boolean; @@ -382,7 +383,6 @@ const handleNext = async () => { const nextAsset = await assetStore.getNextAsset($viewingAsset); - if (nextAsset) { const preloadAsset = await assetStore.getNextAsset(nextAsset); assetViewingStore.setAsset(nextAsset, preloadAsset ? [preloadAsset] : []); @@ -802,26 +802,28 @@ - - {#if $showAssetViewer} - {#await import('../asset-viewer/asset-viewer.svelte') then { default: AssetViewer }} - - {/await} - {/if} - +{#if !albumMapViewManager.isInMapView} + + {#if $showAssetViewer} + {#await import('../asset-viewer/asset-viewer.svelte') then { default: AssetViewer }} + + {/await} + {/if} + +{/if}