mirror of
https://github.com/immich-app/immich.git
synced 2025-12-13 09:13:17 +03:00
* feat: show per-user contribution counts on shared albums Add API support and UI display for per-user asset contribution counts on shared albums: - server: add ContributorCountResponseDto and repository method to aggregate counts per user (excluding deleted assets), expose via album response only when shared and counts > 0 - web: display contributor counts in Album Users modal next to each member’s role This helps users understand participation levels in shared albums. * Add ContributorCountResponseDto and expose contributorCounts on AlbumResponseDto in OpenAPI spec. Regenerate TypeScript SDK and mobile OpenAPI clients to include new types. No breaking changes; fields are additive. * fix: shrink age view to fit and not overflow (#22405) Co-authored-by: Alex <alex.tran1502@gmail.com> * chore: post release tasks (#22587) * chore: clean auth-user entity on reset (#22583) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> * fix: mitigate database lock scenario when running full sync in splash screen page (#22608) * fix: improve sync backup error indicator (#22527) * fix: improve sync indicator error * prefer backup disabled icon before error --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * fix: bottom navigation bar overlay sheet info (#22610) * fix: respect storage indicator setting (#22596) * fix: respect storage indicator size setting * remove black bar on the bottom of the setting scaffold page --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * fix: do not run multiple engines on cold startup (#22518) fix: do not run multiple engines on app startup Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * fix: album selector in favorite view (#22612) * chore(web): update translations (#22486) Translate-URL: https://hosted.weblate.org/projects/immich/immich/ar/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/az/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/bg/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ca/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/cs/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/da/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/de/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/el/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/es/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/fr/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/he/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/hu/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/it/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/kn/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ko/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/lv/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ml/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/nl/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/pl/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/pt/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ro/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ru/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/sk/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/sl/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/sv/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ta/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/tr/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/zh_Hant/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/zh_SIMPLIFIED/ Translation: Immich/immich Co-authored-by: Arthur Bols <arthur@bols.dev> Co-authored-by: Ben Kim <benkim1129@gmail.com> Co-authored-by: César Gómez <cegomez@gmail.com> Co-authored-by: DR <weblate-kavita.snowflake668@slmail.me> Co-authored-by: DevServs <bonov@mail.ru> Co-authored-by: Emil Friis Osmann <Emilfriisosmann@gmail.com> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Godwin T <godwintgn@protonmail.com> Co-authored-by: Hristo T <hristotarnev@gmail.com> Co-authored-by: Hurricane-32 <rodrigorimo@hotmail.com> Co-authored-by: Jozef Gaal <preklady@mayday.sk> Co-authored-by: KecskeTech <teonyitas@gmail.com> Co-authored-by: Kiril Panayotov <eccyboo@protonmail.com> Co-authored-by: Liviu Roman <contact@liviuroman.com> Co-authored-by: Lorenzo <artale.lorenzo@outlook.it> Co-authored-by: Marcelo Popper Costa <marcelo_popper@hotmail.com> Co-authored-by: Matjaž T <matjaz@moj-svet.si> Co-authored-by: Miryusif Rahimov <miryusifrahimov@gmail.com> Co-authored-by: Msaood <msaood@msaood.com> Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com> Co-authored-by: Pedro Vendeira <vendeira.pedro@gmail.com> Co-authored-by: PontusÖsterlindh <pontus@osterlindh.com> Co-authored-by: Rahees <ahdrahees.dev@gmail.com> Co-authored-by: Sandeep R <sandeep1891995@gmail.com> Co-authored-by: Sylvain Pichon <service@spichon.fr> Co-authored-by: TV Box <realceday.tvbox@gmail.com> Co-authored-by: Tino Altmann <usinggrant@hotmail.de> Co-authored-by: User 123456789 <user123456789@users.noreply.hosted.weblate.org> Co-authored-by: Vegard Fladby <vegard@fladby.org> Co-authored-by: anton garcias <isaga.percompartir@gmail.com> Co-authored-by: chamdim <chamdim@protonmail.com> Co-authored-by: longlarry <weblate.gm@tuta.io> Co-authored-by: pyccl <changcongliang@163.com> Co-authored-by: swever <swever@users.noreply.hosted.weblate.org> Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com> Co-authored-by: 안세훈 <on9686@gmail.com> * chore: version v2.0.1 * fix(docs): link to immich docs does not lead correctly to docs (#22687) * fix(server): fix chunking Postgres query parameters (#22684) * feat(server): improve checkAlbumAccess query performance (#22467) * Fix slow SQL query in checkAlbumAccess caused by the array overlap operator && * Update access.repository.sql * Rewrite the query to pass assetIds once as a single array parameter * chore: mark VSCode tasks as background tasks (#22631) VSCode expect tasks that aren't marked as background tasks to finish eventually. That's not how a dev-server is supposed to work, we expect it to run for basically infinite time. By marking those tasks as background tasks, VSCode stops showing the infinite loading spinner on those processes. * fix(ml): Resolve IPv6 startup crash and healthcheck failure (#22387) * fix(ml): Resolve IPv6 startup crash and healthcheck failure Fixes #13782 * fix(ml): updated the fix to use the std lib * Apply code formatting to __main__.py * fix(server): override reserved color metadata for video thumbnails (#22348) override reserved metadata * fix(mobile): trash description cut off (#22662) * fix(mobile): empty album description does not save (#22649) * fix(mobile): video player using ref after disposal (#21843) check if disposed * docs: add job order diagram (#22673) * docs: add job order diagram * wording --------- Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com> * fix: missing responsive calculation in UserPageLayout (#22455) * fix: use full-size image for non-web-compatible panoramas (#20359) * fix(web): use full-size image for non-web-compatible panoramas * always generate full-size image for panoramas * add unit test * fix formatting --------- Co-authored-by: gergo= <gergo@pitty.hu> * chore: update cli docs to pnpm (#22702) update cli docs to pnpm * chore(web): upgrade ESLint and plugins (#22495) * chore(web): upgrade ESLint and plugins, simplify linting configuration - Update eslint from ^9.18.0 to ^9.36.0 - Update eslint plugins: - eslint-plugin-svelte: ^3.9.0 → ^3.12.4 - eslint-plugin-unicorn: ^60.0.0 → ^61.0.2 - svelte-eslint-parser: ^1.2.0 → ^1.3.3 - typescript-eslint: ^8.28.0 → ^8.45.0 - Remove eslint-p dependency in favor of native eslint concurrency - Add unicorn/no-array-sort rule exception - Update linting scripts to use eslint's native --concurrency flag - Update Makefile and mise.toml to reflect simplified lint commands - Update GitHub Actions workflow to use standard pnpm lint command * pnpm dedupe --------- Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> * fix(web): do not notify on patch releases (#22591) * chore: post release tasks (#22616) * fix: hide view in timeline button on local timeline (#22713) * chore(server): support vectorchord 0.5.x (#21602) Co-authored-by: Mert <101130780+mertalev@users.noreply.github.com> * fix: Fix issue fail to download iOS live photos (#22708) Co-authored-by: bwees <brandonwees@gmail.com> * fix(docs): Remove immich_remove_offline_files as no longer functional (#21774) Co-authored-by: Mert <101130780+mertalev@users.noreply.github.com> Co-authored-by: Brandon Wees <brandonwees@gmail.com> * fix(mobile): closing editor goes back to main page (#22647) Co-authored-by: bwees <brandonwees@gmail.com> * docs: update TrueNAS migration instructions (#22463) Co-authored-by: bo0tzz <git@bo0tzz.me> Co-authored-by: Nicholas Flamy <30300649+NicholasFlamy@users.noreply.github.com> * docs: update Synology install guide (#21996) Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com> * fix: improve the selected sidebar item text color in dark mode (#22640) * chore(deps): update redis:6.2-alpine docker digest to 2185e74 (#22718) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update devcontainers for trixie, devenv changes (#22194) * fix(deps): update dependency device_info_plus to v12 (#22724) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency flutter to v3.35.5 (#22720) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update github-actions (#22721) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix: --no-git-checks on pnpm publish (#22715) * fix: --no-git-checks on sdk publish * fix: --no-git-checks on cli publish * refactor(web): Clarify property names in Timeline and Scrubber (#22265) refactor(web): Clarify property names in Timeline and Scrubber Renamed properties across Timeline/Scrubber components for clarity: - scrubOverallPercent → timelineScrollPercent - scrubberMonthPercent → viewportTopMonthScrollPercent - scrubberMonth → viewportTopMonth - leadout → isInLeadOutSection Additional changes: - Updated ScrubberListener signature to accept object parameter - Added detailed JSDoc comments for all Scrubber props - Fixed callback invocations to use new object syntax - Aligned Timeline's local state variables with Scrubber prop names * fix: promote to foreground service before starting engine (#22517) fix: show notification from native Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * refactor(web): extract timeline keyboard actions into separate component (#22266) refactor(web): extract timeline keyboard actions into separate component Extracts keyboard shortcuts and related functionality from Timeline component into a dedicated TimelineKeyboardActions component for better separation of concerns and maintainability. * feat: make skeleton title optional (#22396) feat: skeleton title is optional feat: skeleton title optional * refactor(web): extract asset viewer logic from Timeline into TimelineAssetViewer component (#22268) refactor(web): extract asset viewer logic from Timeline into TimelineAssetViewer component - Extracted asset viewer navigation and action handling logic from Timeline.svelte into a dedicated TimelineAssetViewer component - Reduces Timeline.svelte complexity by ~150 lines and improves separation of concerns - No functional changes - purely a refactoring to improve code organization ## Changes - Created new TimelineAssetViewer.svelte component containing all asset viewer-related logic - Moved handlePrevious, handleNext, handleRandom, handleClose, handlePreAction, and handleAction methods - Timeline.svelte now only passes required props to the new component - Maintained all existing functionality including navigation, asset actions, and stack management * chore: track full actions/cache version in comment (#22359) * fix(ml): ipv6 check (#22735) * chore(deps): cache pnpm dependencies in prod build (#22555) * cache pnpm dependencies use different ids to be safe unnecessary lines * use buildcache folder * chore: use isar immich fork (#22738) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> * fix: bottom sheet blank with local assets that have remote counterparts (#22743) * chore(deps): update dependency @types/node to ^22.18.8 (#22719) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency nodemailer to v7.0.7 [security] (#22740) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency connectivity_plus to v7 (#22723) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * chore: use hosted isar flutter libs (#22757) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> * fix: skip local only assets in move to lock action (#22728) * fix:prefer trashing to deletions * skip local only assets in move to lock action --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * fix: brief flashing when swiping from video (#22187) * fix(web): Uniform random distribution during shuffle (#19902) feat: better random distribution * fix: persist search page scroll offset between rebuilds (#22733) fix: persist search scroll between rebuilds Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * docs: add some external library notes (#22776) * feat(web): seconds and milliseconds in timestamps (#20337) * fix(web): seconds in timestamps * changed date-input step to provide millisecond precision * feat(cli): add debug development config (#22712) * add debug and change ts-node with tsx * update pr changes * update pnpm-lock * remove ts-node from readme * typo * resolve conflicts * remove tsx * launch from dist * add preLaunchTask * update readme * undo main in package.json * remove typo * Apply suggestion from @bwees Co-authored-by: Brandon Wees <brandonwees@gmail.com> * revert pnpm-lock changes * @jrasm91 suggestions * chore: run node with source maps --------- Co-authored-by: Jason Rasmussen <jason@rasm.me> Co-authored-by: Brandon Wees <brandonwees@gmail.com> * docs: add Immich-Stack to community-projects (#21563) docs: add Immich Stack community project Co-authored-by: Jason Rasmussen <jason@rasm.me> * feat(web): Add upload to stack action (#19842) * feat(web): Add upload to stack action * Event handling and translation * Update asset viewer instead * lint, improve upload return type * Add suggestions from code review * Resolve merge conflicts * Apply suggestions from code review * feat(server): add `immich.users.total` metric (#21780) * Add immich.users.total metric * Fix tests & one lint error * Lint * Fix SQL Schema checks * Fix nit * Use workers argument in OnEvent hook and remove condition from method body * feat(docs): add zh_TW Traditional Chinese version README (#22703) docs: add zh_TW Traditional Chinese version README * chore: ignore renovate major updates for postgres image (#22764) * fix: remove postgres exclude datasource match (#22811) * chore(deps): update github-actions (major) (#22810) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix: revert terragrunt-action bump (#22812) * chore: don't enforce runes (#22813) * chore(deps): update base-image to v202510092146 (major) (#22818) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update typescript-projects (#22809) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Dietzler <mail@ddietzler.dev> * fix: only cast to device if the asset is a RemoteAsset (#22805) * feat: (perf) remove scroll compensation (#22837) * fix(deps): update dependency happy-dom to v20 [security] (#22846) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update github-actions (#22793) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix: various typos (#22867) Found via `codespell -q 3 -S "*.svg,./i18n,./docs/package-lock.json,./readme_i18n,./mobile/assets/i18n" -L afterall,devlop,finaly,inout,nd,optin,renderd,sade` * fix: ios skip posting hash response after detached from engine (#22695) * skip posting message after detached from engine * review changes * cancel plugin before destroying engine --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * chore(deps): update ghcr.io/immich-app/postgres:14-vectorchord0.3.0 docker digest to 6f3e9d2 (#22912) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0 docker digest to bcf6335 (#22913) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix: re-add scroll compensation (efficiently) (#22848) * fix: re-add scroll compensation (efficient) * Rename showSkeleton to invisible. Adjust skeleton margins, invisible support. * Fix faulty logic, simplify * Calculate ratios and determine compensation strategy: height comp for above/partiality visible, month-scroll comp within a fully visible month. --------- Co-authored-by: Alex <alex.tran1502@gmail.com> * fix: shared album control permissions (#22435) * fix: shared album control permissions * fix: properly display "add photos" * fix: dont allow modification of album order * fix: album title/description edit from app bar * chore: code review changes * chore: format translations * chore: lintings * fix: show dialog before delete local action (#22280) * fix: show dialog on delete local action # Conflicts: # mobile/lib/repositories/asset_media.repository.dart * button style --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * fix(deps): update dependency kysely-postgres-js to v3 (#22924) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update redis:6.2-alpine docker digest to 77697a7 (#22915) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update typescript-projects (#22918) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Dietzler <mail@ddietzler.dev> * feat: local album events notification (#22817) * feat: local album events notification * pr feedback * show number of unread notification * chore: refactor show view in timeline button (#22894) * chore: refactor show view in timeline button This refactor includes changes to notify asset viewer about where an asset was shown from. * chore: realized I could just pull from the timelineProvider instead of storing it in the asset viewer state * chore: rename enum to TimelineOrigin and update members * fix: update isOwner condition --------- Co-authored-by: Alex <alex.tran1502@gmail.com> * chore(web): update translations (#22623) Translate-URL: https://hosted.weblate.org/projects/immich/immich/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ar/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/be/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/bn/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ca/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/cs/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/da/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/de/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/el/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/es/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/et/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/fi/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/fr/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/gl/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/he/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/hi/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/hr/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/id/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/it/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ja/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ka/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/lv/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/mr/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/nl/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/pa/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/pl/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/pt/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ro/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ru/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/sk/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/sl/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/sr_Latn/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/sv/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/ta/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/tr/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/uk/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/zh_Hant/ Translate-URL: https://hosted.weblate.org/projects/immich/immich/zh_SIMPLIFIED/ Translation: Immich/immich Co-authored-by: Abhijeet Bonde <abhijeetbonde19@gmail.com> Co-authored-by: Adam Uchmanowicz <auchmanowicz@gmail.com> Co-authored-by: Adrian Hermida <adrian.hermida.baloira@gmail.com> Co-authored-by: Aleksa Milošević <akimaki15@gmail.com> Co-authored-by: Amin <amnsharif@gmail.com> Co-authored-by: AndreiP28 <andreiprica28@gmail.com> Co-authored-by: António Santos <antoniomsantos99@gmail.com> Co-authored-by: Asger Mogensen <asgermog@gmail.com> Co-authored-by: Christoph Auer <Christoph.Auer@pilsheim.de> Co-authored-by: Denis Pacquier <denis.pacquier@gmail.com> Co-authored-by: DevServs <bonov@mail.ru> Co-authored-by: Eetu Mäenpää <me@eetumaenpaa.fi> Co-authored-by: Felipe Garcia <garcia.o.felipe@gmail.com> Co-authored-by: Filip Joković <filip@jokovic.dev> Co-authored-by: Hurricane-32 <rodrigorimo@hotmail.com> Co-authored-by: Indrek Haav <indrek.haav@hotmail.com> Co-authored-by: Jason Song <songpeiheng@gmail.com> Co-authored-by: Javier Villanueva García <jvg2203@gmail.com> Co-authored-by: Jordy H <jordy@hoebergen.net> Co-authored-by: Jorge Montejo <jorgemon.lopez@gmail.com> Co-authored-by: Jozef Gaal <preklady@mayday.sk> Co-authored-by: Konstantinos D <kdemer@yahoo.com> Co-authored-by: Leo Bottaro <github@leobottaro.com> Co-authored-by: Linerly <linerly@proton.me> Co-authored-by: Liviu Roman <contact@liviuroman.com> Co-authored-by: Lorenz Baum <LorenzBaum@gmx.de> Co-authored-by: Lukas Konsin <lukaskonsin@proton.me> Co-authored-by: Mandeep <mandeeps708@gmail.com> Co-authored-by: Marc Casillas <mcasillassu@gmail.com> Co-authored-by: Marcelo Popper Costa <marcelo_popper@hotmail.com> Co-authored-by: MatijaThe245th <matija245matakovic@gmail.com> Co-authored-by: Matjaž T <matjaz@moj-svet.si> Co-authored-by: Mees Frensel <meesfrensel@gmail.com> Co-authored-by: Mirko <itzmirko@itzmirko.it> Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com> Co-authored-by: Oleksandr Yurov <oyurov@icloud.com> Co-authored-by: Orkun Sürel <orkunsurel@gmail.com> Co-authored-by: Peter Dave Hello <hsu@peterdavehello.org> Co-authored-by: Philipp Burndorfer <phi.bur@gmx.at> Co-authored-by: Prasanth Baskar <bupdprasanth@gmail.com> Co-authored-by: Roman Zhukov <Softver161@gmail.com> Co-authored-by: Sayan Goswami <goswami.sayan47@gmail.com> Co-authored-by: Sergey Katsubo <skatsubo@gmail.com> Co-authored-by: Simon Bierwald <simon.bierwald@gmail.com> Co-authored-by: Sylvain Pichon <service@spichon.fr> Co-authored-by: TV Box <realceday.tvbox@gmail.com> Co-authored-by: Taiki M <vexingly-many-mace@duck.com> Co-authored-by: Theodore Zhvania <zhvania@ted.ge> Co-authored-by: Tim De Meyer <demeyer.tim@gmail.com> Co-authored-by: User 123456789 <user123456789@users.noreply.hosted.weblate.org> Co-authored-by: Valentino Harpa <valen.ginga@gmail.com> Co-authored-by: Vegard Fladby <vegard@fladby.org> Co-authored-by: Willem Schipper <git@willem.page> Co-authored-by: Yago Raña Gayoso <yago.rana.gayoso@gmail.com> Co-authored-by: Zurab Sajaia <vavalomi@hotmail.com> Co-authored-by: albanobattistella <albanobattistella@gmail.com> Co-authored-by: bittin1ddc447d824349b2 <bittin@reimu.nl> Co-authored-by: dark&white <darkwhite@users.noreply.hosted.weblate.org> Co-authored-by: eav5jhl0 <eav5jhl0@users.noreply.hosted.weblate.org> Co-authored-by: findussoft <sella_violett_8i@icloud.com> Co-authored-by: kiwinho <kiwicaja@gmail.com> Co-authored-by: millallo <millallo@tiscali.it> Co-authored-by: pyccl <changcongliang@163.com> Co-authored-by: rokon001 <rnacc3579@gmail.com> Co-authored-by: vaibhav kumar <catvaku@gmail.com> Co-authored-by: waclaw66 <waclaw66@seznam.cz> Co-authored-by: Максим Горпиніч <gorpinicmaksim0@gmail.com> Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com> * chore: version v2.1.0 * refactor * question marks are the enemy * refactor count map * update readme * e2e * count of 0 is impossible * useless async --------- Co-authored-by: Chaoscontrol <6642238+Chaoscontrol@users.noreply.github.com> Co-authored-by: Brandon Wees <brandonwees@gmail.com> Co-authored-by: Alex <alex.tran1502@gmail.com> Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com> Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: Arthur Bols <arthur@bols.dev> Co-authored-by: Ben Kim <benkim1129@gmail.com> Co-authored-by: César Gómez <cegomez@gmail.com> Co-authored-by: DR <weblate-kavita.snowflake668@slmail.me> Co-authored-by: DevServs <bonov@mail.ru> Co-authored-by: Emil Friis Osmann <Emilfriisosmann@gmail.com> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Godwin T <godwintgn@protonmail.com> Co-authored-by: Hristo T <hristotarnev@gmail.com> Co-authored-by: Hurricane-32 <rodrigorimo@hotmail.com> Co-authored-by: Jozef Gaal <preklady@mayday.sk> Co-authored-by: KecskeTech <teonyitas@gmail.com> Co-authored-by: Kiril Panayotov <eccyboo@protonmail.com> Co-authored-by: Liviu Roman <contact@liviuroman.com> Co-authored-by: Lorenzo <artale.lorenzo@outlook.it> Co-authored-by: Marcelo Popper Costa <marcelo_popper@hotmail.com> Co-authored-by: Matjaž T <matjaz@moj-svet.si> Co-authored-by: Miryusif Rahimov <miryusifrahimov@gmail.com> Co-authored-by: Msaood <msaood@msaood.com> Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com> Co-authored-by: Pedro Vendeira <vendeira.pedro@gmail.com> Co-authored-by: PontusÖsterlindh <pontus@osterlindh.com> Co-authored-by: Rahees <ahdrahees.dev@gmail.com> Co-authored-by: Sandeep R <sandeep1891995@gmail.com> Co-authored-by: Sylvain Pichon <service@spichon.fr> Co-authored-by: TV Box <realceday.tvbox@gmail.com> Co-authored-by: Tino Altmann <usinggrant@hotmail.de> Co-authored-by: User 123456789 <user123456789@users.noreply.hosted.weblate.org> Co-authored-by: Vegard Fladby <vegard@fladby.org> Co-authored-by: anton garcias <isaga.percompartir@gmail.com> Co-authored-by: chamdim <chamdim@protonmail.com> Co-authored-by: longlarry <weblate.gm@tuta.io> Co-authored-by: pyccl <changcongliang@163.com> Co-authored-by: swever <swever@users.noreply.hosted.weblate.org> Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com> Co-authored-by: 안세훈 <on9686@gmail.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Xavier Dupuis <xavier0978@hotmail.fr> Co-authored-by: Sergey Katsubo <skatsubo@gmail.com> Co-authored-by: Adrian Jost <22987140+adrianjost@users.noreply.github.com> Co-authored-by: Cokodayo <78474654+CaptainJack2491@users.noreply.github.com> Co-authored-by: Mert <101130780+mertalev@users.noreply.github.com> Co-authored-by: Yaros <thedj.launchpadder.dmx512@gmail.com> Co-authored-by: USBAkimbo <71508071+USBAkimbo@users.noreply.github.com> Co-authored-by: Min Idzelis <min123@gmail.com> Co-authored-by: grgergo <gergo_g@proton.me> Co-authored-by: gergo= <gergo@pitty.hu> Co-authored-by: Jorge Montejo <jorgemon.lopez@gmail.com> Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> Co-authored-by: Jason Rasmussen <jason@rasm.me> Co-authored-by: Diogo Correia <me@diogotc.com> Co-authored-by: CuberL <liaoziyue10@gmail.com> Co-authored-by: Xantin <56741168+Xiticks@users.noreply.github.com> Co-authored-by: bo0tzz <git@bo0tzz.me> Co-authored-by: Nicholas Flamy <30300649+NicholasFlamy@users.noreply.github.com> Co-authored-by: TDR001 <redp50@outlook.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Saschl <19493808+Saschl@users.noreply.github.com> Co-authored-by: Pascal Sommer <Pascal-So@users.noreply.github.com> Co-authored-by: kaziu687 <kaziu687@gmail.com> Co-authored-by: Qhilm <3350433+Qhilm@users.noreply.github.com> Co-authored-by: Sebastian Schneider <sese.tailor@gmx.net> Co-authored-by: Tushar Harsora <tusharharsora95@gmail.com> Co-authored-by: Peter Dave Hello <hsu@peterdavehello.org> Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> Co-authored-by: Daniel Dietzler <mail@ddietzler.dev> Co-authored-by: luzpaz <luzpaz@users.noreply.github.com> Co-authored-by: Abhijeet Bonde <abhijeetbonde19@gmail.com> Co-authored-by: Adam Uchmanowicz <auchmanowicz@gmail.com> Co-authored-by: Adrian Hermida <adrian.hermida.baloira@gmail.com> Co-authored-by: Aleksa Milošević <akimaki15@gmail.com> Co-authored-by: Amin <amnsharif@gmail.com> Co-authored-by: AndreiP28 <andreiprica28@gmail.com> Co-authored-by: António Santos <antoniomsantos99@gmail.com> Co-authored-by: Asger Mogensen <asgermog@gmail.com> Co-authored-by: Christoph Auer <Christoph.Auer@pilsheim.de> Co-authored-by: Denis Pacquier <denis.pacquier@gmail.com> Co-authored-by: Eetu Mäenpää <me@eetumaenpaa.fi> Co-authored-by: Felipe Garcia <garcia.o.felipe@gmail.com> Co-authored-by: Filip Joković <filip@jokovic.dev> Co-authored-by: Indrek Haav <indrek.haav@hotmail.com> Co-authored-by: Jason Song <songpeiheng@gmail.com> Co-authored-by: Javier Villanueva García <jvg2203@gmail.com> Co-authored-by: Jordy H <jordy@hoebergen.net> Co-authored-by: Konstantinos D <kdemer@yahoo.com> Co-authored-by: Leo Bottaro <github@leobottaro.com> Co-authored-by: Linerly <linerly@proton.me> Co-authored-by: Lorenz Baum <LorenzBaum@gmx.de> Co-authored-by: Lukas Konsin <lukaskonsin@proton.me> Co-authored-by: Mandeep <mandeeps708@gmail.com> Co-authored-by: Marc Casillas <mcasillassu@gmail.com> Co-authored-by: MatijaThe245th <matija245matakovic@gmail.com> Co-authored-by: Mees Frensel <meesfrensel@gmail.com> Co-authored-by: Mirko <itzmirko@itzmirko.it> Co-authored-by: Oleksandr Yurov <oyurov@icloud.com> Co-authored-by: Orkun Sürel <orkunsurel@gmail.com> Co-authored-by: Philipp Burndorfer <phi.bur@gmx.at> Co-authored-by: Prasanth Baskar <bupdprasanth@gmail.com> Co-authored-by: Roman Zhukov <Softver161@gmail.com> Co-authored-by: Sayan Goswami <goswami.sayan47@gmail.com> Co-authored-by: Simon Bierwald <simon.bierwald@gmail.com> Co-authored-by: Taiki M <vexingly-many-mace@duck.com> Co-authored-by: Theodore Zhvania <zhvania@ted.ge> Co-authored-by: Tim De Meyer <demeyer.tim@gmail.com> Co-authored-by: Valentino Harpa <valen.ginga@gmail.com> Co-authored-by: Willem Schipper <git@willem.page> Co-authored-by: Yago Raña Gayoso <yago.rana.gayoso@gmail.com> Co-authored-by: Zurab Sajaia <vavalomi@hotmail.com> Co-authored-by: albanobattistella <albanobattistella@gmail.com> Co-authored-by: bittin1ddc447d824349b2 <bittin@reimu.nl> Co-authored-by: dark&white <darkwhite@users.noreply.hosted.weblate.org> Co-authored-by: eav5jhl0 <eav5jhl0@users.noreply.hosted.weblate.org> Co-authored-by: findussoft <sella_violett_8i@icloud.com> Co-authored-by: kiwinho <kiwicaja@gmail.com> Co-authored-by: millallo <millallo@tiscali.it> Co-authored-by: rokon001 <rnacc3579@gmail.com> Co-authored-by: vaibhav kumar <catvaku@gmail.com> Co-authored-by: waclaw66 <waclaw66@seznam.cz> Co-authored-by: Максим Горпиніч <gorpinicmaksim0@gmail.com>
722 lines
26 KiB
TypeScript
722 lines
26 KiB
TypeScript
import {
|
|
addAssetsToAlbum,
|
|
AlbumResponseDto,
|
|
AlbumUserRole,
|
|
AssetMediaResponseDto,
|
|
AssetOrder,
|
|
deleteUserAdmin,
|
|
getAlbumInfo,
|
|
LoginResponseDto,
|
|
SharedLinkType,
|
|
} from '@immich/sdk';
|
|
import { createUserDto } from 'src/fixtures';
|
|
import { errorDto } from 'src/responses';
|
|
import { app, asBearerAuth, utils } from 'src/utils';
|
|
import request from 'supertest';
|
|
import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
|
|
|
|
const user1SharedEditorUser = 'user1SharedEditorUser';
|
|
const user1SharedViewerUser = 'user1SharedViewerUser';
|
|
const user1SharedLink = 'user1SharedLink';
|
|
const user1NotShared = 'user1NotShared';
|
|
const user2SharedUser = 'user2SharedUser';
|
|
const user2SharedLink = 'user2SharedLink';
|
|
const user2NotShared = 'user2NotShared';
|
|
const user4DeletedAsset = 'user4DeletedAsset';
|
|
const user4Empty = 'user4Empty';
|
|
|
|
describe('/albums', () => {
|
|
let admin: LoginResponseDto;
|
|
let user1: LoginResponseDto;
|
|
let user1Asset1: AssetMediaResponseDto;
|
|
let user1Asset2: AssetMediaResponseDto;
|
|
let user4Asset1: AssetMediaResponseDto;
|
|
let user1Albums: AlbumResponseDto[];
|
|
let user2: LoginResponseDto;
|
|
let user2Albums: AlbumResponseDto[];
|
|
let deletedAssetAlbum: AlbumResponseDto;
|
|
let user3: LoginResponseDto; // deleted
|
|
let user4: LoginResponseDto;
|
|
|
|
beforeAll(async () => {
|
|
await utils.resetDatabase();
|
|
|
|
admin = await utils.adminSetup();
|
|
|
|
[user1, user2, user3, user4] = await Promise.all([
|
|
utils.userSetup(admin.accessToken, createUserDto.user1),
|
|
utils.userSetup(admin.accessToken, createUserDto.user2),
|
|
utils.userSetup(admin.accessToken, createUserDto.user3),
|
|
utils.userSetup(admin.accessToken, createUserDto.user4),
|
|
]);
|
|
|
|
[user1Asset1, user1Asset2, user4Asset1] = await Promise.all([
|
|
utils.createAsset(user1.accessToken, { isFavorite: true }),
|
|
utils.createAsset(user1.accessToken),
|
|
utils.createAsset(user1.accessToken),
|
|
]);
|
|
|
|
[user1Albums, user2Albums, deletedAssetAlbum] = await Promise.all([
|
|
Promise.all([
|
|
utils.createAlbum(user1.accessToken, {
|
|
albumName: user1SharedEditorUser,
|
|
albumUsers: [
|
|
{ userId: admin.userId, role: AlbumUserRole.Editor },
|
|
{ userId: user2.userId, role: AlbumUserRole.Editor },
|
|
],
|
|
assetIds: [user1Asset1.id],
|
|
}),
|
|
utils.createAlbum(user1.accessToken, {
|
|
albumName: user1SharedLink,
|
|
assetIds: [user1Asset1.id],
|
|
}),
|
|
utils.createAlbum(user1.accessToken, {
|
|
albumName: user1NotShared,
|
|
assetIds: [user1Asset1.id, user1Asset2.id],
|
|
}),
|
|
utils.createAlbum(user1.accessToken, {
|
|
albumName: user1SharedViewerUser,
|
|
albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Viewer }],
|
|
assetIds: [user1Asset1.id],
|
|
}),
|
|
]),
|
|
Promise.all([
|
|
utils.createAlbum(user2.accessToken, {
|
|
albumName: user2SharedUser,
|
|
albumUsers: [
|
|
{ userId: user1.userId, role: AlbumUserRole.Editor },
|
|
{ userId: user3.userId, role: AlbumUserRole.Editor },
|
|
],
|
|
}),
|
|
utils.createAlbum(user2.accessToken, { albumName: user2SharedLink }),
|
|
utils.createAlbum(user2.accessToken, { albumName: user2NotShared }),
|
|
]),
|
|
utils.createAlbum(user4.accessToken, { albumName: user4DeletedAsset }),
|
|
utils.createAlbum(user4.accessToken, { albumName: user4Empty }),
|
|
utils.createAlbum(user3.accessToken, {
|
|
albumName: 'Deleted',
|
|
albumUsers: [{ userId: user1.userId, role: AlbumUserRole.Editor }],
|
|
}),
|
|
]);
|
|
|
|
await Promise.all([
|
|
addAssetsToAlbum(
|
|
{ id: user2Albums[0].id, bulkIdsDto: { ids: [user1Asset1.id, user1Asset2.id] } },
|
|
{ headers: asBearerAuth(user1.accessToken) },
|
|
),
|
|
addAssetsToAlbum(
|
|
{ id: deletedAssetAlbum.id, bulkIdsDto: { ids: [user4Asset1.id] } },
|
|
{ headers: asBearerAuth(user4.accessToken) },
|
|
),
|
|
// add shared link to user1SharedLink album
|
|
utils.createSharedLink(user1.accessToken, {
|
|
type: SharedLinkType.Album,
|
|
albumId: user1Albums[1].id,
|
|
}),
|
|
// add shared link to user2SharedLink album
|
|
utils.createSharedLink(user2.accessToken, {
|
|
type: SharedLinkType.Album,
|
|
albumId: user2Albums[1].id,
|
|
}),
|
|
]);
|
|
|
|
[user2Albums[0]] = await Promise.all([
|
|
getAlbumInfo({ id: user2Albums[0].id }, { headers: asBearerAuth(user2.accessToken) }),
|
|
deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) }),
|
|
utils.deleteAssets(user1.accessToken, [user4Asset1.id]),
|
|
]);
|
|
});
|
|
|
|
describe('GET /albums', () => {
|
|
it("should not show other users' favorites", async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums/${user1Albums[0].id}?withoutAssets=false`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`);
|
|
expect(status).toEqual(200);
|
|
expect(body).toEqual({
|
|
...user1Albums[0],
|
|
assets: [expect.objectContaining({ isFavorite: false })],
|
|
contributorCounts: [{ userId: user1.userId, assetCount: 1 }],
|
|
lastModifiedAssetTimestamp: expect.any(String),
|
|
startDate: expect.any(String),
|
|
endDate: expect.any(String),
|
|
shared: true,
|
|
albumUsers: expect.any(Array),
|
|
});
|
|
});
|
|
|
|
it('should not return shared albums with a deleted owner', async () => {
|
|
const { status, body } = await request(app)
|
|
.get('/albums?shared=true')
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toHaveLength(4);
|
|
expect(body).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedLink,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedEditorUser,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedViewerUser,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user2.userId,
|
|
albumName: user2SharedUser,
|
|
shared: true,
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
|
|
it('should return the album collection including owned and shared', async () => {
|
|
const { status, body } = await request(app).get('/albums').set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(200);
|
|
expect(body).toHaveLength(4);
|
|
expect(body).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedEditorUser,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedViewerUser,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedLink,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1NotShared,
|
|
shared: false,
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
|
|
it('should return the album collection filtered by shared', async () => {
|
|
const { status, body } = await request(app)
|
|
.get('/albums?shared=true')
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(200);
|
|
expect(body).toHaveLength(4);
|
|
expect(body).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedEditorUser,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedViewerUser,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1SharedLink,
|
|
shared: true,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user2.userId,
|
|
albumName: user2SharedUser,
|
|
shared: true,
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
|
|
it('should return the album collection filtered by NOT shared', async () => {
|
|
const { status, body } = await request(app)
|
|
.get('/albums?shared=false')
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(200);
|
|
expect(body).toHaveLength(1);
|
|
expect(body).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
ownerId: user1.userId,
|
|
albumName: user1NotShared,
|
|
shared: false,
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
|
|
it('should return the album collection filtered by assetId', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums?assetId=${user1Asset2.id}`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(200);
|
|
expect(body).toHaveLength(2);
|
|
});
|
|
|
|
it('should return the album collection filtered by assetId and ignores shared=true', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums?shared=true&assetId=${user1Asset1.id}`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(200);
|
|
expect(body).toHaveLength(5);
|
|
});
|
|
|
|
it('should return the album collection filtered by assetId and ignores shared=false', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums?shared=false&assetId=${user1Asset1.id}`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(200);
|
|
expect(body).toHaveLength(5);
|
|
});
|
|
|
|
it('should return empty albums and albums where all assets are deleted', async () => {
|
|
const { status, body } = await request(app).get('/albums').set('Authorization', `Bearer ${user4.accessToken}`);
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
ownerId: user4.userId,
|
|
albumName: user4DeletedAsset,
|
|
shared: false,
|
|
}),
|
|
expect.objectContaining({
|
|
ownerId: user4.userId,
|
|
albumName: user4Empty,
|
|
shared: false,
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('GET /albums/:id', () => {
|
|
it('should return album info for own album', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums/${user1Albums[0].id}?withoutAssets=false`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual({
|
|
...user1Albums[0],
|
|
assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
|
|
contributorCounts: [{ userId: user1.userId, assetCount: 1 }],
|
|
lastModifiedAssetTimestamp: expect.any(String),
|
|
startDate: expect.any(String),
|
|
endDate: expect.any(String),
|
|
albumUsers: expect.any(Array),
|
|
shared: true,
|
|
});
|
|
});
|
|
|
|
it('should return album info for shared album (editor)', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums/${user2Albums[0].id}?withoutAssets=false`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toMatchObject({ id: user2Albums[0].id });
|
|
});
|
|
|
|
it('should return album info for shared album (viewer)', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums/${user1Albums[3].id}?withoutAssets=false`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toMatchObject({ id: user1Albums[3].id });
|
|
});
|
|
|
|
it('should return album info with assets when withoutAssets is undefined', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums/${user1Albums[0].id}`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual({
|
|
...user1Albums[0],
|
|
assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
|
|
contributorCounts: [{ userId: user1.userId, assetCount: 1 }],
|
|
lastModifiedAssetTimestamp: expect.any(String),
|
|
startDate: expect.any(String),
|
|
endDate: expect.any(String),
|
|
albumUsers: expect.any(Array),
|
|
shared: true,
|
|
});
|
|
});
|
|
|
|
it('should return album info without assets when withoutAssets is true', async () => {
|
|
const { status, body } = await request(app)
|
|
.get(`/albums/${user1Albums[0].id}?withoutAssets=true`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual({
|
|
...user1Albums[0],
|
|
assets: [],
|
|
contributorCounts: [{ userId: user1.userId, assetCount: 1 }],
|
|
assetCount: 1,
|
|
lastModifiedAssetTimestamp: expect.any(String),
|
|
endDate: expect.any(String),
|
|
startDate: expect.any(String),
|
|
albumUsers: expect.any(Array),
|
|
shared: true,
|
|
});
|
|
});
|
|
|
|
it('should not count trashed assets', async () => {
|
|
await utils.deleteAssets(user1.accessToken, [user1Asset2.id]);
|
|
|
|
const { status, body } = await request(app)
|
|
.get(`/albums/${user2Albums[0].id}?withoutAssets=true`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual({
|
|
...user2Albums[0],
|
|
assets: [],
|
|
contributorCounts: [{ userId: user1.userId, assetCount: 1 }],
|
|
assetCount: 1,
|
|
lastModifiedAssetTimestamp: expect.any(String),
|
|
endDate: expect.any(String),
|
|
startDate: expect.any(String),
|
|
albumUsers: expect.any(Array),
|
|
shared: true,
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('GET /albums/statistics', () => {
|
|
it('should return total count of albums the user has access to', async () => {
|
|
const { status, body } = await request(app)
|
|
.get('/albums/statistics')
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual({ owned: 4, shared: 4, notShared: 1 });
|
|
});
|
|
});
|
|
|
|
describe('POST /albums', () => {
|
|
it('should create an album', async () => {
|
|
const { status, body } = await request(app)
|
|
.post('/albums')
|
|
.send({ albumName: 'New album' })
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(201);
|
|
expect(body).toEqual({
|
|
id: expect.any(String),
|
|
createdAt: expect.any(String),
|
|
updatedAt: expect.any(String),
|
|
ownerId: user1.userId,
|
|
albumName: 'New album',
|
|
description: '',
|
|
albumThumbnailAssetId: null,
|
|
shared: false,
|
|
albumUsers: [],
|
|
hasSharedLink: false,
|
|
assets: [],
|
|
assetCount: 0,
|
|
owner: expect.objectContaining({ email: user1.userEmail }),
|
|
isActivityEnabled: true,
|
|
order: AssetOrder.Desc,
|
|
});
|
|
});
|
|
|
|
it('should not be able to share album with owner', async () => {
|
|
const { status, body } = await request(app)
|
|
.post('/albums')
|
|
.send({ albumName: 'New album', albumUsers: [{ role: AlbumUserRole.Editor, userId: user1.userId }] })
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('Cannot share album with owner'));
|
|
});
|
|
});
|
|
|
|
describe('PUT /albums/:id/assets', () => {
|
|
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)
|
|
.put(`/albums/${user1Albums[0].id}/assets`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ ids: [asset.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([expect.objectContaining({ id: asset.id, success: true })]);
|
|
});
|
|
|
|
it('should be able to add own asset to shared album', async () => {
|
|
const asset = await utils.createAsset(user1.accessToken);
|
|
const { status, body } = await request(app)
|
|
.put(`/albums/${user2Albums[0].id}/assets`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ ids: [asset.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([expect.objectContaining({ id: asset.id, success: true })]);
|
|
});
|
|
|
|
it('should not be able to add assets to album as a viewer', async () => {
|
|
const asset = await utils.createAsset(user2.accessToken);
|
|
const { status, body } = await request(app)
|
|
.put(`/albums/${user1Albums[3].id}/assets`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ ids: [asset.id] });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('Not found or no albumAsset.create access'));
|
|
});
|
|
|
|
it('should add duplicate assets only once', async () => {
|
|
const asset = await utils.createAsset(user1.accessToken);
|
|
const { status, body } = await request(app)
|
|
.put(`/albums/${user1Albums[0].id}/assets`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ ids: [asset.id, asset.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([
|
|
expect.objectContaining({ id: asset.id, success: true }),
|
|
expect.objectContaining({ id: asset.id, success: false, error: 'duplicate' }),
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe('PATCH /albums/:id', () => {
|
|
it('should update an album', async () => {
|
|
const album = await utils.createAlbum(user1.accessToken, {
|
|
albumName: 'New album',
|
|
});
|
|
const { status, body } = await request(app)
|
|
.patch(`/albums/${album.id}`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({
|
|
albumName: 'New album name',
|
|
description: 'An album description',
|
|
});
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual({
|
|
...album,
|
|
updatedAt: expect.any(String),
|
|
albumName: 'New album name',
|
|
description: 'An album description',
|
|
});
|
|
});
|
|
|
|
it('should not be able to update as a viewer', async () => {
|
|
const { status, body } = await request(app)
|
|
.patch(`/albums/${user1Albums[3].id}`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ albumName: 'New album name' });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('Not found or no album.update access'));
|
|
});
|
|
|
|
it('should not be able to update as an editor', async () => {
|
|
const { status, body } = await request(app)
|
|
.patch(`/albums/${user1Albums[0].id}`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ albumName: 'New album name' });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('Not found or no album.update access'));
|
|
});
|
|
});
|
|
|
|
describe('DELETE /albums/:id/assets', () => {
|
|
it('should require authorization', async () => {
|
|
const { status, body } = await request(app)
|
|
.delete(`/albums/${user1Albums[1].id}/assets`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ ids: [user1Asset1.id] });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.noPermission);
|
|
});
|
|
|
|
it('should be able to remove foreign asset from owned album', async () => {
|
|
const { status, body } = await request(app)
|
|
.delete(`/albums/${user2Albums[0].id}/assets`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ ids: [user1Asset1.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([
|
|
expect.objectContaining({
|
|
id: user1Asset1.id,
|
|
success: true,
|
|
}),
|
|
]);
|
|
});
|
|
|
|
it('should not be able to remove foreign asset from foreign album', async () => {
|
|
const { status, body } = await request(app)
|
|
.delete(`/albums/${user1Albums[0].id}/assets`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ ids: [user1Asset1.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([
|
|
expect.objectContaining({
|
|
id: user1Asset1.id,
|
|
success: false,
|
|
error: 'no_permission',
|
|
}),
|
|
]);
|
|
});
|
|
|
|
it('should be able to remove own asset from own album', async () => {
|
|
const { status, body } = await request(app)
|
|
.delete(`/albums/${user1Albums[0].id}/assets`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ ids: [user1Asset1.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([expect.objectContaining({ id: user1Asset1.id, success: true })]);
|
|
});
|
|
|
|
it('should be able to remove own asset from shared album', async () => {
|
|
const { status, body } = await request(app)
|
|
.delete(`/albums/${user2Albums[0].id}/assets`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ ids: [user1Asset2.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([expect.objectContaining({ id: user1Asset2.id, success: true })]);
|
|
});
|
|
|
|
it('should not be able to remove assets from album as a viewer', async () => {
|
|
const { status, body } = await request(app)
|
|
.delete(`/albums/${user1Albums[3].id}/assets`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ ids: [user1Asset1.id] });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('Not found or no albumAsset.delete access'));
|
|
});
|
|
|
|
it('should remove duplicate assets only once', async () => {
|
|
const { status, body } = await request(app)
|
|
.delete(`/albums/${user1Albums[1].id}/assets`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ ids: [user1Asset1.id, user1Asset1.id] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual([
|
|
expect.objectContaining({ id: user1Asset1.id, success: true }),
|
|
expect.objectContaining({ id: user1Asset1.id, success: false, error: 'not_found' }),
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe('PUT :id/users', () => {
|
|
let album: AlbumResponseDto;
|
|
|
|
beforeEach(async () => {
|
|
album = await utils.createAlbum(user1.accessToken, {
|
|
albumName: 'testAlbum',
|
|
});
|
|
});
|
|
|
|
it('should be able to add user to own album', async () => {
|
|
const { status, body } = await request(app)
|
|
.put(`/albums/${album.id}/users`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Editor }] });
|
|
|
|
expect(status).toBe(200);
|
|
expect(body).toEqual(
|
|
expect.objectContaining({
|
|
albumUsers: [
|
|
expect.objectContaining({
|
|
user: expect.objectContaining({ id: user2.userId }),
|
|
}),
|
|
],
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should not be able to share album with owner', async () => {
|
|
const { status, body } = await request(app)
|
|
.put(`/albums/${album.id}/users`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ albumUsers: [{ userId: user1.userId, role: AlbumUserRole.Editor }] });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('Cannot be shared with owner'));
|
|
});
|
|
|
|
it('should not be able to add existing user to shared album', async () => {
|
|
await request(app)
|
|
.put(`/albums/${album.id}/users`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Editor }] });
|
|
|
|
const { status, body } = await request(app)
|
|
.put(`/albums/${album.id}/users`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Editor }] });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('User already added'));
|
|
});
|
|
});
|
|
|
|
describe('PUT :id/user/:userId', () => {
|
|
it('should allow the album owner to change the role of a shared user', async () => {
|
|
const album = await utils.createAlbum(user1.accessToken, {
|
|
albumName: 'testAlbum',
|
|
albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Viewer }],
|
|
});
|
|
|
|
expect(album.albumUsers[0].role).toEqual(AlbumUserRole.Viewer);
|
|
|
|
const { status } = await request(app)
|
|
.put(`/albums/${album.id}/user/${user2.userId}`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`)
|
|
.send({ role: AlbumUserRole.Editor });
|
|
|
|
expect(status).toBe(204);
|
|
|
|
// Get album to verify the role change
|
|
const { body } = await request(app)
|
|
.get(`/albums/${album.id}`)
|
|
.set('Authorization', `Bearer ${user1.accessToken}`);
|
|
expect(body).toEqual(
|
|
expect.objectContaining({
|
|
albumUsers: [expect.objectContaining({ role: AlbumUserRole.Editor })],
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should not allow a shared user to change the role of another shared user', async () => {
|
|
const album = await utils.createAlbum(user1.accessToken, {
|
|
albumName: 'testAlbum',
|
|
albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Viewer }],
|
|
});
|
|
|
|
expect(album.albumUsers[0].role).toEqual(AlbumUserRole.Viewer);
|
|
|
|
const { status, body } = await request(app)
|
|
.put(`/albums/${album.id}/user/${user2.userId}`)
|
|
.set('Authorization', `Bearer ${user2.accessToken}`)
|
|
.send({ role: AlbumUserRole.Editor });
|
|
|
|
expect(status).toBe(400);
|
|
expect(body).toEqual(errorDto.badRequest('Not found or no album.share access'));
|
|
});
|
|
});
|
|
});
|