revert docs changes in this branch

.dockerignore

@@ -1,31 +1,30 @@
 .vscode/
-.github/
-.git/
 
 design/
 docker/
 docs/
-e2e/
 fastlane/
 machine-learning/
 misc/
 mobile/
 
-cli/coverage/
-cli/dist/
-cli/node_modules/
-
-open-api/typescript-sdk/build/
-open-api/typescript-sdk/node_modules/
-
-server/coverage/
 server/node_modules/
+server/coverage/
+server/.reverse-geocoding-dump/
 server/upload/
 server/dist/
-server/www/
-server/test/assets/
 
 web/node_modules/
 web/coverage/
 web/.svelte-kit
 web/build/
+
+cli/node_modules/
+cli/.reverse-geocoding-dump/
+cli/upload/
+cli/dist/
+
+e2e/
+
+open-api/typescript-sdk/node_modules/
+open-api/typescript-sdk/build/

.editorconfig

@@ -16,4 +16,4 @@ max_line_length = off
 trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
-quote_type = single
+quote_type = double

.gitattributes

@@ -8,6 +8,8 @@ mobile/openapi/.openapi-generator/FILES linguist-generated=true
 mobile/lib/**/*.g.dart -diff -merge
 mobile/lib/**/*.g.dart linguist-generated=true
 
+open-api/typescript-sdk/axios-client/**/* -diff -merge
+open-api/typescript-sdk/axios-client/**/* linguist-generated=true
 open-api/typescript-sdk/fetch-client.ts -diff -merge
 open-api/typescript-sdk/fetch-client.ts linguist-generated=true
 

.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Run e2e tests
         run: make server-e2e-jobs
@@ -184,7 +184,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -194,40 +194,25 @@ jobs:
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
         working-directory: ./open-api/typescript-sdk
-        if: ${{ !cancelled() }}
 
       - name: Run setup cli
         run: npm ci && npm run build
         working-directory: ./cli
-        if: ${{ !cancelled() }}
 
       - name: Install dependencies
         run: npm ci
-        if: ${{ !cancelled() }}
-
-      - name: Run linter
-        run: npm run lint
-        if: ${{ !cancelled() }}
-
-      - name: Run formatter
-        run: npm run format
-        if: ${{ !cancelled() }}
 
       - name: Install Playwright Browsers
-        run: npx playwright install --with-deps chromium
-        if: ${{ !cancelled() }}
+        run: npx playwright install --with-deps
 
       - name: Docker build
         run: docker compose build
-        if: ${{ !cancelled() }}
 
       - name: Run e2e tests (api & cli)
         run: npm run test
-        if: ${{ !cancelled() }}
 
       - name: Run e2e tests (web)
         run: npx playwright test
-        if: ${{ !cancelled() }}
 
   mobile-unit-tests:
     name: Mobile
@@ -237,8 +222,8 @@ jobs:
       - name: Setup Flutter SDK
         uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
-          flutter-version: '3.16.9'
+          channel: "stable"
+          flutter-version: "3.16.9"
       - name: Run tests
         working-directory: ./mobile
         run: flutter test -j 1
@@ -256,7 +241,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.11
-          cache: 'poetry'
+          cache: "poetry"
       - name: Install dependencies
         run: |
           poetry install --with dev --with cpu
@@ -294,7 +279,7 @@ jobs:
       - name: Run API generation
         run: make open-api
       - name: Find file changes
-        uses: tj-actions/verify-changed-files@v19
+        uses: tj-actions/verify-changed-files@v18
         id: verify-changed-files
         with:
           files: |
@@ -349,7 +334,7 @@ jobs:
         run: npm run typeorm:migrations:generate ./src/infra/migrations/TestMigration
 
       - name: Find file changes
-        uses: tj-actions/verify-changed-files@v19
+        uses: tj-actions/verify-changed-files@v18
         id: verify-changed-files
         with:
           files: |
@@ -367,7 +352,7 @@ jobs:
           DB_URL: postgres://postgres:postgres@localhost:5432/immich
 
       - name: Find file changes
-        uses: tj-actions/verify-changed-files@v19
+        uses: tj-actions/verify-changed-files@v18
         id: verify-changed-sql-files
         with:
           files: |

cli/package-lock.json

@@ -54,6 +54,14 @@
         "@oazapfts/runtime": "^1.0.0",
         "@types/node": "^20.11.0",
         "typescript": "^5.3.3"
+      },
+      "peerDependencies": {
+        "axios": "^1.6.7"
+      },
+      "peerDependenciesMeta": {
+        "axios": {
+          "optional": true
+        }
       }
     },
     "../server": {

docker/docker-compose.dev.yml

@@ -2,7 +2,7 @@
 # - https://immich.app/docs/developer/setup
 # - https://immich.app/docs/developer/troubleshooting
 
-version: '3.8'
+version: "3.8"
 
 name: immich-dev
 
@@ -30,7 +30,7 @@ x-server-build: &server-common
 services:
   immich-server:
     container_name: immich_server
-    command: ['/usr/src/app/bin/immich-dev', 'immich']
+    command: [ "/usr/src/app/bin/immich-dev", "immich" ]
     <<: *server-common
     ports:
       - 3001:3001
@@ -41,7 +41,7 @@ services:
 
   immich-microservices:
     container_name: immich_microservices
-    command: ['/usr/src/app/bin/immich-dev', 'microservices']
+    command: [ "/usr/src/app/bin/immich-dev", "microservices" ]
     <<: *server-common
     # extends:
     #   file: hwaccel.transcoding.yml
@@ -57,7 +57,7 @@ services:
     image: immich-web-dev:latest
     build:
       context: ../web
-    command: ['/usr/src/app/bin/immich-web']
+    command: [ "/usr/src/app/bin/immich-web" ]
     env_file:
       - .env
     ports:

docker/docker-compose.prod.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 name: immich-prod
 
@@ -17,7 +17,7 @@ x-server-build: &server-common
 services:
   immich-server:
     container_name: immich_server
-    command: ['start.sh', 'immich']
+    command: [ "start.sh", "immich" ]
     <<: *server-common
     ports:
       - 2283:3001
@@ -27,7 +27,7 @@ services:
 
   immich-microservices:
     container_name: immich_microservices
-    command: ['start.sh', 'microservices']
+    command: [ "start.sh", "microservices" ]
     <<: *server-common
     # extends:
     #   file: hwaccel.transcoding.yml

docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 #
 # WARNING: Make sure to use the docker-compose.yml of the current release:
@@ -14,7 +14,7 @@ services:
   immich-server:
     container_name: immich_server
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    command: ['start.sh', 'immich']
+    command: [ "start.sh", "immich" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
@@ -33,7 +33,7 @@ services:
     # extends: # uncomment this section for hardware acceleration - see https://immich.app/docs/features/hardware-transcoding
     #   file: hwaccel.transcoding.yml
     #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
-    command: ['start.sh', 'microservices']
+    command: [ "start.sh", "microservices" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro

e2e/.eslintrc.cjs

@@ -1,31 +0,0 @@
-module.exports = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
-    tsconfigRootDir: __dirname,
-  },
-  plugins: ['@typescript-eslint/eslint-plugin'],
-  extends: ['plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended', 'plugin:unicorn/recommended'],
-  root: true,
-  env: {
-    node: true,
-  },
-  ignorePatterns: ['.eslintrc.js'],
-  rules: {
-    '@typescript-eslint/interface-name-prefix': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-floating-promises': 'error',
-    'unicorn/prefer-module': 'off',
-    curly: 2,
-    'prettier/prettier': 0,
-    'unicorn/prevent-abbreviations': 'off',
-    'unicorn/filename-case': 'off',
-    'unicorn/no-null': 'off',
-    'unicorn/prefer-top-level-await': 'off',
-    'unicorn/prefer-event-target': 'off',
-    'unicorn/no-thenable': 'off',
-  },
-};

e2e/.prettierignore

@@ -1,16 +0,0 @@
-.DS_Store
-node_modules
-/build
-/package
-.env
-.env.*
-!.env.example
-*.md
-*.json
-coverage
-dist
-
-# Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
-package-lock.json
-yarn.lock

e2e/.prettierrc

@@ -1,8 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 120,
-  "semi": true,
-  "organizeImportsSkipDestructiveCodeActions": true,
-  "plugins": ["prettier-plugin-organize-imports"]
-}

e2e/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 name: immich-e2e
 
@@ -16,7 +16,6 @@ x-server-build: &server-common
     - IMMICH_MACHINE_LEARNING_ENABLED=false
   volumes:
     - upload:/usr/src/app/upload
-    - ../server/test/assets:/data/assets
   depends_on:
     - redis
     - database
@@ -24,14 +23,14 @@ x-server-build: &server-common
 services:
   immich-server:
     container_name: immich-e2e-server
-    command: ['./start.sh', 'immich']
+    command: [ "./start.sh", "immich" ]
     <<: *server-common
     ports:
       - 2283:3001
 
   immich-microservices:
     container_name: immich-e2e-microservices
-    command: ['./start.sh', 'microservices']
+    command: [ "./start.sh", "microservices" ]
     <<: *server-common
 
   redis:

e2e/package.json

@@ -7,11 +7,7 @@
   "scripts": {
     "test": "vitest --config vitest.config.ts",
     "test:web": "npx playwright test",
-    "start:web": "npx playwright test --ui",
-    "format": "prettier --check .",
-    "format:fix": "prettier --write .",
-    "lint": "eslint \"src/**/*.ts\" --max-warnings 0",
-    "lint:fix": "npm run lint -- --fix"
+    "start:web": "npx playwright test --ui"
   },
   "keywords": [],
   "author": "",
@@ -23,21 +19,11 @@
     "@types/luxon": "^3.4.2",
     "@types/node": "^20.11.17",
     "@types/pg": "^8.11.0",
-    "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
     "@vitest/coverage-v8": "^1.3.0",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^51.0.1",
     "exiftool-vendored": "^24.5.0",
     "luxon": "^3.4.4",
     "pg": "^8.11.3",
-    "pngjs": "^7.0.0",
-    "prettier": "^3.2.5",
-    "prettier-plugin-organize-imports": "^3.2.4",
     "socket.io-client": "^4.7.4",
     "supertest": "^6.3.4",
     "typescript": "^5.3.3",

e2e/src/api/specs/activity.e2e-spec.ts

@@ -20,7 +20,10 @@ describe('/activity', () => {
   let album: AlbumResponseDto;
 
   const createActivity = (dto: ActivityCreateDto, accessToken?: string) =>
-    create({ activityCreateDto: dto }, { headers: asBearerAuth(accessToken || admin.accessToken) });
+    create(
+      { activityCreateDto: dto },
+      { headers: asBearerAuth(accessToken || admin.accessToken) },
+    );
 
   beforeAll(async () => {
     apiUtils.setup();
@@ -53,9 +56,13 @@ describe('/activity', () => {
     });
 
     it('should require an albumId', async () => {
-      const { status, body } = await request(app).get('/activity').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/activity')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])),
+      );
     });
 
     it('should reject an invalid albumId', async () => {
@@ -64,7 +71,9 @@ describe('/activity', () => {
         .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'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])),
+      );
     });
 
     it('should reject an invalid assetId', async () => {
@@ -73,7 +82,9 @@ describe('/activity', () => {
         .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'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['assetId must be a UUID'])),
+      );
     });
 
     it('should start off empty', async () => {
@@ -149,7 +160,9 @@ describe('/activity', () => {
     });
 
     it('should filter by userId', async () => {
-      const [reaction] = await Promise.all([createActivity({ albumId: album.id, type: ReactionType.Like })]);
+      const [reaction] = await Promise.all([
+        createActivity({ albumId: album.id, type: ReactionType.Like }),
+      ]);
 
       const response1 = await request(app)
         .get('/activity')
@@ -202,7 +215,9 @@ describe('/activity', () => {
         .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'])));
+      expect(body).toEqual(
+        errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])),
+      );
     });
 
     it('should require a comment when type is comment', async () => {
@@ -211,7 +226,12 @@ describe('/activity', () => {
         .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']));
+      expect(body).toEqual(
+        errorDto.badRequest([
+          'comment must be a string',
+          'comment should not be empty',
+        ]),
+      );
     });
 
     it('should add a comment to an album', async () => {
@@ -251,7 +271,9 @@ describe('/activity', () => {
     });
 
     it('should return a 200 for a duplicate like on the album', async () => {
-      const [reaction] = await Promise.all([createActivity({ albumId: album.id, type: ReactionType.Like })]);
+      const [reaction] = await Promise.all([
+        createActivity({ albumId: album.id, type: ReactionType.Like }),
+      ]);
 
       const { status, body } = await request(app)
         .post('/activity')
@@ -334,7 +356,9 @@ describe('/activity', () => {
 
   describe('DELETE /activity/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/activity/${uuidDto.notFound}`);
+      const { status, body } = await request(app).delete(
+        `/activity/${uuidDto.notFound}`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -396,7 +420,9 @@ describe('/activity', () => {
         .set('Authorization', `Bearer ${nonOwner.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no activity.delete access'));
+      expect(body).toEqual(
+        errorDto.badRequest('Not found or no activity.delete access'),
+      );
     });
 
     it('should let a non-owner remove their own comment', async () => {

e2e/src/api/specs/album.e2e-spec.ts

@@ -93,7 +93,10 @@ describe('/album', () => {
       }),
     ]);
 
-    await deleteUser({ id: user3.userId }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser(
+      { id: user3.userId },
+      { headers: asBearerAuth(admin.accessToken) },
+    );
   });
 
   describe('GET /album', () => {
@@ -108,7 +111,9 @@ describe('/album', () => {
         .get('/album?shared=invalid')
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toEqual(400);
-      expect(body).toEqual(errorDto.badRequest(['shared must be a boolean value']));
+      expect(body).toEqual(
+        errorDto.badRequest(['shared must be a boolean value']),
+      );
     });
 
     it('should reject an invalid assetId param', async () => {
@@ -148,7 +153,9 @@ describe('/album', () => {
     });
 
     it('should return the album collection including owned and shared', async () => {
-      const { status, body } = await request(app).get('/album').set('Authorization', `Bearer ${user1.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/album')
+        .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(3);
       expect(body).toEqual(
@@ -243,7 +250,9 @@ describe('/album', () => {
 
   describe('GET /album/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/album/${user1Albums[0].id}`);
+      const { status, body } = await request(app).get(
+        `/album/${user1Albums[0].id}`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -256,7 +265,7 @@ describe('/album', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         ...user1Albums[0],
-        assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
+        assets: [expect.objectContaining(user1Albums[0].assets[0])],
       });
     });
 
@@ -268,7 +277,7 @@ describe('/album', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         ...user2Albums[0],
-        assets: [expect.objectContaining({ id: user2Albums[0].assets[0].id })],
+        assets: [expect.objectContaining(user2Albums[0].assets[0])],
       });
     });
 
@@ -280,7 +289,7 @@ describe('/album', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         ...user1Albums[0],
-        assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
+        assets: [expect.objectContaining(user1Albums[0].assets[0])],
       });
     });
 
@@ -317,7 +326,9 @@ describe('/album', () => {
 
   describe('POST /album', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/album').send({ albumName: 'New album' });
+      const { status, body } = await request(app)
+        .post('/album')
+        .send({ albumName: 'New album' });
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -349,7 +360,9 @@ describe('/album', () => {
 
   describe('PUT /album/:id/assets', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/album/${user1Albums[0].id}/assets`);
+      const { status, body } = await request(app).put(
+        `/album/${user1Albums[0].id}/assets`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -362,7 +375,9 @@ describe('/album', () => {
         .send({ ids: [asset.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: asset.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: asset.id, success: true }),
+      ]);
     });
 
     it('should be able to add own asset to shared album', async () => {
@@ -373,7 +388,9 @@ describe('/album', () => {
         .send({ ids: [asset.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: asset.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: asset.id, success: true }),
+      ]);
     });
   });
 
@@ -456,7 +473,9 @@ describe('/album', () => {
         .send({ ids: [user1Asset1.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: user1Asset1.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: user1Asset1.id, success: true }),
+      ]);
     });
 
     it('should be able to remove own asset from shared album', async () => {
@@ -466,7 +485,9 @@ describe('/album', () => {
         .send({ ids: [user1Asset1.id] });
 
       expect(status).toBe(200);
-      expect(body).toEqual([expect.objectContaining({ id: user1Asset1.id, success: true })]);
+      expect(body).toEqual([
+        expect.objectContaining({ id: user1Asset1.id, success: true }),
+      ]);
     });
   });
 
@@ -480,7 +501,9 @@ describe('/album', () => {
     });
 
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/album/${user1Albums[0].id}/users`).send({ sharedUserIds: [] });
+      const { status, body } = await request(app)
+        .put(`/album/${user1Albums[0].id}/users`)
+        .send({ sharedUserIds: [] });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);

e2e/src/api/specs/asset.e2e-spec.ts

@@ -13,15 +13,21 @@ import { basename, join } from 'node:path';
 import { Socket } from 'socket.io-client';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
-import { apiUtils, app, dbUtils, tempDir, testAssetDir, wsUtils } from 'src/utils';
+import {
+  apiUtils,
+  app,
+  dbUtils,
+  tempDir,
+  testAssetDir,
+  wsUtils,
+} from 'src/utils';
 import request from 'supertest';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-
 const locationAssetFilepath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`;
 
-const sha1 = (bytes: Buffer) => createHash('sha1').update(bytes).digest('base64');
+const sha1 = (bytes: Buffer) =>
+  createHash('sha1').update(bytes).digest('base64');
 
 const readTags = async (bytes: Buffer, filename: string) => {
   const filepath = join(tempDir, filename);
@@ -59,45 +65,50 @@ describe('/asset', () => {
     ]);
 
     // asset location
-    assetLocation = await apiUtils.createAsset(admin.accessToken, {
-      assetData: {
+    assetLocation = await apiUtils.createAsset(
+      admin.accessToken,
+      {},
+      {
         filename: 'thompson-springs.jpg',
         bytes: await readFile(locationAssetFilepath),
       },
-    });
+    );
 
     await wsUtils.waitForEvent({ event: 'upload', assetId: assetLocation.id });
 
     user1Assets = await Promise.all([
       apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(user1.accessToken),
-      apiUtils.createAsset(user1.accessToken, {
-        isFavorite: true,
-        isReadOnly: true,
-        fileCreatedAt: yesterday.toISO(),
-        fileModifiedAt: yesterday.toISO(),
-        assetData: { filename: 'example.mp4' },
-      }),
+      apiUtils.createAsset(
+        user1.accessToken,
+        {
+          isFavorite: true,
+          isExternal: true,
+          isReadOnly: true,
+          fileCreatedAt: yesterday.toISO(),
+          fileModifiedAt: yesterday.toISO(),
+        },
+        { filename: 'example.mp4' },
+      ),
       apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(user1.accessToken),
     ]);
 
     user2Assets = await Promise.all([apiUtils.createAsset(user2.accessToken)]);
 
-    for (const asset of [...user1Assets, ...user2Assets]) {
-      expect(asset.duplicate).toBe(false);
-    }
-
     await Promise.all([
       // stats
       apiUtils.createAsset(userStats.accessToken),
       apiUtils.createAsset(userStats.accessToken, { isFavorite: true }),
       apiUtils.createAsset(userStats.accessToken, { isArchived: true }),
-      apiUtils.createAsset(userStats.accessToken, {
-        isArchived: true,
-        isFavorite: true,
-        assetData: { filename: 'example.mp4' },
-      }),
+      apiUtils.createAsset(
+        userStats.accessToken,
+        {
+          isArchived: true,
+          isFavorite: true,
+        },
+        { filename: 'example.mp4' },
+      ),
     ]);
 
     const person1 = await apiUtils.createPerson(user1.accessToken, {
@@ -115,7 +126,9 @@ describe('/asset', () => {
 
   describe('GET /asset/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/${uuidDto.notFound}`);
+      const { status, body } = await request(app).get(
+        `/asset/${uuidDto.notFound}`,
+      );
       expect(body).toEqual(errorDto.unauthorized);
       expect(status).toBe(401);
     });
@@ -150,7 +163,9 @@ describe('/asset', () => {
         assetIds: [user1Assets[0].id],
       });
 
-      const { status, body } = await request(app).get(`/asset/${user1Assets[0].id}?key=${sharedLink.key}`);
+      const { status, body } = await request(app).get(
+        `/asset/${user1Assets[0].id}?key=${sharedLink.key}`,
+      );
       expect(status).toBe(200);
       expect(body).toMatchObject({ id: user1Assets[0].id });
     });
@@ -180,7 +195,9 @@ describe('/asset', () => {
         assetIds: [user1Assets[0].id],
       });
 
-      const data = await request(app).get(`/asset/${user1Assets[0].id}?key=${sharedLink.key}`);
+      const data = await request(app).get(
+        `/asset/${user1Assets[0].id}?key=${sharedLink.key}`,
+      );
       expect(data.status).toBe(200);
       expect(data.body).toMatchObject({ people: [] });
     });
@@ -263,7 +280,7 @@ describe('/asset', () => {
       expect(body).toEqual(errorDto.unauthorized);
     });
 
-    it.each(TEN_TIMES)('should return 1 random assets', async () => {
+    it.each(Array(10))('should return 1 random assets', async () => {
       const { status, body } = await request(app)
         .get('/asset/random')
         .set('Authorization', `Bearer ${user1.accessToken}`);
@@ -273,9 +290,14 @@ describe('/asset', () => {
       const assets: AssetResponseDto[] = body;
       expect(assets.length).toBe(1);
       expect(assets[0].ownerId).toBe(user1.userId);
+
+      // assets owned by user1
+      expect([user1Assets.map(({ id }) => id)]).toContain(assets[0].id);
+      // assets owned by user2
+      expect([user1Assets.map(({ id }) => id)]).not.toContain(assets[0].id);
     });
 
-    it.each(TEN_TIMES)('should return 2 random assets', async () => {
+    it.each(Array(10))('should return 2 random assets', async () => {
       const { status, body } = await request(app)
         .get('/asset/random?count=2')
         .set('Authorization', `Bearer ${user1.accessToken}`);
@@ -287,18 +309,24 @@ describe('/asset', () => {
 
       for (const asset of assets) {
         expect(asset.ownerId).toBe(user1.userId);
+        // assets owned by user1
+        expect([user1Assets.map(({ id }) => id)]).toContain(asset.id);
+        // assets owned by user2
+        expect([user2Assets.map(({ id }) => id)]).not.toContain(asset.id);
       }
     });
 
-    it.each(TEN_TIMES)(
+    it.each(Array(10))(
       'should return 1 asset if there are 10 assets in the database but user 2 only has 1',
       async () => {
         const { status, body } = await request(app)
-          .get('/asset/random')
+          .get('/[]asset/random')
           .set('Authorization', `Bearer ${user2.accessToken}`);
 
         expect(status).toBe(200);
-        expect(body).toEqual([expect.objectContaining({ id: user2Assets[0].id })]);
+        expect(body).toEqual([
+          expect.objectContaining({ id: user2Assets[0].id }),
+        ]);
       },
     );
 
@@ -313,7 +341,9 @@ describe('/asset', () => {
 
   describe('PUT /asset/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/asset/:${uuidDto.notFound}`);
+      const { status, body } = await request(app).put(
+        `/asset/:${uuidDto.notFound}`,
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -335,7 +365,10 @@ describe('/asset', () => {
     });
 
     it('should favorite an asset', async () => {
-      const before = await apiUtils.getAssetInfo(user1.accessToken, user1Assets[0].id);
+      const before = await apiUtils.getAssetInfo(
+        user1.accessToken,
+        user1Assets[0].id,
+      );
       expect(before.isFavorite).toBe(false);
 
       const { status, body } = await request(app)
@@ -347,7 +380,10 @@ describe('/asset', () => {
     });
 
     it('should archive an asset', async () => {
-      const before = await apiUtils.getAssetInfo(user1.accessToken, user1Assets[0].id);
+      const before = await apiUtils.getAssetInfo(
+        user1.accessToken,
+        user1Assets[0].id,
+      );
       expect(before.isArchived).toBe(false);
 
       const { status, body } = await request(app)
@@ -461,7 +497,9 @@ describe('/asset', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
+      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 () => {
@@ -471,7 +509,9 @@ describe('/asset', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no asset.delete access'));
+      expect(body).toEqual(
+        errorDto.badRequest('Not found or no asset.delete access'),
+      );
     });
 
     it('should move an asset to the trash', async () => {
@@ -607,9 +647,11 @@ describe('/asset', () => {
     for (const { input, expected } of tests) {
       it(`should generate a thumbnail for ${input}`, async () => {
         const filepath = join(testAssetDir, input);
-        const { id, duplicate } = await apiUtils.createAsset(admin.accessToken, {
-          assetData: { bytes: await readFile(filepath), filename: basename(filepath) },
-        });
+        const { id, duplicate } = await apiUtils.createAsset(
+          admin.accessToken,
+          {},
+          { bytes: await readFile(filepath), filename: basename(filepath) },
+        );
 
         expect(duplicate).toBe(false);
 
@@ -625,12 +667,14 @@ describe('/asset', () => {
 
     it('should handle a duplicate', async () => {
       const filepath = 'formats/jpeg/el_torcal_rocks.jpeg';
-      const { duplicate } = await apiUtils.createAsset(admin.accessToken, {
-        assetData: {
+      const { duplicate } = await apiUtils.createAsset(
+        admin.accessToken,
+        {},
+        {
           bytes: await readFile(join(testAssetDir, filepath)),
           filename: basename(filepath),
         },
-      });
+      );
 
       expect(duplicate).toBe(true);
     });
@@ -657,21 +701,29 @@ describe('/asset', () => {
 
     for (const { filepath, checksum } of motionTests) {
       it(`should extract motionphoto video from ${filepath}`, async () => {
-        const response = await apiUtils.createAsset(admin.accessToken, {
-          assetData: {
+        const response = await apiUtils.createAsset(
+          admin.accessToken,
+          {},
+          {
             bytes: await readFile(join(testAssetDir, filepath)),
             filename: basename(filepath),
           },
-        });
+        );
 
         await wsUtils.waitForEvent({ event: 'upload', assetId: response.id });
 
         expect(response.duplicate).toBe(false);
 
-        const asset = await apiUtils.getAssetInfo(admin.accessToken, response.id);
+        const asset = await apiUtils.getAssetInfo(
+          admin.accessToken,
+          response.id,
+        );
         expect(asset.livePhotoVideoId).toBeDefined();
 
-        const video = await apiUtils.getAssetInfo(admin.accessToken, asset.livePhotoVideoId as string);
+        const video = await apiUtils.getAssetInfo(
+          admin.accessToken,
+          asset.livePhotoVideoId as string,
+        );
         expect(video.checksum).toStrictEqual(checksum);
       });
     }
@@ -679,7 +731,9 @@ describe('/asset', () => {
 
   describe('GET /asset/thumbnail/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/thumbnail/${assetLocation.id}`);
+      const { status, body } = await request(app).get(
+        `/asset/thumbnail/${assetLocation.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -721,7 +775,9 @@ describe('/asset', () => {
 
   describe('GET /asset/file/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/thumbnail/${assetLocation.id}`);
+      const { status, body } = await request(app).get(
+        `/asset/thumbnail/${assetLocation.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -736,7 +792,10 @@ describe('/asset', () => {
       expect(body).toBeDefined();
       expect(type).toBe('image/jpeg');
 
-      const asset = await apiUtils.getAssetInfo(admin.accessToken, assetLocation.id);
+      const asset = await apiUtils.getAssetInfo(
+        admin.accessToken,
+        assetLocation.id,
+      );
 
       const original = await readFile(locationAssetFilepath);
       const originalChecksum = sha1(original);

e2e/src/api/specs/audit.e2e-spec.ts

@@ -1,4 +1,9 @@
-import { deleteAssets, getAuditFiles, updateAsset, type LoginResponseDto } from '@immich/sdk';
+import {
+  deleteAssets,
+  getAuditFiles,
+  updateAsset,
+  type LoginResponseDto,
+} from '@immich/sdk';
 import { apiUtils, asBearerAuth, dbUtils, fileUtils } from 'src/utils';
 import { beforeAll, describe, expect, it } from 'vitest';
 
@@ -15,14 +20,17 @@ describe('/audit', () => {
 
   describe('GET :/file-report', () => {
     it('excludes assets without issues from report', async () => {
-      const [trashedAsset, archivedAsset] = await Promise.all([
+      const [trashedAsset, archivedAsset, _] = await Promise.all([
         apiUtils.createAsset(admin.accessToken),
         apiUtils.createAsset(admin.accessToken),
         apiUtils.createAsset(admin.accessToken),
       ]);
 
       await Promise.all([
-        deleteAssets({ assetBulkDeleteDto: { ids: [trashedAsset.id] } }, { headers: asBearerAuth(admin.accessToken) }),
+        deleteAssets(
+          { assetBulkDeleteDto: { ids: [trashedAsset.id] } },
+          { headers: asBearerAuth(admin.accessToken) },
+        ),
         updateAsset(
           {
             id: archivedAsset.id,

e2e/src/api/specs/auth.e2e-spec.ts

@@ -1,6 +1,16 @@
-import { LoginResponseDto, getAuthDevices, login, signUpAdmin } from '@immich/sdk';
+import {
+  LoginResponseDto,
+  getAuthDevices,
+  login,
+  signUpAdmin,
+} from '@immich/sdk';
 import { loginDto, signupDto, uuidDto } from 'src/fixtures';
-import { deviceDto, errorDto, loginResponseDto, signupResponseDto } from 'src/responses';
+import {
+  deviceDto,
+  errorDto,
+  loginResponseDto,
+  signupResponseDto,
+} from 'src/responses';
 import { apiUtils, app, asBearerAuth, dbUtils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
@@ -38,14 +48,18 @@ describe(`/auth/admin-sign-up`, () => {
 
     for (const { should, data } of invalid) {
       it(`should ${should}`, async () => {
-        const { status, body } = await request(app).post('/auth/admin-sign-up').send(data);
+        const { status, body } = await request(app)
+          .post('/auth/admin-sign-up')
+          .send(data);
         expect(status).toEqual(400);
         expect(body).toEqual(errorDto.badRequest());
       });
     }
 
     it(`should sign up the admin`, async () => {
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send(signupDto.admin);
       expect(status).toBe(201);
       expect(body).toEqual(signupResponseDto.admin);
     });
@@ -72,7 +86,9 @@ describe(`/auth/admin-sign-up`, () => {
     it('should not allow a second admin to sign up', async () => {
       await signUpAdmin({ signUpDto: signupDto.admin });
 
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send(signupDto.admin);
 
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.alreadyHasAdmin);
@@ -91,7 +107,9 @@ describe('/auth/*', () => {
 
   describe(`POST /auth/login`, () => {
     it('should reject an incorrect password', async () => {
-      const { status, body } = await request(app).post('/auth/login').send({ email, password: 'incorrect' });
+      const { status, body } = await request(app)
+        .post('/auth/login')
+        .send({ email, password: 'incorrect' });
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.incorrectLogin);
     });
@@ -107,7 +125,9 @@ describe('/auth/*', () => {
     }
 
     it('should accept a correct password', async () => {
-      const { status, body, headers } = await request(app).post('/auth/login').send({ email, password });
+      const { status, body, headers } = await request(app)
+        .post('/auth/login')
+        .send({ email, password });
       expect(status).toBe(201);
       expect(body).toEqual(loginResponseDto.admin);
 
@@ -116,9 +136,15 @@ describe('/auth/*', () => {
 
       const cookies = headers['set-cookie'];
       expect(cookies).toHaveLength(3);
-      expect(cookies[0]).toEqual(`immich_access_token=${token}; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;`);
-      expect(cookies[1]).toEqual('immich_auth_type=password; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;');
-      expect(cookies[2]).toEqual('immich_is_authenticated=true; Path=/; Max-Age=34560000; SameSite=Lax;');
+      expect(cookies[0]).toEqual(
+        `immich_access_token=${token}; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;`
+      );
+      expect(cookies[1]).toEqual(
+        'immich_auth_type=password; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;'
+      );
+      expect(cookies[2]).toEqual(
+        'immich_is_authenticated=true; Path=/; Max-Age=34560000; SameSite=Lax;'
+      );
     });
   });
 
@@ -150,12 +176,18 @@ describe('/auth/*', () => {
         await login({ loginCredentialDto: loginDto.admin });
       }
 
-      await expect(getAuthDevices({ headers: asBearerAuth(admin.accessToken) })).resolves.toHaveLength(6);
+      await expect(
+        getAuthDevices({ headers: asBearerAuth(admin.accessToken) })
+      ).resolves.toHaveLength(6);
 
-      const { status } = await request(app).delete(`/auth/devices`).set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .delete(`/auth/devices`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
-      await expect(getAuthDevices({ headers: asBearerAuth(admin.accessToken) })).resolves.toHaveLength(1);
+      await expect(
+        getAuthDevices({ headers: asBearerAuth(admin.accessToken) })
+      ).resolves.toHaveLength(1);
     });
 
     it('should throw an error for a non-existent device id', async () => {
@@ -163,7 +195,9 @@ describe('/auth/*', () => {
         .delete(`/auth/devices/${uuidDto.notFound}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no authDevice.delete access'));
+      expect(body).toEqual(
+        errorDto.badRequest('Not found or no authDevice.delete access')
+      );
     });
 
     it('should logout a device', async () => {
@@ -185,7 +219,9 @@ describe('/auth/*', () => {
 
   describe('POST /auth/validateToken', () => {
     it('should reject an invalid token', async () => {
-      const { status, body } = await request(app).post(`/auth/validateToken`).set('Authorization', 'Bearer 123');
+      const { status, body } = await request(app)
+        .post(`/auth/validateToken`)
+        .set('Authorization', 'Bearer 123');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.invalidToken);
     });

e2e/src/api/specs/download.e2e-spec.ts

@@ -42,7 +42,9 @@ describe('/download', () => {
 
   describe('POST /download/asset/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/download/asset/${asset1.id}`);
+      const { status, body } = await request(app).post(
+        `/download/asset/${asset1.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -54,7 +56,7 @@ describe('/download', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(response.status).toBe(200);
-      expect(response.headers['content-type']).toEqual('image/png');
+      expect(response.headers['content-type']).toEqual('image/jpeg');
     });
   });
 });

e2e/src/api/specs/library.e2e-spec.ts

@@ -1,456 +0,0 @@
-import { LibraryResponseDto, LibraryType, LoginResponseDto, getAllLibraries } from '@immich/sdk';
-import { userDto, uuidDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { apiUtils, app, asBearerAuth, dbUtils, testAssetDirInternal } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-describe('/library', () => {
-  let admin: LoginResponseDto;
-  let user: LoginResponseDto;
-  let library: LibraryResponseDto;
-
-  beforeAll(async () => {
-    apiUtils.setup();
-    await dbUtils.reset();
-    admin = await apiUtils.adminSetup();
-    user = await apiUtils.userSetup(admin.accessToken, userDto.user1);
-    library = await apiUtils.createLibrary(admin.accessToken, { type: LibraryType.External });
-  });
-
-  describe('GET /library', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/library');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should start with a default upload library', async () => {
-      const { status, body } = await request(app).get('/library').set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            ownerId: admin.userId,
-            type: LibraryType.Upload,
-            name: 'Default Library',
-            refreshedAt: null,
-            assetCount: 0,
-            importPaths: [],
-            exclusionPatterns: [],
-          }),
-        ]),
-      );
-    });
-  });
-
-  describe('POST /library', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/library').send({});
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require admin authentication', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({ type: LibraryType.External });
-
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    it('should create an external library with defaults', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.External });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          ownerId: admin.userId,
-          type: LibraryType.External,
-          name: 'New External Library',
-          refreshedAt: null,
-          assetCount: 0,
-          importPaths: [],
-          exclusionPatterns: [],
-        }),
-      );
-    });
-
-    it('should create an external library with options', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          type: LibraryType.External,
-          name: 'My Awesome Library',
-          importPaths: ['/path/to/import'],
-          exclusionPatterns: ['**/Raw/**'],
-        });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          name: 'My Awesome Library',
-          importPaths: ['/path/to/import'],
-        }),
-      );
-    });
-
-    it('should not create an external library with duplicate import paths', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          type: LibraryType.External,
-          name: 'My Awesome Library',
-          importPaths: ['/path', '/path'],
-          exclusionPatterns: ['**/Raw/**'],
-        });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All importPaths's elements must be unique"]));
-    });
-
-    it('should not create an external library with duplicate exclusion patterns', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          type: LibraryType.External,
-          name: 'My Awesome Library',
-          importPaths: ['/path/to/import'],
-          exclusionPatterns: ['**/Raw/**', '**/Raw/**'],
-        });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All exclusionPatterns's elements must be unique"]));
-    });
-
-    it('should create an upload library with defaults', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          ownerId: admin.userId,
-          type: LibraryType.Upload,
-          name: 'New Upload Library',
-          refreshedAt: null,
-          assetCount: 0,
-          importPaths: [],
-          exclusionPatterns: [],
-        }),
-      );
-    });
-
-    it('should create an upload library with options', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload, name: 'My Awesome Library' });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          name: 'My Awesome Library',
-        }),
-      );
-    });
-
-    it('should not allow upload libraries to have import paths', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload, importPaths: ['/path/to/import'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Upload libraries cannot have import paths'));
-    });
-
-    it('should not allow upload libraries to have exclusion patterns', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ type: LibraryType.Upload, exclusionPatterns: ['**/Raw/**'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Upload libraries cannot have exclusion patterns'));
-    });
-  });
-
-  describe('PUT /library/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/library/${uuidDto.notFound}`).send({});
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should change the library name', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ name: 'New Library Name' });
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          name: 'New Library Name',
-        }),
-      );
-    });
-
-    it('should not set an empty name', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ name: '' });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['name should not be empty']));
-    });
-
-    it('should change the import paths', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ importPaths: [testAssetDirInternal] });
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          importPaths: [testAssetDirInternal],
-        }),
-      );
-    });
-
-    it('should reject an empty import path', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ importPaths: [''] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in importPaths should not be empty']));
-    });
-
-    it('should reject duplicate import paths', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ importPaths: ['/path', '/path'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All importPaths's elements must be unique"]));
-    });
-
-    it('should change the exclusion pattern', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ exclusionPatterns: ['**/Raw/**'] });
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          exclusionPatterns: ['**/Raw/**'],
-        }),
-      );
-    });
-
-    it('should reject duplicate exclusion patterns', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ exclusionPatterns: ['**/*.jpg', '**/*.jpg'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(["All exclusionPatterns's elements must be unique"]));
-    });
-
-    it('should reject an empty exclusion pattern', async () => {
-      const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ exclusionPatterns: [''] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in exclusionPatterns should not be empty']));
-    });
-  });
-
-  describe('GET /library/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/library/${uuidDto.notFound}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require admin access', async () => {
-      const { status, body } = await request(app)
-        .get(`/library/${uuidDto.notFound}`)
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    it('should get library by id', async () => {
-      const library = await apiUtils.createLibrary(admin.accessToken, { type: LibraryType.External });
-
-      const { status, body } = await request(app)
-        .get(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          ownerId: admin.userId,
-          type: LibraryType.External,
-          name: 'New External Library',
-          refreshedAt: null,
-          assetCount: 0,
-          importPaths: [],
-          exclusionPatterns: [],
-        }),
-      );
-    });
-  });
-
-  describe('DELETE /library/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/library/${uuidDto.notFound}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should not delete the last upload library', async () => {
-      const libraries = await getAllLibraries(
-        { $type: LibraryType.Upload },
-        { headers: asBearerAuth(admin.accessToken) },
-      );
-
-      const adminLibraries = libraries.filter((library) => library.ownerId === admin.userId);
-      expect(adminLibraries.length).toBeGreaterThanOrEqual(1);
-      const lastLibrary = adminLibraries.pop() as LibraryResponseDto;
-
-      // delete all but the last upload library
-      for (const library of adminLibraries) {
-        const { status } = await request(app)
-          .delete(`/library/${library.id}`)
-          .set('Authorization', `Bearer ${admin.accessToken}`);
-        expect(status).toBe(204);
-      }
-
-      const { status, body } = await request(app)
-        .delete(`/library/${lastLibrary.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(body).toEqual(errorDto.noDeleteUploadLibrary);
-      expect(status).toBe(400);
-    });
-
-    it('should delete an external library', async () => {
-      const library = await apiUtils.createLibrary(admin.accessToken, { type: LibraryType.External });
-
-      const { status, body } = await request(app)
-        .delete(`/library/${library.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(204);
-      expect(body).toEqual({});
-
-      const libraries = await getAllLibraries({}, { headers: asBearerAuth(admin.accessToken) });
-      expect(libraries).not.toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            id: library.id,
-          }),
-        ]),
-      );
-    });
-  });
-
-  describe('GET /library/:id/statistics', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/library/${uuidDto.notFound}/statistics`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /library/:id/scan', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/scan`).send({});
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /library/:id/removeOffline', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/removeOffline`).send({});
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /library/:id/validate', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/validate`).send({});
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should pass with no import paths', async () => {
-      const response = await apiUtils.validateLibrary(admin.accessToken, library.id, { importPaths: [] });
-      expect(response.importPaths).toEqual([]);
-    });
-
-    it('should fail if path does not exist', async () => {
-      const pathToTest = `${testAssetDirInternal}/does/not/exist`;
-
-      const response = await apiUtils.validateLibrary(admin.accessToken, library.id, {
-        importPaths: [pathToTest],
-      });
-
-      expect(response.importPaths?.length).toEqual(1);
-      const pathResponse = response?.importPaths?.at(0);
-
-      expect(pathResponse).toEqual({
-        importPath: pathToTest,
-        isValid: false,
-        message: `Path does not exist (ENOENT)`,
-      });
-    });
-
-    it('should fail if path is a file', async () => {
-      const pathToTest = `${testAssetDirInternal}/albums/nature/el_torcal_rocks.jpg`;
-
-      const response = await apiUtils.validateLibrary(admin.accessToken, library.id, {
-        importPaths: [pathToTest],
-      });
-
-      expect(response.importPaths?.length).toEqual(1);
-      const pathResponse = response?.importPaths?.at(0);
-
-      expect(pathResponse).toEqual({
-        importPath: pathToTest,
-        isValid: false,
-        message: `Not a directory`,
-      });
-    });
-  });
-});

e2e/src/api/specs/oauth.e2e-spec.ts

@@ -15,9 +15,16 @@ describe(`/oauth`, () => {
 
   describe('POST /oauth/authorize', () => {
     it(`should throw an error if a redirect uri is not provided`, async () => {
-      const { status, body } = await request(app).post('/oauth/authorize').send({});
+      const { status, body } = await request(app)
+        .post('/oauth/authorize')
+        .send({});
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['redirectUri must be a string', 'redirectUri should not be empty']));
+      expect(body).toEqual(
+        errorDto.badRequest([
+          'redirectUri must be a string',
+          'redirectUri should not be empty',
+        ])
+      );
     });
   });
 });

e2e/src/api/specs/partner.e2e-spec.ts

@@ -24,8 +24,14 @@ describe('/partner', () => {
     ]);
 
     await Promise.all([
-      createPartner({ id: user2.userId }, { headers: asBearerAuth(user1.accessToken) }),
-      createPartner({ id: user1.userId }, { headers: asBearerAuth(user2.accessToken) }),
+      createPartner(
+        { id: user2.userId },
+        { headers: asBearerAuth(user1.accessToken) }
+      ),
+      createPartner(
+        { id: user1.userId },
+        { headers: asBearerAuth(user2.accessToken) }
+      ),
     ]);
   });
 
@@ -60,7 +66,9 @@ describe('/partner', () => {
 
   describe('POST /partner/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).post(
+        `/partner/${user3.userId}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -81,13 +89,17 @@ describe('/partner', () => {
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Partner already exists' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Partner already exists' })
+      );
     });
   });
 
   describe('PUT /partner/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/partner/${user2.userId}`);
+      const { status, body } = await request(app).put(
+        `/partner/${user2.userId}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -100,13 +112,17 @@ describe('/partner', () => {
         .send({ inTimeline: false });
 
       expect(status).toBe(200);
-      expect(body).toEqual(expect.objectContaining({ id: user2.userId, inTimeline: false }));
+      expect(body).toEqual(
+        expect.objectContaining({ id: user2.userId, inTimeline: false })
+      );
     });
   });
 
   describe('DELETE /partner/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).delete(
+        `/partner/${user3.userId}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -126,7 +142,9 @@ describe('/partner', () => {
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Partner not found' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Partner not found' })
+      );
     });
   });
 });

e2e/src/api/specs/person.e2e-spec.ts

@@ -65,7 +65,9 @@ describe('/activity', () => {
     });
 
     it('should return only visible people', async () => {
-      const { status, body } = await request(app).get('/person').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/person')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
       expect(body).toEqual({
@@ -78,7 +80,9 @@ describe('/activity', () => {
 
   describe('GET /person/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/person/${uuidDto.notFound}`);
+      const { status, body } = await request(app).get(
+        `/person/${uuidDto.notFound}`
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -105,7 +109,9 @@ describe('/activity', () => {
 
   describe('PUT /person/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/person/${uuidDto.notFound}`);
+      const { status, body } = await request(app).put(
+        `/person/${uuidDto.notFound}`
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -133,7 +139,7 @@ describe('/activity', () => {
           birthDate: '123567',
           response: 'Not found or no person.write access',
         },
-        { birthDate: 123_567, response: 'Not found or no person.write access' },
+        { birthDate: 123567, response: 'Not found or no person.write access' },
       ]) {
         const { status, body } = await request(app)
           .put(`/person/${uuidDto.notFound}`)

e2e/src/api/specs/server-info.e2e-spec.ts

@@ -97,7 +97,9 @@ describe('/server-info', () => {
 
   describe('GET /server-info/statistics', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/server-info/statistics');
+      const { status, body } = await request(app).get(
+        '/server-info/statistics'
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -143,7 +145,9 @@ describe('/server-info', () => {
 
   describe('GET /server-info/media-types', () => {
     it('should return accepted media types', async () => {
-      const { status, body } = await request(app).get('/server-info/media-types');
+      const { status, body } = await request(app).get(
+        '/server-info/media-types'
+      );
       expect(status).toBe(200);
       expect(body).toEqual({
         sidecar: ['.xmp'],

e2e/src/api/specs/shared-link.e2e-spec.ts

@@ -46,8 +46,14 @@ describe('/shared-link', () => {
     ]);
 
     [album, deletedAlbum, metadataAlbum] = await Promise.all([
-      createAlbum({ createAlbumDto: { albumName: 'album' } }, { headers: asBearerAuth(user1.accessToken) }),
-      createAlbum({ createAlbumDto: { albumName: 'deleted album' } }, { headers: asBearerAuth(user2.accessToken) }),
+      createAlbum(
+        { createAlbumDto: { albumName: 'album' } },
+        { headers: asBearerAuth(user1.accessToken) },
+      ),
+      createAlbum(
+        { createAlbumDto: { albumName: 'deleted album' } },
+        { headers: asBearerAuth(user2.accessToken) },
+      ),
       createAlbum(
         {
           createAlbumDto: {
@@ -59,38 +65,47 @@ describe('/shared-link', () => {
       ),
     ]);
 
-    [linkWithDeletedAlbum, linkWithAlbum, linkWithAssets, linkWithPassword, linkWithMetadata, linkWithoutMetadata] =
-      await Promise.all([
-        apiUtils.createSharedLink(user2.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: deletedAlbum.id,
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: album.id,
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Individual,
-          assetIds: [asset1.id],
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: album.id,
-          password: 'foo',
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: metadataAlbum.id,
-          showMetadata: true,
-        }),
-        apiUtils.createSharedLink(user1.accessToken, {
-          type: SharedLinkType.Album,
-          albumId: metadataAlbum.id,
-          showMetadata: false,
-        }),
-      ]);
+    [
+      linkWithDeletedAlbum,
+      linkWithAlbum,
+      linkWithAssets,
+      linkWithPassword,
+      linkWithMetadata,
+      linkWithoutMetadata,
+    ] = await Promise.all([
+      apiUtils.createSharedLink(user2.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: deletedAlbum.id,
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: album.id,
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Individual,
+        assetIds: [asset1.id],
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: album.id,
+        password: 'foo',
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: metadataAlbum.id,
+        showMetadata: true,
+      }),
+      apiUtils.createSharedLink(user1.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: metadataAlbum.id,
+        showMetadata: false,
+      }),
+    ]);
 
-    await deleteUser({ id: user2.userId }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser(
+      { id: user2.userId },
+      { headers: asBearerAuth(admin.accessToken) },
+    );
   });
 
   describe('GET /shared-link', () => {
@@ -131,13 +146,17 @@ describe('/shared-link', () => {
 
   describe('GET /shared-link/me', () => {
     it('should not require admin authentication', async () => {
-      const { status } = await request(app).get('/shared-link/me').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .get('/shared-link/me')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(403);
     });
 
     it('should get data for correct shared link', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithAlbum.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithAlbum.key });
 
       expect(status).toBe(200);
       expect(body).toEqual(
@@ -159,14 +178,18 @@ describe('/shared-link', () => {
     });
 
     it('should return unauthorized if target has been soft deleted', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithDeletedAlbum.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithDeletedAlbum.key });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.invalidShareKey);
     });
 
     it('should return unauthorized for password protected link', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithPassword.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithPassword.key });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.invalidSharePassword);
@@ -188,7 +211,9 @@ describe('/shared-link', () => {
     });
 
     it('should return metadata for album shared link', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithMetadata.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithMetadata.key });
 
       expect(status).toBe(200);
       expect(body.assets).toHaveLength(1);
@@ -204,7 +229,9 @@ describe('/shared-link', () => {
     });
 
     it('should not return metadata for album shared link without metadata', async () => {
-      const { status, body } = await request(app).get('/shared-link/me').query({ key: linkWithoutMetadata.key });
+      const { status, body } = await request(app)
+        .get('/shared-link/me')
+        .query({ key: linkWithoutMetadata.key });
 
       expect(status).toBe(200);
       expect(body.assets).toHaveLength(1);
@@ -220,7 +247,9 @@ describe('/shared-link', () => {
 
   describe('GET /shared-link/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/shared-link/${linkWithAlbum.id}`);
+      const { status, body } = await request(app).get(
+        `/shared-link/${linkWithAlbum.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -247,7 +276,9 @@ describe('/shared-link', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Shared link not found' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Shared link not found' }),
+      );
     });
   });
 
@@ -277,7 +308,9 @@ describe('/shared-link', () => {
         .send({ type: SharedLinkType.Album });
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Invalid albumId' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Invalid albumId' }),
+      );
     });
 
     it('should require a valid asset id', async () => {
@@ -287,7 +320,9 @@ describe('/shared-link', () => {
         .send({ type: SharedLinkType.Individual, assetId: uuidDto.notFound });
 
       expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Invalid assetIds' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Invalid assetIds' }),
+      );
     });
 
     it('should create a shared link', async () => {
@@ -389,7 +424,9 @@ describe('/shared-link', () => {
 
   describe('DELETE /shared-link/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/shared-link/${linkWithAlbum.id}`);
+      const { status, body } = await request(app).delete(
+        `/shared-link/${linkWithAlbum.id}`,
+      );
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);

e2e/src/api/specs/system-config.e2e-spec.ts

@@ -18,7 +18,9 @@ describe('/system-config', () => {
 
   describe('GET /system-config/map/style.json', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/system-config/map/style.json');
+      const { status, body } = await request(app).get(
+        '/system-config/map/style.json'
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -30,7 +32,11 @@ describe('/system-config', () => {
           .query({ theme })
           .set('Authorization', `Bearer ${admin.accessToken}`);
         expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest(['theme must be one of the following values: light, dark']));
+        expect(body).toEqual(
+          errorDto.badRequest([
+            'theme must be one of the following values: light, dark',
+          ])
+        );
       }
     });
 

e2e/src/api/specs/trash.e2e-spec.ts

@@ -32,16 +32,24 @@ describe('/trash', () => {
       const { id: assetId } = await apiUtils.createAsset(admin.accessToken);
       await apiUtils.deleteAssets(admin.accessToken, [assetId]);
 
-      const before = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getAllAssets(
+        {},
+        { headers: asBearerAuth(admin.accessToken) },
+      );
 
       expect(before.length).toBeGreaterThanOrEqual(1);
 
-      const { status } = await request(app).post('/trash/empty').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .post('/trash/empty')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
       await wsUtils.waitForEvent({ event: 'delete', assetId });
 
-      const after = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
+      const after = await getAllAssets(
+        {},
+        { headers: asBearerAuth(admin.accessToken) },
+      );
       expect(after.length).toBe(0);
     });
   });
@@ -61,7 +69,9 @@ describe('/trash', () => {
       const before = await apiUtils.getAssetInfo(admin.accessToken, assetId);
       expect(before.isTrashed).toBe(true);
 
-      const { status } = await request(app).post('/trash/restore').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status } = await request(app)
+        .post('/trash/restore')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
       const after = await apiUtils.getAssetInfo(admin.accessToken, assetId);

e2e/src/api/specs/user.e2e-spec.ts

@@ -22,7 +22,10 @@ describe('/server-info', () => {
       apiUtils.userSetup(admin.accessToken, createUserDto.user3),
     ]);
 
-    await deleteUser({ id: deletedUser.userId }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser(
+      { id: deletedUser.userId },
+      { headers: asBearerAuth(admin.accessToken) }
+    );
   });
 
   describe('GET /user', () => {
@@ -33,7 +36,9 @@ describe('/server-info', () => {
     });
 
     it('should get users', async () => {
-      const { status, body } = await request(app).get('/user').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/user')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
       expect(body).toHaveLength(4);
       expect(body).toEqual(
@@ -42,7 +47,7 @@ describe('/server-info', () => {
           expect.objectContaining({ email: 'user1@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
           expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ]),
+        ])
       );
     });
 
@@ -58,7 +63,7 @@ describe('/server-info', () => {
           expect.objectContaining({ email: 'admin@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
           expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ]),
+        ])
       );
     });
 
@@ -76,7 +81,7 @@ describe('/server-info', () => {
           expect.objectContaining({ email: 'user1@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
           expect.objectContaining({ email: 'user3@immich.cloud' }),
-        ]),
+        ])
       );
     });
   });
@@ -107,7 +112,9 @@ describe('/server-info', () => {
     });
 
     it('should get my info', async () => {
-      const { status, body } = await request(app).get(`/user/me`).set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get(`/user/me`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(200);
       expect(body).toMatchObject({
         id: admin.userId,
@@ -118,7 +125,9 @@ describe('/server-info', () => {
 
   describe('POST /user', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/user`).send(createUserDto.user1);
+      const { status, body } = await request(app)
+        .post(`/user`)
+        .send(createUserDto.user1);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -172,7 +181,9 @@ describe('/server-info', () => {
 
   describe('DELETE /user/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/user/${userToDelete.userId}`);
+      const { status, body } = await request(app).delete(
+        `/user/${userToDelete.userId}`
+      );
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -230,7 +241,10 @@ describe('/server-info', () => {
     });
 
     it('should ignore updates to createdAt, updatedAt and deletedAt', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById(
+        { id: admin.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
 
       const { status, body } = await request(app)
         .put(`/user`)
@@ -247,7 +261,10 @@ describe('/server-info', () => {
     });
 
     it('should update first and last name', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById(
+        { id: admin.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
 
       const { status, body } = await request(app)
         .put(`/user`)
@@ -267,7 +284,10 @@ describe('/server-info', () => {
     });
 
     it('should update memories enabled', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById(
+        { id: admin.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
       const { status, body } = await request(app)
         .put(`/user`)
         .send({

e2e/src/cli/specs/login.e2e-spec.ts

@@ -1,6 +1,6 @@
 import { stat } from 'node:fs/promises';
 import { apiUtils, app, dbUtils, immichCli } from 'src/utils';
-import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe(`immich login-key`, () => {
   beforeAll(() => {
@@ -24,15 +24,25 @@ describe(`immich login-key`, () => {
   });
 
   it('should require a valid key', async () => {
-    const { stderr, exitCode } = await immichCli(['login-key', app, 'immich-is-so-cool']);
-    expect(stderr).toContain('Failed to connect to server http://127.0.0.1:2283/api: Error: 401');
+    const { stderr, exitCode } = await immichCli([
+      'login-key',
+      app,
+      'immich-is-so-cool',
+    ]);
+    expect(stderr).toContain(
+      'Failed to connect to server http://127.0.0.1:2283/api: Error: 401'
+    );
     expect(exitCode).toBe(1);
   });
 
   it('should login', async () => {
     const admin = await apiUtils.adminSetup();
     const key = await apiUtils.createApiKey(admin.accessToken);
-    const { stdout, stderr, exitCode } = await immichCli(['login-key', app, `${key.secret}`]);
+    const { stdout, stderr, exitCode } = await immichCli([
+      'login-key',
+      app,
+      `${key.secret}`,
+    ]);
     expect(stdout.split('\n')).toEqual([
       'Logging in...',
       'Logged in as admin@immich.cloud',

e2e/src/cli/specs/upload.e2e-spec.ts

@@ -1,6 +1,13 @@
 import { getAllAlbums, getAllAssets } from '@immich/sdk';
-import { mkdir, readdir, rm, symlink } from 'node:fs/promises';
-import { apiUtils, asKeyAuth, cliUtils, dbUtils, immichCli, testAssetDir } from 'src/utils';
+import { mkdir, readdir, rm, symlink } from 'fs/promises';
+import {
+  apiUtils,
+  asKeyAuth,
+  cliUtils,
+  dbUtils,
+  immichCli,
+  testAssetDir,
+} from 'src/utils';
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
 describe(`immich upload`, () => {
@@ -18,10 +25,16 @@ describe(`immich upload`, () => {
 
   describe('immich upload --recursive', () => {
     it('should upload a folder recursively', async () => {
-      const { stderr, stdout, exitCode } = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--recursive']);
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+      ]);
       expect(stderr).toBe('');
       expect(stdout.split('\n')).toEqual(
-        expect.arrayContaining([expect.stringContaining('Successfully uploaded 9 assets')]),
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+        ]),
       );
       expect(exitCode).toBe(0);
 
@@ -57,9 +70,15 @@ describe(`immich upload`, () => {
     });
 
     it('should add existing assets to albums', async () => {
-      const response1 = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--recursive']);
+      const response1 = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+      ]);
       expect(response1.stdout.split('\n')).toEqual(
-        expect.arrayContaining([expect.stringContaining('Successfully uploaded 9 assets')]),
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+        ]),
       );
       expect(response1.stderr).toBe('');
       expect(response1.exitCode).toBe(0);
@@ -70,10 +89,17 @@ describe(`immich upload`, () => {
       const albums1 = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums1.length).toBe(0);
 
-      const response2 = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--recursive', '--album']);
+      const response2 = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+        '--album',
+      ]);
       expect(response2.stdout.split('\n')).toEqual(
         expect.arrayContaining([
-          expect.stringContaining('All assets were already uploaded, nothing to do.'),
+          expect.stringContaining(
+            'All assets were already uploaded, nothing to do.',
+          ),
           expect.stringContaining('Successfully updated 9 assets'),
         ]),
       );
@@ -121,10 +147,17 @@ describe(`immich upload`, () => {
       await mkdir(`/tmp/albums/nature`, { recursive: true });
       const filesToLink = await readdir(`${testAssetDir}/albums/nature`);
       for (const file of filesToLink) {
-        await symlink(`${testAssetDir}/albums/nature/${file}`, `/tmp/albums/nature/${file}`);
+        await symlink(
+          `${testAssetDir}/albums/nature/${file}`,
+          `/tmp/albums/nature/${file}`,
+        );
       }
 
-      const { stderr, stdout, exitCode } = await immichCli(['upload', `/tmp/albums/nature`, '--delete']);
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `/tmp/albums/nature`,
+        '--delete',
+      ]);
 
       const files = await readdir(`/tmp/albums/nature`);
       await rm(`/tmp/albums/nature`, { recursive: true });

e2e/src/generators.ts

@@ -1,31 +0,0 @@
-import { PNG } from 'pngjs';
-
-const createPNG = (r: number, g: number, b: number) => {
-  const image = new PNG({ width: 1, height: 1 });
-  image.data[0] = r;
-  image.data[1] = g;
-  image.data[2] = b;
-  image.data[3] = 255;
-  return PNG.sync.write(image);
-};
-
-function* newPngFactory() {
-  for (let r = 0; r < 255; r++) {
-    for (let g = 0; g < 255; g++) {
-      for (let b = 0; b < 255; b++) {
-        yield createPNG(r, g, b);
-      }
-    }
-  }
-}
-
-const pngFactory = newPngFactory();
-
-export const makeRandomImage = () => {
-  const { value } = pngFactory.next();
-  if (!value) {
-    throw new Error('Ran out of random asset data');
-  }
-
-  return value;
-};

e2e/src/setup.ts

@@ -1,4 +1,4 @@
-import { exec, spawn } from 'node:child_process';
+import { spawn, exec } from 'child_process';
 
 export default async () => {
   let _resolve: () => unknown;
@@ -19,6 +19,8 @@ export default async () => {
   await ready;
 
   return async () => {
-    await new Promise<void>((resolve) => exec('docker compose down', () => resolve()));
+    await new Promise<void>((resolve) =>
+      exec('docker compose down', () => resolve()),
+    );
   };
 };

e2e/src/utils.ts

@@ -3,14 +3,11 @@ import {
   AssetResponseDto,
   CreateAlbumDto,
   CreateAssetDto,
-  CreateLibraryDto,
   CreateUserDto,
   PersonUpdateDto,
   SharedLinkCreateDto,
-  ValidateLibraryDto,
   createAlbum,
   createApiKey,
-  createLibrary,
   createPerson,
   createSharedLink,
   createUser,
@@ -21,18 +18,18 @@ import {
   setAdminOnboarding,
   signUpAdmin,
   updatePerson,
-  validate,
 } from '@immich/sdk';
 import { BrowserContext } from '@playwright/test';
 import { exec, spawn } from 'node:child_process';
+import { randomBytes } from 'node:crypto';
 import { access } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
+import { EventEmitter } from 'node:stream';
 import { promisify } from 'node:util';
 import pg from 'pg';
 import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
-import { makeRandomImage } from 'src/generators';
 import request from 'supertest';
 
 const execPromise = promisify(exec);
@@ -46,7 +43,6 @@ const directoryExists = (directory: string) =>
 
 // TODO move test assets into e2e/assets
 export const testAssetDir = path.resolve(`./../server/test/assets/`);
-export const testAssetDirInternal = '/data/assets';
 export const tempDir = tmpdir();
 
 const serverContainerName = 'immich-e2e-server';
@@ -74,12 +70,20 @@ let client: pg.Client | null = null;
 
 export const fileUtils = {
   reset: async () => {
-    await execPromise(`docker exec -i "${serverContainerName}" /bin/bash -c "rm -rf ${dirs} && mkdir ${dirs}"`);
+    await execPromise(
+      `docker exec -i "${serverContainerName}" /bin/bash -c "rm -rf ${dirs} && mkdir ${dirs}"`,
+    );
   },
 };
 
 export const dbUtils = {
-  createFace: async ({ assetId, personId }: { assetId: string; personId: string }) => {
+  createFace: async ({
+    assetId,
+    personId,
+  }: {
+    assetId: string;
+    personId: string;
+  }) => {
     if (!client) {
       return;
     }
@@ -87,28 +91,31 @@ export const dbUtils = {
     const vector = Array.from({ length: 512 }, Math.random);
     const embedding = `[${vector.join(',')}]`;
 
-    await client.query('INSERT INTO asset_faces ("assetId", "personId", "embedding") VALUES ($1, $2, $3)', [
-      assetId,
-      personId,
-      embedding,
-    ]);
+    await client.query(
+      'INSERT INTO asset_faces ("assetId", "personId", "embedding") VALUES ($1, $2, $3)',
+      [assetId, personId, embedding],
+    );
   },
   setPersonThumbnail: async (personId: string) => {
     if (!client) {
       return;
     }
 
-    await client.query(`UPDATE "person" set "thumbnailPath" = '/my/awesome/thumbnail.jpg' where "id" = $1`, [personId]);
+    await client.query(
+      `UPDATE "person" set "thumbnailPath" = '/my/awesome/thumbnail.jpg' where "id" = $1`,
+      [personId],
+    );
   },
   reset: async (tables?: string[]) => {
     try {
       if (!client) {
-        client = new pg.Client('postgres://postgres:postgres@127.0.0.1:5433/immich');
+        client = new pg.Client(
+          'postgres://postgres:postgres@127.0.0.1:5433/immich',
+        );
         await client.connect();
       }
 
       tables = tables || [
-        'libraries',
         'shared_links',
         'person',
         'albums',
@@ -216,8 +223,12 @@ export const wsUtils = {
     return new Promise<Socket>((resolve) => {
       websocket
         .on('connect', () => resolve(websocket))
-        .on('on_upload_success', (data: AssetResponseDto) => onEvent({ event: 'upload', assetId: data.id }))
-        .on('on_asset_delete', (assetId: string) => onEvent({ event: 'delete', assetId }))
+        .on('on_upload_success', (data: AssetResponseDto) =>
+          onEvent({ event: 'upload', assetId: data.id }),
+        )
+        .on('on_asset_delete', (assetId: string) =>
+          onEvent({ event: 'delete', assetId }),
+        )
         .connect();
     });
   },
@@ -230,14 +241,21 @@ export const wsUtils = {
       set.clear();
     }
   },
-  waitForEvent: async ({ event, assetId, timeout: ms }: WaitOptions): Promise<void> => {
+  waitForEvent: async ({
+    event,
+    assetId,
+    timeout: ms,
+  }: WaitOptions): Promise<void> => {
     const set = events[event];
     if (set.has(assetId)) {
       return;
     }
 
     return new Promise<void>((resolve, reject) => {
-      const timeout = setTimeout(() => reject(new Error(`Timed out waiting for ${event} event`)), ms || 5000);
+      const timeout = setTimeout(
+        () => reject(new Error(`Timed out waiting for ${event} event`)),
+        ms || 5000,
+      );
 
       callbacks[assetId] = () => {
         clearTimeout(timeout);
@@ -247,8 +265,6 @@ export const wsUtils = {
   },
 };
 
-type AssetData = { bytes?: Buffer; filename: string };
-
 export const apiUtils = {
   setup: () => {
     defaults.baseUrl = app;
@@ -265,64 +281,86 @@ export const apiUtils = {
     return response;
   },
   userSetup: async (accessToken: string, dto: CreateUserDto) => {
-    await createUser({ createUserDto: dto }, { headers: asBearerAuth(accessToken) });
+    await createUser(
+      { createUserDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    );
     return login({
       loginCredentialDto: { email: dto.email, password: dto.password },
     });
   },
   createApiKey: (accessToken: string) => {
-    return createApiKey({ apiKeyCreateDto: { name: 'e2e' } }, { headers: asBearerAuth(accessToken) });
+    return createApiKey(
+      { apiKeyCreateDto: { name: 'e2e' } },
+      { headers: asBearerAuth(accessToken) },
+    );
   },
   createAlbum: (accessToken: string, dto: CreateAlbumDto) =>
-    createAlbum({ createAlbumDto: dto }, { headers: asBearerAuth(accessToken) }),
+    createAlbum(
+      { createAlbumDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    ),
   createAsset: async (
     accessToken: string,
-    dto?: Partial<Omit<CreateAssetDto, 'assetData'>> & { assetData?: AssetData },
+    dto?: Partial<Omit<CreateAssetDto, 'assetData'>>,
+    data?: {
+      bytes?: Buffer;
+      filename?: string;
+    },
   ) => {
     const _dto = {
       deviceAssetId: 'test-1',
       deviceId: 'test',
       fileCreatedAt: new Date().toISOString(),
       fileModifiedAt: new Date().toISOString(),
-      ...dto,
+      ...(dto || {}),
     };
 
-    const assetData = dto?.assetData?.bytes || makeRandomImage();
-    const filename = dto?.assetData?.filename || 'example.png';
+    const _assetData = {
+      bytes: randomBytes(32),
+      filename: 'example.jpg',
+      ...(data || {}),
+    };
 
     const builder = request(app)
       .post(`/asset/upload`)
-      .attach('assetData', assetData, filename)
+      .attach('assetData', _assetData.bytes, _assetData.filename)
       .set('Authorization', `Bearer ${accessToken}`);
 
     for (const [key, value] of Object.entries(_dto)) {
-      void builder.field(key, String(value));
+      builder.field(key, String(value));
     }
 
     const { body } = await builder;
 
     return body as AssetFileUploadResponseDto;
   },
-  getAssetInfo: (accessToken: string, id: string) => getAssetInfo({ id }, { headers: asBearerAuth(accessToken) }),
+  getAssetInfo: (accessToken: string, id: string) =>
+    getAssetInfo({ id }, { headers: asBearerAuth(accessToken) }),
   deleteAssets: (accessToken: string, ids: string[]) =>
-    deleteAssets({ assetBulkDeleteDto: { ids } }, { headers: asBearerAuth(accessToken) }),
+    deleteAssets(
+      { assetBulkDeleteDto: { ids } },
+      { headers: asBearerAuth(accessToken) },
+    ),
   createPerson: async (accessToken: string, dto?: PersonUpdateDto) => {
     // TODO fix createPerson to accept a body
-    const person = await createPerson({ headers: asBearerAuth(accessToken) });
+    let person = await createPerson({ headers: asBearerAuth(accessToken) });
     await dbUtils.setPersonThumbnail(person.id);
 
     if (!dto) {
       return person;
     }
 
-    return updatePerson({ id: person.id, personUpdateDto: dto }, { headers: asBearerAuth(accessToken) });
+    return updatePerson(
+      { id: person.id, personUpdateDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    );
   },
   createSharedLink: (accessToken: string, dto: SharedLinkCreateDto) =>
-    createSharedLink({ sharedLinkCreateDto: dto }, { headers: asBearerAuth(accessToken) }),
-  createLibrary: (accessToken: string, dto: CreateLibraryDto) =>
-    createLibrary({ createLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
-  validateLibrary: (accessToken: string, id: string, dto: ValidateLibraryDto) =>
-    validate({ id, validateLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
+    createSharedLink(
+      { sharedLinkCreateDto: dto },
+      { headers: asBearerAuth(accessToken) },
+    ),
 };
 
 export const cliUtils = {
@@ -342,7 +380,7 @@ export const webUtils = {
         value: accessToken,
         domain: '127.0.0.1',
         path: '/',
-        expires: 1_742_402_728,
+        expires: 1742402728,
         httpOnly: true,
         secure: false,
         sameSite: 'Lax',
@@ -352,7 +390,7 @@ export const webUtils = {
         value: 'password',
         domain: '127.0.0.1',
         path: '/',
-        expires: 1_742_402_728,
+        expires: 1742402728,
         httpOnly: true,
         secure: false,
         sameSite: 'Lax',
@@ -362,7 +400,7 @@ export const webUtils = {
         value: 'true',
         domain: '127.0.0.1',
         path: '/',
-        expires: 1_742_402_728,
+        expires: 1742402728,
         httpOnly: false,
         secure: false,
         sameSite: 'Lax',

e2e/src/web/specs/auth.e2e-spec.ts

@@ -1,4 +1,4 @@
-import { expect, test } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 import { apiUtils, dbUtils, webUtils } from 'src/utils';
 
 test.describe('Registration', () => {
@@ -68,7 +68,7 @@ test.describe('Registration', () => {
     await page.getByRole('button', { name: 'Login' }).click();
 
     // change password
-    await expect(page.getByRole('heading')).toHaveText('Change Password');
+    expect(page.getByRole('heading')).toHaveText('Change Password');
     await expect(page).toHaveURL('/auth/change-password');
     await page.getByLabel('New Password').fill('new-password');
     await page.getByLabel('Confirm Password').fill('new-password');

e2e/src/web/specs/shared-link.e2e-spec.ts

@@ -1,17 +1,18 @@
 import {
   AlbumResponseDto,
-  AssetFileUploadResponseDto,
+  AssetResponseDto,
   LoginResponseDto,
   SharedLinkResponseDto,
   SharedLinkType,
   createAlbum,
+  createSharedLink,
 } from '@immich/sdk';
 import { test } from '@playwright/test';
 import { apiUtils, asBearerAuth, dbUtils } from 'src/utils';
 
 test.describe('Shared Links', () => {
   let admin: LoginResponseDto;
-  let asset: AssetFileUploadResponseDto;
+  let asset: AssetResponseDto;
   let album: AlbumResponseDto;
   let sharedLink: SharedLinkResponseDto;
   let sharedLinkPassword: SharedLinkResponseDto;
@@ -28,7 +29,7 @@ test.describe('Shared Links', () => {
           assetIds: [asset.id],
         },
       },
-      { headers: asBearerAuth(admin.accessToken) },
+      { headers: asBearerAuth(admin.accessToken) }
     );
     sharedLink = await apiUtils.createSharedLink(admin.accessToken, {
       type: SharedLinkType.Album,
@@ -52,7 +53,7 @@ test.describe('Shared Links', () => {
     await page.waitForSelector('#asset-group-by-date svg');
     await page.getByRole('checkbox').click();
     await page.getByRole('button', { name: 'Download' }).click();
-    await page.getByText('DOWNLOADING', { exact: true }).waitFor();
+    await page.getByText('DOWNLOADING').waitFor();
   });
 
   test('enter password for a shared link', async ({ page }) => {

e2e/tsconfig.json

@@ -18,6 +18,5 @@
     "rootDirs": ["src"],
     "baseUrl": "./"
   },
-  "include": ["src/**/*.ts"],
   "exclude": ["dist", "node_modules"]
 }

e2e/vitest.config.ts

@@ -1,17 +1,9 @@
 import { defineConfig } from 'vitest/config';
 
-// skip `docker compose up` if `make e2e` was already run
-const globalSetup: string[] = [];
-try {
-  await fetch('http://127.0.0.1:2283/api/server-info/ping');
-} catch {
-  globalSetup.push('src/setup.ts');
-}
-
 export default defineConfig({
   test: {
     include: ['src/{api,cli}/specs/*.e2e-spec.ts'],
-    globalSetup,
+    globalSetup: ['src/setup.ts'],
     poolOptions: {
       threads: {
         singleThread: true,

misc/release/pump-version.sh

@@ -63,7 +63,6 @@ if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
   echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER"
   npm --prefix server version "$SERVER_PUMP"
   npm --prefix web version "$SERVER_PUMP"
-  npm --prefix open-api/typescript-sdk version "$SERVER_PUMP"
   make open-api
   poetry --directory machine-learning version "$SERVER_PUMP"
 fi

mobile/lib/modules/asset_viewer/hooks/chewiew_controller_hook.dart

@@ -20,6 +20,7 @@ ChewieController? useChewieController(
   bool showOptions = true,
   bool showControlsOnInitialize = false,
   bool autoPlay = true,
+  bool autoInitialize = true,
   bool allowFullScreen = false,
   bool allowedScreenSleep = false,
   bool showControls = true,
@@ -42,6 +43,7 @@ ChewieController? useChewieController(
       hideControlsTimer: hideControlsTimer,
       showControlsOnInitialize: showControlsOnInitialize,
       showControls: showControls,
+      autoInitialize: autoInitialize,
       allowedScreenSleep: allowedScreenSleep,
       onPlaying: onPlaying,
       onPaused: onPaused,
@@ -56,6 +58,7 @@ class _ChewieControllerHook extends Hook<ChewieController?> {
   final bool showOptions;
   final bool showControlsOnInitialize;
   final bool autoPlay;
+  final bool autoInitialize;
   final bool allowFullScreen;
   final bool allowedScreenSleep;
   final bool showControls;
@@ -74,6 +77,7 @@ class _ChewieControllerHook extends Hook<ChewieController?> {
     this.showOptions = true,
     this.showControlsOnInitialize = false,
     this.autoPlay = true,
+    this.autoInitialize = true,
     this.allowFullScreen = false,
     this.allowedScreenSleep = false,
     this.showControls = true,
@@ -162,6 +166,7 @@ class _ChewieControllerHookState
         showOptions: hook.showOptions,
         showControlsOnInitialize: hook.showControlsOnInitialize,
         autoPlay: hook.autoPlay,
+        autoInitialize: hook.autoInitialize,
         allowFullScreen: hook.allowFullScreen,
         allowedScreenSleep: hook.allowedScreenSleep,
         showControls: hook.showControls,

mobile/lib/modules/asset_viewer/views/video_viewer_page.dart

@@ -40,7 +40,7 @@ class VideoViewerPage extends HookWidget {
       controlsSafeAreaMinimum: const EdgeInsets.only(
         bottom: 100,
       ),
-      placeholder: SizedBox.expand(child: placeholder),
+      placeholder: placeholder,
       showControls: showControls && !isMotionVideo,
       hideControlsTimer: hideControlsTimer,
       customControls: const VideoPlayerControls(),

mobile/lib/modules/home/ui/control_bottom_app_bar.dart

@@ -226,7 +226,7 @@ class ControlBottomAppBar extends ConsumerWidget {
         if (selectionAssetState.hasLocal)
           ControlBoxButton(
             iconData: Icons.backup_outlined,
-            label: "control_bottom_app_bar_upload".tr(),
+            label: "Upload",
             onPressed: enabled
                 ? () => showDialog(
                       context: context,

mobile/openapi/doc/AssetApi.md

@@ -1401,7 +1401,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **uploadFile**
-> AssetFileUploadResponseDto uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData)
+> AssetFileUploadResponseDto uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isExternal, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData)
 
 
 
@@ -1432,6 +1432,7 @@ final fileModifiedAt = 2013-10-20T19:20:30+01:00; // DateTime |
 final key = key_example; // String | 
 final duration = duration_example; // String | 
 final isArchived = true; // bool | 
+final isExternal = true; // bool | 
 final isFavorite = true; // bool | 
 final isOffline = true; // bool | 
 final isReadOnly = true; // bool | 
@@ -1441,7 +1442,7 @@ final livePhotoData = BINARY_DATA_HERE; // MultipartFile |
 final sidecarData = BINARY_DATA_HERE; // MultipartFile | 
 
 try {
-    final result = api_instance.uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData);
+    final result = api_instance.uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isExternal, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData);
     print(result);
 } catch (e) {
     print('Exception when calling AssetApi->uploadFile: $e\n');
@@ -1460,6 +1461,7 @@ Name | Type | Description  | Notes
  **key** | **String**|  | [optional] 
  **duration** | **String**|  | [optional] 
  **isArchived** | **bool**|  | [optional] 
+ **isExternal** | **bool**|  | [optional] 
  **isFavorite** | **bool**|  | [optional] 
  **isOffline** | **bool**|  | [optional] 
  **isReadOnly** | **bool**|  | [optional] 

mobile/openapi/doc/SmartSearchDto.md

@@ -27,7 +27,6 @@ Name | Type | Description | Notes
 **make** | **String** |  | [optional] 
 **model** | **String** |  | [optional] 
 **page** | **num** |  | [optional] 
-**personIds** | **List<String>** |  | [optional] [default to const []]
 **query** | **String** |  | 
 **size** | **num** |  | [optional] 
 **state** | **String** |  | [optional] 

mobile/openapi/lib/api/asset_api.dart

@@ -1676,6 +1676,8 @@ class AssetApi {
   ///
   /// * [bool] isArchived:
   ///
+  /// * [bool] isExternal:
+  ///
   /// * [bool] isFavorite:
   ///
   /// * [bool] isOffline:
@@ -1689,7 +1691,7 @@ class AssetApi {
   /// * [MultipartFile] livePhotoData:
   ///
   /// * [MultipartFile] sidecarData:
-  Future<Response> uploadFileWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
+  Future<Response> uploadFileWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
     // ignore: prefer_const_declarations
     final path = r'/asset/upload';
 
@@ -1737,6 +1739,10 @@ class AssetApi {
       hasFields = true;
       mp.fields[r'isArchived'] = parameterToString(isArchived);
     }
+    if (isExternal != null) {
+      hasFields = true;
+      mp.fields[r'isExternal'] = parameterToString(isExternal);
+    }
     if (isFavorite != null) {
       hasFields = true;
       mp.fields[r'isFavorite'] = parameterToString(isFavorite);
@@ -1800,6 +1806,8 @@ class AssetApi {
   ///
   /// * [bool] isArchived:
   ///
+  /// * [bool] isExternal:
+  ///
   /// * [bool] isFavorite:
   ///
   /// * [bool] isOffline:
@@ -1813,8 +1821,8 @@ class AssetApi {
   /// * [MultipartFile] livePhotoData:
   ///
   /// * [MultipartFile] sidecarData:
-  Future<AssetFileUploadResponseDto?> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
-    final response = await uploadFileWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, duration: duration, isArchived: isArchived, isFavorite: isFavorite, isOffline: isOffline, isReadOnly: isReadOnly, isVisible: isVisible, libraryId: libraryId, livePhotoData: livePhotoData, sidecarData: sidecarData, );
+  Future<AssetFileUploadResponseDto?> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
+    final response = await uploadFileWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, duration: duration, isArchived: isArchived, isExternal: isExternal, isFavorite: isFavorite, isOffline: isOffline, isReadOnly: isReadOnly, isVisible: isVisible, libraryId: libraryId, livePhotoData: livePhotoData, sidecarData: sidecarData, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/model/smart_search_dto.dart

@@ -32,7 +32,6 @@ class SmartSearchDto {
     this.make,
     this.model,
     this.page,
-    this.personIds = const [],
     required this.query,
     this.size,
     this.state,
@@ -200,8 +199,6 @@ class SmartSearchDto {
   ///
   num? page;
 
-  List<String> personIds;
-
   String query;
 
   ///
@@ -315,7 +312,6 @@ class SmartSearchDto {
     other.make == make &&
     other.model == model &&
     other.page == page &&
-    _deepEquality.equals(other.personIds, personIds) &&
     other.query == query &&
     other.size == size &&
     other.state == state &&
@@ -352,7 +348,6 @@ class SmartSearchDto {
     (make == null ? 0 : make!.hashCode) +
     (model == null ? 0 : model!.hashCode) +
     (page == null ? 0 : page!.hashCode) +
-    (personIds.hashCode) +
     (query.hashCode) +
     (size == null ? 0 : size!.hashCode) +
     (state == null ? 0 : state!.hashCode) +
@@ -368,7 +363,7 @@ class SmartSearchDto {
     (withExif == null ? 0 : withExif!.hashCode);
 
   @override
-  String toString() => 'SmartSearchDto[city=$city, country=$country, createdAfter=$createdAfter, createdBefore=$createdBefore, deviceId=$deviceId, isArchived=$isArchived, isEncoded=$isEncoded, isExternal=$isExternal, isFavorite=$isFavorite, isMotion=$isMotion, isNotInAlbum=$isNotInAlbum, isOffline=$isOffline, isReadOnly=$isReadOnly, isVisible=$isVisible, lensModel=$lensModel, libraryId=$libraryId, make=$make, model=$model, page=$page, personIds=$personIds, query=$query, size=$size, state=$state, takenAfter=$takenAfter, takenBefore=$takenBefore, trashedAfter=$trashedAfter, trashedBefore=$trashedBefore, type=$type, updatedAfter=$updatedAfter, updatedBefore=$updatedBefore, withArchived=$withArchived, withDeleted=$withDeleted, withExif=$withExif]';
+  String toString() => 'SmartSearchDto[city=$city, country=$country, createdAfter=$createdAfter, createdBefore=$createdBefore, deviceId=$deviceId, isArchived=$isArchived, isEncoded=$isEncoded, isExternal=$isExternal, isFavorite=$isFavorite, isMotion=$isMotion, isNotInAlbum=$isNotInAlbum, isOffline=$isOffline, isReadOnly=$isReadOnly, isVisible=$isVisible, lensModel=$lensModel, libraryId=$libraryId, make=$make, model=$model, page=$page, query=$query, size=$size, state=$state, takenAfter=$takenAfter, takenBefore=$takenBefore, trashedAfter=$trashedAfter, trashedBefore=$trashedBefore, type=$type, updatedAfter=$updatedAfter, updatedBefore=$updatedBefore, withArchived=$withArchived, withDeleted=$withDeleted, withExif=$withExif]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -467,7 +462,6 @@ class SmartSearchDto {
     } else {
     //  json[r'page'] = null;
     }
-      json[r'personIds'] = this.personIds;
       json[r'query'] = this.query;
     if (this.size != null) {
       json[r'size'] = this.size;
@@ -555,9 +549,6 @@ class SmartSearchDto {
         make: mapValueOfType<String>(json, r'make'),
         model: mapValueOfType<String>(json, r'model'),
         page: num.parse('${json[r'page']}'),
-        personIds: json[r'personIds'] is Iterable
-            ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
-            : const [],
         query: mapValueOfType<String>(json, r'query')!,
         size: num.parse('${json[r'size']}'),
         state: mapValueOfType<String>(json, r'state'),

mobile/openapi/test/asset_api_test.dart

@@ -135,7 +135,7 @@ void main() {
       // TODO
     });
 
-    //Future<AssetFileUploadResponseDto> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String key, String duration, bool isArchived, bool isFavorite, bool isOffline, bool isReadOnly, bool isVisible, String libraryId, MultipartFile livePhotoData, MultipartFile sidecarData }) async
+    //Future<AssetFileUploadResponseDto> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String key, String duration, bool isArchived, bool isExternal, bool isFavorite, bool isOffline, bool isReadOnly, bool isVisible, String libraryId, MultipartFile livePhotoData, MultipartFile sidecarData }) async
     test('test uploadFile', () async {
       // TODO
     });

mobile/openapi/test/smart_search_dto_test.dart

@@ -111,11 +111,6 @@ void main() {
       // TODO
     });
 
-    // List<String> personIds (default value: const [])
-    test('to test the property `personIds`', () async {
-      // TODO
-    });
-
     // String query
     test('to test the property `query`', () async {
       // TODO

open-api/bin/generate-open-api.sh

@@ -17,7 +17,9 @@ function dart {
 }
 
 function typescript {
-  npx --yes oazapfts --optimistic --argumentStyle=object --useEnumType immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
+  rm -rf ./typescript-sdk/client
+  npx --yes @openapitools/openapi-generator-cli generate -g typescript-axios -i ./immich-openapi-specs.json -o ./typescript-sdk/axios-client --additional-properties=useSingleRequestParameter=true,supportsES6=true
+  npx --yes oazapfts --optimistic --argumentStyle=object --useEnumType immich-openapi-specs.json typescript-sdk/fetch-client.ts
   npm --prefix typescript-sdk ci && npm --prefix typescript-sdk run build
 }
 

open-api/immich-openapi-specs.json

@@ -3396,7 +3396,7 @@
           }
         ],
         "responses": {
-          "204": {
+          "200": {
             "description": ""
           }
         },
@@ -3521,7 +3521,7 @@
           }
         ],
         "responses": {
-          "204": {
+          "201": {
             "description": ""
           }
         },
@@ -3566,7 +3566,7 @@
           "required": true
         },
         "responses": {
-          "204": {
+          "201": {
             "description": ""
           }
         },
@@ -7541,6 +7541,9 @@
           "isArchived": {
             "type": "boolean"
           },
+          "isExternal": {
+            "type": "boolean"
+          },
           "isFavorite": {
             "type": "boolean"
           },
@@ -9539,12 +9542,6 @@
           "page": {
             "type": "number"
           },
-          "personIds": {
-            "items": {
-              "type": "string"
-            },
-            "type": "array"
-          },
           "query": {
             "type": "string"
           },

open-api/typescript-sdk/axios-client/.gitignore

@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist

open-api/typescript-sdk/axios-client/.npmignore

@@ -0,0 +1 @@
+# empty npmignore to ensure all required files (e.g., in the dist folder) are published by npm

open-api/typescript-sdk/axios-client/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

open-api/typescript-sdk/axios-client/.openapi-generator/FILES

@@ -0,0 +1,8 @@
+.gitignore
+.npmignore
+api.ts
+base.ts
+common.ts
+configuration.ts
+git_push.sh
+index.ts

open-api/typescript-sdk/axios-client/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.2.0

open-api/typescript-sdk/axios-client/base.ts

@@ -0,0 +1,86 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Immich
+ * Immich API
+ *
+ * The version of the OpenAPI document: 1.97.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import type { Configuration } from './configuration';
+// Some imports not used depending on template conditions
+// @ts-ignore
+import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
+import globalAxios from 'axios';
+
+export const BASE_PATH = "/api".replace(/\/+$/, "");
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+/**
+ *
+ * @export
+ * @interface RequestArgs
+ */
+export interface RequestArgs {
+    url: string;
+    options: RawAxiosRequestConfig;
+}
+
+/**
+ *
+ * @export
+ * @class BaseAPI
+ */
+export class BaseAPI {
+    protected configuration: Configuration | undefined;
+
+    constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = configuration.basePath ?? basePath;
+        }
+    }
+};
+
+/**
+ *
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    constructor(public field: string, msg?: string) {
+        super(msg);
+        this.name = "RequiredError"
+    }
+}
+
+interface ServerMap {
+    [key: string]: {
+        url: string,
+        description: string,
+    }[];
+}
+
+/**
+ *
+ * @export
+ */
+export const operationServerMap: ServerMap = {
+}

open-api/typescript-sdk/axios-client/common.ts

@@ -0,0 +1,150 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Immich
+ * Immich API
+ *
+ * The version of the OpenAPI document: 1.97.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import type { Configuration } from "./configuration";
+import type { RequestArgs } from "./base";
+import type { AxiosInstance, AxiosResponse } from 'axios';
+import { RequiredError } from "./base";
+
+/**
+ *
+ * @export
+ */
+export const DUMMY_BASE_URL = 'https://example.com'
+
+/**
+ *
+ * @throws {RequiredError}
+ * @export
+ */
+export const assertParamExists = function (functionName: string, paramName: string, paramValue: unknown) {
+    if (paramValue === null || paramValue === undefined) {
+        throw new RequiredError(paramName, `Required parameter ${paramName} was null or undefined when calling ${functionName}.`);
+    }
+}
+
+/**
+ *
+ * @export
+ */
+export const setApiKeyToObject = async function (object: any, keyParamName: string, configuration?: Configuration) {
+    if (configuration && configuration.apiKey) {
+        const localVarApiKeyValue = typeof configuration.apiKey === 'function'
+            ? await configuration.apiKey(keyParamName)
+            : await configuration.apiKey;
+        object[keyParamName] = localVarApiKeyValue;
+    }
+}
+
+/**
+ *
+ * @export
+ */
+export const setBasicAuthToObject = function (object: any, configuration?: Configuration) {
+    if (configuration && (configuration.username || configuration.password)) {
+        object["auth"] = { username: configuration.username, password: configuration.password };
+    }
+}
+
+/**
+ *
+ * @export
+ */
+export const setBearerAuthToObject = async function (object: any, configuration?: Configuration) {
+    if (configuration && configuration.accessToken) {
+        const accessToken = typeof configuration.accessToken === 'function'
+            ? await configuration.accessToken()
+            : await configuration.accessToken;
+        object["Authorization"] = "Bearer " + accessToken;
+    }
+}
+
+/**
+ *
+ * @export
+ */
+export const setOAuthToObject = async function (object: any, name: string, scopes: string[], configuration?: Configuration) {
+    if (configuration && configuration.accessToken) {
+        const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
+            ? await configuration.accessToken(name, scopes)
+            : await configuration.accessToken;
+        object["Authorization"] = "Bearer " + localVarAccessTokenValue;
+    }
+}
+
+function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void {
+    if (parameter == null) return;
+    if (typeof parameter === "object") {
+        if (Array.isArray(parameter)) {
+            (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key));
+        } 
+        else {
+            Object.keys(parameter).forEach(currentKey => 
+                setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`)
+            );
+        }
+    } 
+    else {
+        if (urlSearchParams.has(key)) {
+            urlSearchParams.append(key, parameter);
+        } 
+        else {
+            urlSearchParams.set(key, parameter);
+        }
+    }
+}
+
+/**
+ *
+ * @export
+ */
+export const setSearchParams = function (url: URL, ...objects: any[]) {
+    const searchParams = new URLSearchParams(url.search);
+    setFlattenedQueryParams(searchParams, objects);
+    url.search = searchParams.toString();
+}
+
+/**
+ *
+ * @export
+ */
+export const serializeDataIfNeeded = function (value: any, requestOptions: any, configuration?: Configuration) {
+    const nonString = typeof value !== 'string';
+    const needsSerialization = nonString && configuration && configuration.isJsonMime
+        ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
+        : nonString;
+    return needsSerialization
+        ? JSON.stringify(value !== undefined ? value : {})
+        : (value || "");
+}
+
+/**
+ *
+ * @export
+ */
+export const toPathString = function (url: URL) {
+    return url.pathname + url.search + url.hash
+}
+
+/**
+ *
+ * @export
+ */
+export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
+    return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+        const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url};
+        return axios.request<T, R>(axiosRequestArgs);
+    };
+}

open-api/typescript-sdk/axios-client/configuration.ts

@@ -0,0 +1,110 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Immich
+ * Immich API
+ *
+ * The version of the OpenAPI document: 1.97.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface ConfigurationParameters {
+    apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
+    username?: string;
+    password?: string;
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
+    basePath?: string;
+    serverIndex?: number;
+    baseOptions?: any;
+    formDataCtor?: new () => any;
+}
+
+export class Configuration {
+    /**
+     * parameter for apiKey security
+     * @param name security name
+     * @memberof Configuration
+     */
+    apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
+    /**
+     * parameter for basic security
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    username?: string;
+    /**
+     * parameter for basic security
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    password?: string;
+    /**
+     * parameter for oauth2 security
+     * @param name security name
+     * @param scopes oauth2 scope
+     * @memberof Configuration
+     */
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
+    /**
+     * override base path
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    basePath?: string;
+    /**
+     * override server index
+     *
+     * @type {number}
+     * @memberof Configuration
+     */
+    serverIndex?: number;
+    /**
+     * base options for axios calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
+    /**
+     * The FormData constructor that will be used to create multipart form data
+     * requests. You can inject this here so that execution environments that
+     * do not support the FormData class can still run the generated client.
+     *
+     * @type {new () => FormData}
+     */
+    formDataCtor?: new () => any;
+
+    constructor(param: ConfigurationParameters = {}) {
+        this.apiKey = param.apiKey;
+        this.username = param.username;
+        this.password = param.password;
+        this.accessToken = param.accessToken;
+        this.basePath = param.basePath;
+        this.serverIndex = param.serverIndex;
+        this.baseOptions = param.baseOptions;
+        this.formDataCtor = param.formDataCtor;
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    public isJsonMime(mime: string): boolean {
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
+        return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
+    }
+}

open-api/typescript-sdk/axios-client/git_push.sh

@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=$(git remote)
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'

open-api/typescript-sdk/axios-client/index.ts

@@ -0,0 +1,18 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Immich
+ * Immich API
+ *
+ * The version of the OpenAPI document: 1.97.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export * from "./api";
+export * from "./configuration";
+

open-api/typescript-sdk/axios.ts

@@ -0,0 +1,4 @@
+export * from './axios-client';
+export * as base from './axios-client/base';
+export * as configuration from './axios-client/configuration';
+export * as common from './axios-client/common';

open-api/typescript-sdk/fetch-client.ts

@@ -289,6 +289,7 @@ export type CreateAssetDto = {
     fileCreatedAt: string;
     fileModifiedAt: string;
     isArchived?: boolean;
+    isExternal?: boolean;
     isFavorite?: boolean;
     isOffline?: boolean;
     isReadOnly?: boolean;
@@ -671,7 +672,6 @@ export type SmartSearchDto = {
     make?: string;
     model?: string;
     page?: number;
-    personIds?: string[];
     query: string;
     size?: number;
     state?: string;

open-api/typescript-sdk/package-lock.json

@@ -1,17 +1,25 @@
 {
   "name": "@immich/sdk",
-  "version": "1.97.0",
+  "version": "1.92.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/sdk",
-      "version": "1.97.0",
+      "version": "1.92.1",
       "license": "GNU Affero General Public License version 3",
       "devDependencies": {
         "@oazapfts/runtime": "^1.0.0",
         "@types/node": "^20.11.0",
         "typescript": "^5.3.3"
+      },
+      "peerDependencies": {
+        "axios": "^1.6.7"
+      },
+      "peerDependenciesMeta": {
+        "axios": {
+          "optional": true
+        }
       }
     },
     "node_modules/@oazapfts/runtime": {
@@ -29,6 +37,114 @@
         "undici-types": "~5.26.4"
       }
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/axios": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "follow-redirects": "^1.15.4",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/typescript": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",

open-api/typescript-sdk/package.json

@@ -1,23 +1,35 @@
 {
   "name": "@immich/sdk",
-  "version": "1.97.0",
+  "version": "1.92.1",
   "description": "",
   "type": "module",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
+  "main": "./build/fetch/index.js",
+  "types": "./build/fetch/index.d.ts",
   "exports": {
+    "./axios": {
+      "types": "./build/axios/axios.d.ts",
+      "default": "./build/axios/axios.js"
+    },
     ".": {
-      "types": "./build/index.d.ts",
-      "default": "./build/index.js"
+      "types": "./build/fetch/fetch.d.ts",
+      "default": "./build/fetch/fetch.js"
     }
   },
   "scripts": {
-    "build": "tsc"
+    "build": "tsc -b ./tsconfig.axios.json ./tsconfig.fetch.json"
   },
   "license": "GNU Affero General Public License version 3",
   "devDependencies": {
     "@oazapfts/runtime": "^1.0.0",
     "@types/node": "^20.11.0",
     "typescript": "^5.3.3"
+  },
+  "peerDependencies": {
+    "axios": "^1.6.7"
+  },
+  "peerDependenciesMeta": {
+    "axios": {
+      "optional": true
+    }
   }
 }

open-api/typescript-sdk/tsconfig.axios.json

@@ -0,0 +1,13 @@
+{
+  "include": ["axios.ts", "axios-client/**/*"],
+  "compilerOptions": {
+    "target": "esnext",
+    "strict": true,
+    "skipLibCheck": true,
+    "declaration": true,
+    "outDir": "build/axios",
+    "module": "esnext",
+    "moduleResolution": "Bundler",
+    "lib": ["esnext"]
+  }
+}

open-api/typescript-sdk/tsconfig.fetch.json

@@ -1,13 +1,13 @@
 {
+  "include": ["fetch.ts", "fetch-client.ts"],
   "compilerOptions": {
     "target": "esnext",
     "strict": true,
     "skipLibCheck": true,
     "declaration": true,
-    "outDir": "build",
+    "outDir": "build/fetch",
     "module": "esnext",
     "moduleResolution": "Bundler",
     "lib": ["esnext", "dom"]
-  },
-  "include": ["src/**/*.ts"]
+  }
 }

server/bin/immich-admin

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-/usr/src/app/start.sh immich-admin "$@"
+/usr/src/app/start.sh immich-admin "$1"

server/e2e/api/specs/library.e2e-spec.ts

@@ -0,0 +1,475 @@
+import { LibraryResponseDto, LoginResponseDto } from '@app/domain';
+import { LibraryController } from '@app/immich';
+import { LibraryType } from '@app/infra/entities';
+import { errorStub, userDto, uuidStub } from '@test/fixtures';
+import { IMMICH_TEST_ASSET_TEMP_PATH, restoreTempFolder } from 'src/test-utils/utils';
+import request from 'supertest';
+import { api } from '../../client';
+import { testApp } from '../utils';
+
+describe(`${LibraryController.name} (e2e)`, () => {
+  let server: any;
+  let admin: LoginResponseDto;
+  let user: LoginResponseDto;
+
+  beforeAll(async () => {
+    const app = await testApp.create();
+    server = app.getHttpServer();
+  });
+
+  afterAll(async () => {
+    await testApp.teardown();
+  });
+
+  beforeEach(async () => {
+    await restoreTempFolder();
+    await testApp.reset();
+    await api.authApi.adminSignUp(server);
+    admin = await api.authApi.adminLogin(server);
+
+    await api.userApi.create(server, admin.accessToken, userDto.user1);
+    user = await api.authApi.login(server, userDto.user1);
+  });
+
+  describe('GET /library', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).get('/library');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+
+    it('should start with a default upload library', async () => {
+      const { status, body } = await request(server)
+        .get('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            ownerId: admin.userId,
+            type: LibraryType.UPLOAD,
+            name: 'Default Library',
+            refreshedAt: null,
+            assetCount: 0,
+            importPaths: [],
+            exclusionPatterns: [],
+          }),
+        ]),
+      );
+    });
+  });
+
+  describe('POST /library', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).post('/library').send({});
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+
+    it('should require admin authentication', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${user.accessToken}`)
+        .send({ type: LibraryType.EXTERNAL });
+
+      expect(status).toBe(403);
+      expect(body).toEqual(errorStub.forbidden);
+    });
+
+    it('should create an external library with defaults', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ type: LibraryType.EXTERNAL });
+
+      expect(status).toBe(201);
+      expect(body).toEqual(
+        expect.objectContaining({
+          ownerId: admin.userId,
+          type: LibraryType.EXTERNAL,
+          name: 'New External Library',
+          refreshedAt: null,
+          assetCount: 0,
+          importPaths: [],
+          exclusionPatterns: [],
+        }),
+      );
+    });
+
+    it('should create an external library with options', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({
+          type: LibraryType.EXTERNAL,
+          name: 'My Awesome Library',
+          importPaths: ['/path/to/import'],
+          exclusionPatterns: ['**/Raw/**'],
+        });
+
+      expect(status).toBe(201);
+      expect(body).toEqual(
+        expect.objectContaining({
+          name: 'My Awesome Library',
+          importPaths: ['/path/to/import'],
+        }),
+      );
+    });
+
+    it('should not create an external library with duplicate import paths', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({
+          type: LibraryType.EXTERNAL,
+          name: 'My Awesome Library',
+          importPaths: ['/path', '/path'],
+          exclusionPatterns: ['**/Raw/**'],
+        });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorStub.badRequest(["All importPaths's elements must be unique"]));
+    });
+
+    it('should not create an external library with duplicate exclusion patterns', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({
+          type: LibraryType.EXTERNAL,
+          name: 'My Awesome Library',
+          importPaths: ['/path/to/import'],
+          exclusionPatterns: ['**/Raw/**', '**/Raw/**'],
+        });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorStub.badRequest(["All exclusionPatterns's elements must be unique"]));
+    });
+
+    it('should create an upload library with defaults', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ type: LibraryType.UPLOAD });
+
+      expect(status).toBe(201);
+      expect(body).toEqual(
+        expect.objectContaining({
+          ownerId: admin.userId,
+          type: LibraryType.UPLOAD,
+          name: 'New Upload Library',
+          refreshedAt: null,
+          assetCount: 0,
+          importPaths: [],
+          exclusionPatterns: [],
+        }),
+      );
+    });
+
+    it('should create an upload library with options', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ type: LibraryType.UPLOAD, name: 'My Awesome Library' });
+
+      expect(status).toBe(201);
+      expect(body).toEqual(
+        expect.objectContaining({
+          name: 'My Awesome Library',
+        }),
+      );
+    });
+
+    it('should not allow upload libraries to have import paths', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ type: LibraryType.UPLOAD, importPaths: ['/path/to/import'] });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorStub.badRequest('Upload libraries cannot have import paths'));
+    });
+
+    it('should not allow upload libraries to have exclusion patterns', async () => {
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ type: LibraryType.UPLOAD, exclusionPatterns: ['**/Raw/**'] });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorStub.badRequest('Upload libraries cannot have exclusion patterns'));
+    });
+  });
+
+  describe('PUT /library/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).put(`/library/${uuidStub.notFound}`).send({});
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+
+    describe('external library', () => {
+      let library: LibraryResponseDto;
+
+      beforeEach(async () => {
+        // Create an external library with default settings
+        library = await api.libraryApi.create(server, admin.accessToken, { type: LibraryType.EXTERNAL });
+      });
+
+      it('should change the library name', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ name: 'New Library Name' });
+
+        expect(status).toBe(200);
+        expect(body).toEqual(
+          expect.objectContaining({
+            name: 'New Library Name',
+          }),
+        );
+      });
+
+      it('should not set an empty name', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ name: '' });
+
+        expect(status).toBe(400);
+        expect(body).toEqual(errorStub.badRequest(['name should not be empty']));
+      });
+
+      it('should change the import paths', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ importPaths: [IMMICH_TEST_ASSET_TEMP_PATH] });
+
+        expect(status).toBe(200);
+        expect(body).toEqual(
+          expect.objectContaining({
+            importPaths: [IMMICH_TEST_ASSET_TEMP_PATH],
+          }),
+        );
+      });
+
+      it('should reject an empty import path', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ importPaths: [''] });
+
+        expect(status).toBe(400);
+        expect(body).toEqual(errorStub.badRequest(['each value in importPaths should not be empty']));
+      });
+
+      it('should reject duplicate import paths', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ importPaths: ['/path', '/path'] });
+
+        expect(status).toBe(400);
+        expect(body).toEqual(errorStub.badRequest(["All importPaths's elements must be unique"]));
+      });
+
+      it('should change the exclusion pattern', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ exclusionPatterns: ['**/Raw/**'] });
+
+        expect(status).toBe(200);
+        expect(body).toEqual(
+          expect.objectContaining({
+            exclusionPatterns: ['**/Raw/**'],
+          }),
+        );
+      });
+
+      it('should reject duplicate exclusion patterns', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ exclusionPatterns: ['**/*.jpg', '**/*.jpg'] });
+
+        expect(status).toBe(400);
+        expect(body).toEqual(errorStub.badRequest(["All exclusionPatterns's elements must be unique"]));
+      });
+
+      it('should reject an empty exclusion pattern', async () => {
+        const { status, body } = await request(server)
+          .put(`/library/${library.id}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ exclusionPatterns: [''] });
+
+        expect(status).toBe(400);
+        expect(body).toEqual(errorStub.badRequest(['each value in exclusionPatterns should not be empty']));
+      });
+    });
+  });
+
+  describe('GET /library/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).get(`/library/${uuidStub.notFound}`);
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+
+    it('should require admin access', async () => {
+      const { status, body } = await request(server)
+        .get(`/library/${uuidStub.notFound}`)
+        .set('Authorization', `Bearer ${user.accessToken}`);
+      expect(status).toBe(403);
+      expect(body).toEqual(errorStub.forbidden);
+    });
+
+    it('should get library by id', async () => {
+      const library = await api.libraryApi.create(server, admin.accessToken, { type: LibraryType.EXTERNAL });
+
+      const { status, body } = await request(server)
+        .get(`/library/${library.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual(
+        expect.objectContaining({
+          ownerId: admin.userId,
+          type: LibraryType.EXTERNAL,
+          name: 'New External Library',
+          refreshedAt: null,
+          assetCount: 0,
+          importPaths: [],
+          exclusionPatterns: [],
+        }),
+      );
+    });
+  });
+
+  describe('DELETE /library/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).delete(`/library/${uuidStub.notFound}`);
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+
+    it('should not delete the last upload library', async () => {
+      const [defaultLibrary] = await api.libraryApi.getAll(server, admin.accessToken);
+      expect(defaultLibrary).toBeDefined();
+
+      const { status, body } = await request(server)
+        .delete(`/library/${defaultLibrary.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorStub.noDeleteUploadLibrary);
+    });
+
+    it('should delete an external library', async () => {
+      const library = await api.libraryApi.create(server, admin.accessToken, { type: LibraryType.EXTERNAL });
+
+      const { status, body } = await request(server)
+        .delete(`/library/${library.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual({});
+
+      const libraries = await api.libraryApi.getAll(server, admin.accessToken);
+      expect(libraries).not.toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            id: library.id,
+          }),
+        ]),
+      );
+    });
+  });
+
+  describe('GET /library/:id/statistics', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).get(`/library/${uuidStub.notFound}/statistics`);
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+  });
+
+  describe('POST /library/:id/scan', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).post(`/library/${uuidStub.notFound}/scan`).send({});
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+  });
+
+  describe('POST /library/:id/removeOffline', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).post(`/library/${uuidStub.notFound}/removeOffline`).send({});
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+  });
+
+  describe('POST /library/:id/validate', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(server).post(`/library/${uuidStub.notFound}/validate`).send({});
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorStub.unauthorized);
+    });
+
+    describe('Validate import path', () => {
+      let library: LibraryResponseDto;
+
+      beforeEach(async () => {
+        // Create an external library with default settings
+        library = await api.libraryApi.create(server, admin.accessToken, { type: LibraryType.EXTERNAL });
+      });
+
+      it('should pass with no import paths', async () => {
+        const response = await api.libraryApi.validate(server, admin.accessToken, library.id, { importPaths: [] });
+        expect(response.importPaths).toEqual([]);
+      });
+
+      it('should fail if path does not exist', async () => {
+        const pathToTest = `${IMMICH_TEST_ASSET_TEMP_PATH}/does/not/exist`;
+
+        const response = await api.libraryApi.validate(server, admin.accessToken, library.id, {
+          importPaths: [pathToTest],
+        });
+
+        expect(response.importPaths?.length).toEqual(1);
+        const pathResponse = response?.importPaths?.at(0);
+
+        expect(pathResponse).toEqual({
+          importPath: pathToTest,
+          isValid: false,
+          message: `Path does not exist (ENOENT)`,
+        });
+      });
+
+      it('should fail if path is a file', async () => {
+        const pathToTest = `${IMMICH_TEST_ASSET_TEMP_PATH}/does/not/exist`;
+
+        const response = await api.libraryApi.validate(server, admin.accessToken, library.id, {
+          importPaths: [pathToTest],
+        });
+
+        expect(response.importPaths?.length).toEqual(1);
+        const pathResponse = response?.importPaths?.at(0);
+
+        expect(pathResponse).toEqual({
+          importPath: pathToTest,
+          isValid: false,
+          message: `Path does not exist (ENOENT)`,
+        });
+      });
+    });
+  });
+});

server/e2e/api/utils.ts

@@ -4,8 +4,8 @@ import { InfraModule, InfraTestModule, dataSource } from '@app/infra';
 import { AssetEntity, AssetType, LibraryType } from '@app/infra/entities';
 import { INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
+import { randomBytes } from 'crypto';
 import { DateTime } from 'luxon';
-import { randomBytes } from 'node:crypto';
 import { EntityTarget, ObjectLiteral } from 'typeorm';
 import { AppService } from '../../src/microservices/app.service';
 import { newJobRepositoryMock, newMetadataRepositoryMock } from '../../test';

server/e2e/client/library-api.ts

@@ -36,14 +36,14 @@ export const libraryApi = {
       .post(`/library/${id}/scan`)
       .set('Authorization', `Bearer ${accessToken}`)
       .send(dto);
-    expect(status).toBe(204);
+    expect(status).toBe(201);
   },
   removeOfflineFiles: async (server: any, accessToken: string, id: string) => {
     const { status } = await request(server)
       .post(`/library/${id}/removeOffline`)
       .set('Authorization', `Bearer ${accessToken}`)
       .send();
-    expect(status).toBe(204);
+    expect(status).toBe(201);
   },
   getLibraryStatistics: async (server: any, accessToken: string, id: string): Promise<LibraryStatsResponseDto> => {
     const { body, status } = await request(server)

server/e2e/docker-compose.server-e2e.yml

@@ -12,7 +12,6 @@ services:
     command: ['/usr/src/app/bin/immich-test', 'jobs']
     volumes:
       - /usr/src/app/node_modules
-      - ../test/assets:/usr/src/app/test/assets:ro
     environment:
       - DB_HOSTNAME=database
       - DB_USERNAME=postgres

server/e2e/jobs/specs/library.e2e-spec.ts

@@ -45,11 +45,12 @@ describe(`${LibraryController.name} (e2e)`, () => {
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
       expect(assets.length).toBeGreaterThan(2);
 
-      const { status } = await request(server)
+      const { status, body } = await request(server)
         .delete(`/library/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
-      expect(status).toBe(204);
+      expect(status).toBe(200);
+      expect(body).toEqual({});
 
       const libraries = await api.libraryApi.getAll(server, admin.accessToken);
       expect(libraries).toHaveLength(1);
@@ -391,7 +392,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
         .post(`/library/${library.id}/removeOffline`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send();
-      expect(status).toBe(204);
+      expect(status).toBe(201);
 
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
 
@@ -415,7 +416,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
         .post(`/library/${library.id}/removeOffline`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send();
-      expect(status).toBe(204);
+      expect(status).toBe(201);
 
       const assetsAfter = await api.assetApi.getAllAssets(server, admin.accessToken);
 

server/src/domain/search/dto/search.dto.ts

@@ -122,9 +122,6 @@ class BaseSearchDto {
 
   @QueryBoolean({ optional: true })
   isNotInAlbum?: boolean;
-
-  @Optional()
-  personIds?: string[];
 }
 
 export class MetadataSearchDto extends BaseSearchDto {
@@ -176,6 +173,9 @@ export class MetadataSearchDto extends BaseSearchDto {
   @Optional()
   @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder })
   order?: AssetOrder;
+
+  @Optional()
+  personIds?: string[];
 }
 
 export class SmartSearchDto extends BaseSearchDto {

server/src/immich/api-v1/asset/asset.service.ts

@@ -341,6 +341,7 @@ export class AssetService {
       fileCreatedAt: dto.fileCreatedAt,
       fileModifiedAt: dto.fileModifiedAt,
       localDateTime: dto.fileCreatedAt,
+      deletedAt: null,
 
       type: mimeTypes.assetType(file.originalPath),
       isFavorite: dto.isFavorite,
@@ -348,9 +349,17 @@ export class AssetService {
       duration: dto.duration || null,
       isVisible: dto.isVisible ?? true,
       livePhotoVideo: livePhotoAssetId === null ? null : ({ id: livePhotoAssetId } as AssetEntity),
+      resizePath: null,
+      webpPath: null,
+      thumbhash: null,
+      encodedVideoPath: null,
+      tags: [],
+      sharedLinks: [],
       originalFileName: parse(file.originalName).name,
+      faces: [],
       sidecarPath: sidecarPath || null,
       isReadOnly: dto.isReadOnly ?? false,
+      isExternal: dto.isExternal ?? false,
       isOffline: dto.isOffline ?? false,
     });
 

server/src/immich/api-v1/asset/dto/create-asset.dto.ts

@@ -3,10 +3,7 @@ import { ApiProperty } from '@nestjs/swagger';
 import { Transform, Type } from 'class-transformer';
 import { IsBoolean, IsDate, IsNotEmpty, IsString } from 'class-validator';
 
-export class CreateAssetDto {
-  @ValidateUUID({ optional: true })
-  libraryId?: string;
-
+export class CreateAssetBase {
   @IsNotEmpty()
   @IsString()
   deviceAssetId!: string;
@@ -25,10 +22,6 @@ export class CreateAssetDto {
   @Type(() => Date)
   fileModifiedAt!: Date;
 
-  @Optional()
-  @IsString()
-  duration?: string;
-
   @Optional()
   @IsBoolean()
   @Transform(toBoolean)
@@ -45,15 +38,27 @@ export class CreateAssetDto {
   isVisible?: boolean;
 
   @Optional()
-  @IsBoolean()
-  @Transform(toBoolean)
-  isOffline?: boolean;
+  @IsString()
+  duration?: string;
 
+  @Optional()
+  @IsBoolean()
+  isExternal?: boolean;
+
+  @Optional()
+  @IsBoolean()
+  isOffline?: boolean;
+}
+
+export class CreateAssetDto extends CreateAssetBase {
   @Optional()
   @IsBoolean()
   @Transform(toBoolean)
   isReadOnly?: boolean;
 
+  @ValidateUUID({ optional: true })
+  libraryId?: string;
+
   // The properties below are added to correctly generate the API docs
   // and client SDKs. Validation should be handled in the controller.
   @ApiProperty({ type: 'string', format: 'binary' })

server/src/immich/controllers/library.controller.ts

@@ -10,7 +10,7 @@ import {
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
 } from '@app/domain';
-import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpCode, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { AdminRoute, Auth, Authenticated } from '../app.guard';
 import { UseValidation } from '../app.utils';
@@ -55,7 +55,6 @@ export class LibraryController {
   }
 
   @Delete(':id')
-  @HttpCode(HttpStatus.NO_CONTENT)
   deleteLibrary(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
@@ -66,13 +65,11 @@ export class LibraryController {
   }
 
   @Post(':id/scan')
-  @HttpCode(HttpStatus.NO_CONTENT)
   scanLibrary(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto, @Body() dto: ScanLibraryDto) {
     return this.service.queueScan(auth, id, dto);
   }
 
   @Post(':id/removeOffline')
-  @HttpCode(HttpStatus.NO_CONTENT)
   removeOfflineFiles(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto) {
     return this.service.queueRemoveOffline(auth, id);
   }

server/src/infra/repositories/search.repository.ts

@@ -22,7 +22,7 @@ import {
 import { ImmichLogger } from '@app/infra/logger';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, SelectQueryBuilder } from 'typeorm';
+import { Repository } from 'typeorm';
 import { vectorExt } from '../database.config';
 import { DummyValue, GenerateSql } from '../infra.util';
 import { asVector, isValidInteger, paginatedBuilder, searchAssetBuilder } from '../infra.utils';
@@ -81,14 +81,6 @@ export class SearchRepository implements ISearchRepository {
     });
   }
 
-  private createPersonFilter(builder: SelectQueryBuilder<AssetFaceEntity>, personIds: string[]) {
-    return builder
-      .select(`${builder.alias}."assetId"`)
-      .where(`${builder.alias}."personId" IN (:...personIds)`, { personIds })
-      .groupBy(`${builder.alias}."assetId"`)
-      .having(`COUNT(DISTINCT ${builder.alias}."personId") = :personCount`, { personCount: personIds.length });
-  }
-
   @GenerateSql({
     params: [
       { page: 1, size: 100 },
@@ -104,21 +96,12 @@ export class SearchRepository implements ISearchRepository {
   })
   async searchSmart(
     pagination: SearchPaginationOptions,
-    { embedding, userIds, personIds, ...options }: SmartSearchOptions,
+    { embedding, userIds, ...options }: SmartSearchOptions,
   ): Paginated<AssetEntity> {
     let results: PaginationResult<AssetEntity> = { items: [], hasNextPage: false };
 
     await this.assetRepository.manager.transaction(async (manager) => {
       let builder = manager.createQueryBuilder(AssetEntity, 'asset');
-
-      if (personIds?.length) {
-        const assetFaceBuilder = manager.createQueryBuilder(AssetFaceEntity, 'asset_face');
-        const cte = this.createPersonFilter(assetFaceBuilder, personIds);
-        builder
-          .addCommonTableExpression(cte, 'asset_face_ids')
-          .innerJoin('asset_face_ids', 'a', 'a."assetId" = asset.id');
-      }
-
       builder = searchAssetBuilder(builder, options);
       builder
         .innerJoin('asset.smartSearch', 'search')

server/src/test-utils/utils.ts

@@ -6,8 +6,7 @@ import { INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { DateTime } from 'luxon';
 import * as fs from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
+import path from 'node:path';
 import { EventEmitter } from 'node:stream';
 import { Server } from 'node:tls';
 import { EntityTarget, ObjectLiteral } from 'typeorm';
@@ -15,7 +14,7 @@ import { AppService } from '../immich/app.service';
 import { AppService as MicroAppService } from '../microservices/app.service';
 
 export const IMMICH_TEST_ASSET_PATH = process.env.IMMICH_TEST_ASSET_PATH as string;
-export const IMMICH_TEST_ASSET_TEMP_PATH = join(tmpdir(), 'immich');
+export const IMMICH_TEST_ASSET_TEMP_PATH = path.normalize(`${IMMICH_TEST_ASSET_PATH}/temp/`);
 
 export const today = DateTime.fromObject({ year: 2023, month: 11, day: 3 });
 export const yesterday = today.minus({ days: 1 });

web/.eslintrc.cjs

@@ -13,7 +13,6 @@ module.exports = {
     sourceType: 'module',
     ecmaVersion: 2022,
     extraFileExtensions: ['.svelte'],
-    tsconfigRootDir: __dirname,
     project: ['./tsconfig.json'],
   },
   env: {

web/package-lock.json

@@ -1,18 +1,19 @@
 {
   "name": "immich-web",
-  "version": "1.97.0",
+  "version": "1.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich-web",
-      "version": "1.97.0",
+      "version": "1.3.0",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@immich/sdk": "file:../open-api/typescript-sdk",
         "@mdi/js": "^7.4.47",
         "@photo-sphere-viewer/core": "^5.7.1",
         "@zoom-image/svelte": "^0.2.6",
+        "axios": "^1.6.7",
         "buffer": "^6.0.3",
         "copy-image-clipboard": "^2.1.2",
         "dom-to-image": "^2.6.0",
@@ -27,6 +28,7 @@
       },
       "devDependencies": {
         "@faker-js/faker": "^8.4.1",
+        "@floating-ui/dom": "^1.6.3",
         "@socket.io/component-emitter": "^3.1.0",
         "@sveltejs/adapter-static": "^3.0.1",
         "@sveltejs/enhanced-img": "^0.1.8",
@@ -47,6 +49,7 @@
         "eslint-plugin-svelte": "^2.35.1",
         "eslint-plugin-unicorn": "^51.0.1",
         "factory.ts": "^1.4.1",
+        "identity-obj-proxy": "^3.0.0",
         "postcss": "^8.4.35",
         "prettier": "^3.2.5",
         "prettier-plugin-organize-imports": "^3.2.4",
@@ -69,6 +72,14 @@
         "@oazapfts/runtime": "^1.0.0",
         "@types/node": "^20.11.0",
         "typescript": "^5.3.3"
+      },
+      "peerDependencies": {
+        "axios": "^1.6.7"
+      },
+      "peerDependenciesMeta": {
+        "axios": {
+          "optional": true
+        }
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -911,6 +922,31 @@
         "npm": ">=6.14.13"
       }
     },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz",
+      "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==",
+      "dev": true,
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.1"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz",
+      "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==",
+      "dev": true,
+      "dependencies": {
+        "@floating-ui/core": "^1.0.0",
+        "@floating-ui/utils": "^0.2.0"
+      }
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz",
+      "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==",
+      "dev": true
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -2995,10 +3031,7 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/autoprefixer": {
       "version": "10.4.17",
@@ -3049,6 +3082,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/axios": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+      "dependencies": {
+        "follow-redirects": "^1.15.4",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/axobject-query": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz",
@@ -3482,9 +3525,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -3759,9 +3799,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -4618,6 +4655,25 @@
       "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
       "dev": true
     },
+    "node_modules/follow-redirects": {
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
@@ -4631,9 +4687,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -4907,6 +4960,12 @@
         "uglify-js": "^3.1.4"
       }
     },
+    "node_modules/harmony-reflect": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
+      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==",
+      "dev": true
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -5067,6 +5126,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/identity-obj-proxy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
+      "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
+      "dev": true,
+      "dependencies": {
+        "harmony-reflect": "^1.4.6"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -6122,9 +6193,6 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -6133,9 +6201,6 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -6974,6 +7039,11 @@
       "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
       "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "node_modules/psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-web",
-  "version": "1.97.0",
+  "version": "1.3.0",
   "license": "GNU Affero General Public License version 3",
   "scripts": {
     "dev": "vite dev --host 0.0.0.0 --port 3000",
@@ -23,6 +23,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^8.4.1",
+    "@floating-ui/dom": "^1.6.3",
     "@socket.io/component-emitter": "^3.1.0",
     "@sveltejs/adapter-static": "^3.0.1",
     "@sveltejs/enhanced-img": "^0.1.8",
@@ -43,6 +44,7 @@
     "eslint-plugin-svelte": "^2.35.1",
     "eslint-plugin-unicorn": "^51.0.1",
     "factory.ts": "^1.4.1",
+    "identity-obj-proxy": "^3.0.0",
     "postcss": "^8.4.35",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^3.2.4",
@@ -62,6 +64,7 @@
     "@mdi/js": "^7.4.47",
     "@photo-sphere-viewer/core": "^5.7.1",
     "@zoom-image/svelte": "^0.2.6",
+    "axios": "^1.6.7",
     "buffer": "^6.0.3",
     "copy-image-clipboard": "^2.1.2",
     "dom-to-image": "^2.6.0",

web/src/lib/api/index.ts

@@ -0,0 +1,14 @@
+import { AssetApi, DownloadApi, configuration } from '@immich/sdk/axios';
+
+class ImmichApi {
+  public downloadApi: DownloadApi;
+  public assetApi: AssetApi;
+
+  constructor(parameters: configuration.ConfigurationParameters) {
+    const config = new configuration.Configuration(parameters);
+    this.downloadApi = new DownloadApi(config);
+    this.assetApi = new AssetApi(config);
+  }
+}
+
+export const api = new ImmichApi({ basePath: '/api' });

web/src/lib/components/album-page/__tests__/album-card.spec.ts

@@ -1,18 +1,14 @@
 import { createObjectURLMock } from '$lib/__mocks__/jsdom-url.mock';
-import sdk, { ThumbnailFormat } from '@immich/sdk';
+import { api } from '$lib/api';
+import { ThumbnailFormat } from '@immich/sdk';
 import { albumFactory } from '@test-data';
 import '@testing-library/jest-dom';
 import { fireEvent, render, waitFor, type RenderResult } from '@testing-library/svelte';
 import type { MockedObject } from 'vitest';
 import AlbumCard from '../album-card.svelte';
 
-vi.mock('@immich/sdk', async (originalImport) => {
-  const module = await originalImport<typeof import('@immich/sdk')>();
-  const mock = { ...module, getAssetThumbnail: vi.fn() };
-  return { ...mock, default: mock };
-});
-
-const sdkMock: MockedObject<typeof sdk> = sdk as MockedObject<typeof sdk>;
+vi.mock('$lib/api');
+const apiMock: MockedObject<typeof api> = api as MockedObject<typeof api>;
 
 describe('AlbumCard component', () => {
   let sut: RenderResult<AlbumCard>;
@@ -52,7 +48,7 @@ describe('AlbumCard component', () => {
     await waitFor(() => expect(albumImgElement).toHaveAttribute('src'));
 
     expect(albumImgElement).toHaveAttribute('alt', album.id);
-    expect(sdkMock.getAssetThumbnail).not.toHaveBeenCalled();
+    expect(apiMock.assetApi.getAssetThumbnail).not.toHaveBeenCalled();
 
     expect(albumNameElement).toHaveTextContent(album.albumName);
     expect(albumDetailsElement).toHaveTextContent(new RegExp(detailsText));
@@ -61,7 +57,17 @@ describe('AlbumCard component', () => {
   it('shows album data and loads the thumbnail image when available', async () => {
     const thumbnailFile = new File([new Blob()], 'fileThumbnail');
     const thumbnailUrl = 'blob:thumbnailUrlOne';
-    sdkMock.getAssetThumbnail.mockResolvedValue(thumbnailFile);
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    //  @ts-ignore
+    // TODO: there needs to be a more robust mock of the @api to avoid mockResolvedValueOnce ts error
+    //       this is a workaround to make ts checks not fail but the test will pass as expected
+    apiMock.assetApi.getAssetThumbnail.mockResolvedValue({
+      data: thumbnailFile,
+      config: {},
+      headers: {},
+      status: 200,
+      statusText: '',
+    });
     createObjectURLMock.mockReturnValueOnce(thumbnailUrl);
 
     const album = albumFactory.build({
@@ -79,11 +85,14 @@ describe('AlbumCard component', () => {
     await waitFor(() => expect(albumImgElement).toHaveAttribute('src', thumbnailUrl));
 
     expect(albumImgElement).toHaveAttribute('alt', album.id);
-    expect(sdkMock.getAssetThumbnail).toHaveBeenCalledTimes(1);
-    expect(sdkMock.getAssetThumbnail).toHaveBeenCalledWith({
-      id: 'thumbnailIdOne',
-      format: ThumbnailFormat.Jpeg,
-    });
+    expect(apiMock.assetApi.getAssetThumbnail).toHaveBeenCalledTimes(1);
+    expect(apiMock.assetApi.getAssetThumbnail).toHaveBeenCalledWith(
+      {
+        id: 'thumbnailIdOne',
+        format: ThumbnailFormat.Jpeg,
+      },
+      { responseType: 'blob' },
+    );
     expect(createObjectURLMock).toHaveBeenCalledWith(thumbnailFile);
 
     expect(albumNameElement).toHaveTextContent('some album name');

web/src/lib/components/album-page/album-card.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
+  import { api } from '$lib/api';
   import Icon from '$lib/components/elements/icon.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { user } from '$lib/stores/user.store';
   import { getAssetThumbnailUrl } from '$lib/utils';
-  import { ThumbnailFormat, getAssetThumbnail, getUserById, type AlbumResponseDto } from '@immich/sdk';
+  import { ThumbnailFormat, getUserById, type AlbumResponseDto } from '@immich/sdk';
   import { mdiDotsVertical } from '@mdi/js';
   import { createEventDispatcher, onMount } from 'svelte';
   import { getContextMenuPosition } from '../../utils/context-menu';
@@ -24,13 +25,24 @@
   const dispatchClick = createEventDispatcher<OnClick>();
   const dispatchShowContextMenu = createEventDispatcher<OnShowContextMenu>();
 
-  const loadHighQualityThumbnail = async (assetId: string | null) => {
-    if (!assetId) {
+  const loadHighQualityThumbnail = async (thubmnailId: string | null) => {
+    if (thubmnailId == undefined) {
       return;
     }
 
-    const data = await getAssetThumbnail({ id: assetId, format: ThumbnailFormat.Jpeg });
-    return URL.createObjectURL(data);
+    const { data } = await api.assetApi.getAssetThumbnail(
+      {
+        id: thubmnailId,
+        format: ThumbnailFormat.Jpeg,
+      },
+      {
+        responseType: 'blob',
+      },
+    );
+
+    if (data instanceof Blob) {
+      return URL.createObjectURL(data);
+    }
   };
 
   const showAlbumContextMenu = (e: MouseEvent) =>

web/src/lib/components/album-page/album-viewer.svelte

@@ -20,6 +20,7 @@
   import ThemeButton from '../shared-components/theme-button.svelte';
   import { shouldIgnoreShortcut } from '$lib/utils/shortcut';
   import { mdiFileImagePlusOutline, mdiFolderDownloadOutline } from '@mdi/js';
+  import UpdatePanel from '../shared-components/update-panel.svelte';
   import { handlePromiseError } from '$lib/utils';
 
   export let sharedLink: SharedLinkResponseDto;
@@ -167,4 +168,5 @@
       {/if}
     </section>
   </AssetGrid>
+  <UpdatePanel {assetStore} />
 </main>

web/src/lib/components/asset-viewer/panorama-viewer.svelte

@@ -1,13 +1,22 @@
 <script lang="ts">
-  import { serveFile, type AssetResponseDto } from '@immich/sdk';
+  import { api } from '$lib/api';
+  import { getKey } from '$lib/utils';
+  import { type AssetResponseDto } from '@immich/sdk';
   import { fade } from 'svelte/transition';
   import LoadingSpinner from '../shared-components/loading-spinner.svelte';
 
   export let asset: AssetResponseDto;
 
   const loadAssetData = async () => {
-    const data = await serveFile({ id: asset.id, isWeb: false, isThumb: false });
-    return URL.createObjectURL(data);
+    const { data } = await api.assetApi.serveFile(
+      { id: asset.id, isThumb: false, isWeb: false, key: getKey() },
+      { responseType: 'blob' },
+    );
+    if (data instanceof Blob) {
+      return URL.createObjectURL(data);
+    } else {
+      throw new TypeError('Invalid data format');
+    }
   };
 </script>
 

web/src/lib/components/asset-viewer/photo-viewer.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
+  import { api } from '$lib/api';
   import { photoViewer } from '$lib/stores/assets.store';
   import { boundingBoxesArray } from '$lib/stores/people.store';
   import { alwaysLoadOriginalFile } from '$lib/stores/preferences.store';
   import { photoZoomState } from '$lib/stores/zoom-image.store';
-  import { downloadRequest, getAssetFileUrl, handlePromiseError } from '$lib/utils';
+  import { getKey, handlePromiseError } from '$lib/utils';
   import { isWebCompatibleImage } from '$lib/utils/asset-utils';
   import { getBoundingBox } from '$lib/utils/people-utils';
   import { shouldIgnoreShortcut } from '$lib/utils/shortcut';
@@ -50,11 +51,17 @@
       abortController?.abort();
       abortController = new AbortController();
 
-      // TODO: Use sdk once it supports signals
-      const { data } = await downloadRequest({
-        url: getAssetFileUrl(asset.id, !loadOriginal, false),
-        signal: abortController.signal,
-      });
+      const { data } = await api.assetApi.serveFile(
+        { id: asset.id, isThumb: false, isWeb: !loadOriginal, key: getKey() },
+        {
+          responseType: 'blob',
+          signal: abortController.signal,
+        },
+      );
+
+      if (!(data instanceof Blob)) {
+        return;
+      }
 
       assetData = URL.createObjectURL(data);
     } catch {

web/src/lib/components/forms/library-import-paths-form.svelte

@@ -6,10 +6,11 @@
   import Icon from '$lib/components/elements/icon.svelte';
   import { mdiAlertOutline, mdiCheckCircleOutline, mdiPencilOutline, mdiRefresh } from '@mdi/js';
   import { validate, type LibraryResponseDto } from '@immich/sdk';
-  import type { ValidateLibraryImportPathResponseDto } from '@immich/sdk';
+  import type { ValidateLibraryImportPathResponseDto } from '@immich/sdk/axios';
   import { NotificationType, notificationController } from '../shared-components/notification/notification';
 
   export let library: LibraryResponseDto;
+  export let isAdmin = false;
 
   let addImportPath = false;
   let editImportPath: number | null = null;
@@ -190,70 +191,85 @@
               : 'bg-immich-bg dark:bg-immich-dark-gray/50'
           }`}
         >
-          <td class="w-1/8 text-ellipsis pl-8 text-sm">
-            {#if validatedPath.isValid}
-              <Icon
-                path={mdiCheckCircleOutline}
-                size="24"
-                title={validatedPath.message}
-                class="text-immich-success dark:text-immich-dark-success"
-              />
-            {:else}
-              <Icon
-                path={mdiAlertOutline}
-                size="24"
-                title={validatedPath.message}
-                class="text-immich-warning dark:text-immich-dark-warning"
-              />
-            {/if}
-          </td>
+          {#if isAdmin}
+            <td class="w-1/8 text-ellipsis pl-8 text-sm">
+              {#if validatedPath.isValid}
+                <Icon
+                  path={mdiCheckCircleOutline}
+                  size="24"
+                  title={validatedPath.message}
+                  class="text-immich-success dark:text-immich-dark-success"
+                />
+              {:else}
+                <Icon
+                  path={mdiAlertOutline}
+                  size="24"
+                  title={validatedPath.message}
+                  class="text-immich-warning dark:text-immich-dark-warning"
+                />
+              {/if}
+            </td>{/if}
 
-          <td class="w-4/5 text-ellipsis px-4 text-sm">{validatedPath.importPath}</td>
-          <td class="w-1/5 text-ellipsis px-4 text-sm flex flex-row">
-            <button
-              type="button"
-              on:click={() => {
-                editImportPath = listIndex;
-                editedImportPath = validatedPath.importPath;
-              }}
-              class="rounded-full bg-immich-primary p-3 text-gray-100 transition-all duration-150 hover:bg-immich-primary/75 dark:bg-immich-dark-primary dark:text-gray-700"
-            >
-              <Icon path={mdiPencilOutline} size="16" />
-            </button>
-          </td>
+          <td class={isAdmin ? 'w-4/5 text-ellipsis px-4 text-sm' : 'w-full text-ellipsis px-4 text-sm'}
+            >{validatedPath.importPath}</td
+          >
+          {#if isAdmin}
+            <td class="w-1/5 text-ellipsis px-4 text-sm flex flex-row">
+              <button
+                type="button"
+                on:click={() => {
+                  editImportPath = listIndex;
+                  editedImportPath = validatedPath.importPath;
+                }}
+                class="rounded-full bg-immich-primary p-3 text-gray-100 transition-all duration-150 hover:bg-immich-primary/75 dark:bg-immich-dark-primary dark:text-gray-700"
+              >
+                <Icon path={mdiPencilOutline} size="16" />
+              </button>
+            </td>
+          {/if}
         </tr>
       {/each}
-      <tr
-        class={`flex h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg ${
-          importPaths.length % 2 == 0
-            ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
-            : 'bg-immich-bg dark:bg-immich-dark-gray/50'
-        }`}
-      >
-        <td class="w-4/5 text-ellipsis px-4 text-sm">
-          {#if importPaths.length === 0}
-            No paths added
-          {/if}</td
+      {#if isAdmin || importPaths.length === 0}
+        <tr
+          class={`flex h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg ${
+            importPaths.length % 2 == 0
+              ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
+              : 'bg-immich-bg dark:bg-immich-dark-gray/50'
+          }`}
         >
-        <td class="w-1/5 text-ellipsis px-4 text-sm"
-          ><Button
-            type="button"
-            size="sm"
-            on:click={() => {
-              addImportPath = true;
-            }}>Add path</Button
-          ></td
+          <td class={isAdmin ? 'w-4/5 text-ellipsis px-4 text-sm' : 'w-full text-ellipsis px-4 text-sm'}>
+            {#if importPaths.length === 0}
+              No paths added
+            {/if}</td
+          >{#if isAdmin}
+            <td class="w-1/5 text-ellipsis px-4 text-sm"
+              ><Button
+                type="button"
+                size="sm"
+                on:click={() => {
+                  addImportPath = true;
+                }}>Add path</Button
+              ></td
+            >{/if}</tr
         >
-      </tr>
+      {/if}
     </tbody>
   </table>
-  <div class="flex justify-between w-full">
-    <div class="justify-end gap-2">
-      <Button size="sm" color="gray" on:click={() => revalidate()}><Icon path={mdiRefresh} size={20} />Validate</Button>
+  {#if isAdmin}
+    <div class="flex justify-between w-full">
+      <div class="justify-end gap-2">
+        <Button size="sm" color="gray" on:click={() => revalidate()}
+          ><Icon path={mdiRefresh} size={20} />Validate</Button
+        >
+      </div>
+      <div class="justify-end gap-2">
+        <Button size="sm" color="gray" on:click={() => handleCancel()}>Cancel</Button>
+        <Button size="sm" type="submit">Save</Button>
+      </div>
     </div>
-    <div class="justify-end gap-2">
-      <Button size="sm" color="gray" on:click={() => handleCancel()}>Cancel</Button>
-      <Button size="sm" type="submit">Save</Button>
+  {:else}
+    <div class="flex w-full justify-end gap-2">
+      <Button size="sm" color="gray" on:click={() => handleCancel()}>Close</Button>
     </div>
-  </div>
+  {/if}
 </form>

web/src/lib/components/forms/login-form.svelte

@@ -35,7 +35,7 @@
         return;
       } catch (error) {
         console.error('Error [login-form] [oauth.callback]', error);
-        oauthError = getServerErrorMessage(error) || 'Unable to complete OAuth login';
+        oauthError = (await getServerErrorMessage(error)) || 'Unable to complete OAuth login';
         oauthLoading = false;
       }
     }
@@ -73,7 +73,7 @@
       await onSuccess();
       return;
     } catch (error) {
-      errorMessage = getServerErrorMessage(error) || 'Incorrect email or password';
+      errorMessage = (await getServerErrorMessage(error)) || 'Incorrect email or password';
       loading = false;
       return;
     }

web/src/lib/components/shared-components/search-bar/search-filter-box.svelte

@@ -22,6 +22,7 @@
 
 <script lang="ts">
   import Button from '$lib/components/elements/buttons/button.svelte';
+  import { handleError } from '$lib/utils/handle-error';
   import { AssetTypeEnum, type SmartSearchDto, type MetadataSearchDto } from '@immich/sdk';
   import { createEventDispatcher } from 'svelte';
   import { fly } from 'svelte/transition';
@@ -82,6 +83,14 @@
   };
 
   const search = () => {
+    if (filter.context && filter.personIds.size > 0) {
+      handleError(
+        new Error('Context search does not support people filter'),
+        'Context search does not support people filter',
+      );
+      return;
+    }
+
     let type: AssetTypeEnum | undefined = undefined;
     if (filter.mediaType === MediaType.Image) {
       type = AssetTypeEnum.Image;

web/src/lib/components/shared-components/update-panel.svelte

@@ -0,0 +1,18 @@
+<script lang="ts">
+  import { websocketEvents } from '$lib/stores/websocket';
+  import type { AssetStore } from '$lib/stores/assets.store';
+  import { onMount } from 'svelte';
+
+  export let assetStore: AssetStore | null;
+
+  onMount(() => {
+    return websocketEvents.on('on_asset_update', (asset) => {
+      if (asset.originalFileName && assetStore) {
+        assetStore.updateAsset(asset, true);
+
+        assetStore.removeAsset(asset.id); // Update timeline
+        assetStore.addAsset(asset);
+      }
+    });
+  });
+</script>

web/src/lib/stores/assets.store.ts

@@ -49,11 +49,6 @@ interface AddAsset {
   value: AssetResponseDto;
 }
 
-interface UpdateAsset {
-  type: 'update';
-  value: AssetResponseDto;
-}
-
 interface DeleteAsset {
   type: 'delete';
   value: string;
@@ -66,7 +61,7 @@ interface TrashAsset {
 
 export const photoViewer = writable<HTMLImageElement | null>(null);
 
-type PendingChange = AddAsset | UpdateAsset | DeleteAsset | TrashAsset;
+type PendingChange = AddAsset | DeleteAsset | TrashAsset;
 
 export class AssetStore {
   private store$ = writable(this);
@@ -107,9 +102,6 @@ export class AssetStore {
       websocketEvents.on('on_asset_trash', (ids) => {
         this.addPendingChanges(...ids.map((id): TrashAsset => ({ type: 'trash', value: id })));
       }),
-      websocketEvents.on('on_asset_update', (asset) => {
-        this.addPendingChanges({ type: 'update', value: asset });
-      }),
       websocketEvents.on('on_asset_delete', (id: string) => {
         this.addPendingChanges({ type: 'delete', value: id });
       }),
@@ -130,11 +122,6 @@ export class AssetStore {
           break;
         }
 
-        case 'update': {
-          this.updateAsset(value);
-          break;
-        }
-
         case 'trash': {
           if (!this.options.isTrashed) {
             this.removeAsset(value);
@@ -289,10 +276,6 @@ export class AssetStore {
       return;
     }
 
-    this.addAssetToBucket(asset);
-  }
-
-  private addAssetToBucket(asset: AssetResponseDto) {
     const timeBucket = DateTime.fromISO(asset.fileCreatedAt).toUTC().startOf('month').toString();
     let bucket = this.getBucketByDate(timeBucket);
 
@@ -324,7 +307,7 @@ export class AssetStore {
     // If we added an asset to the store, we need to recalculate
     // asset store containers
     this.assets.push(asset);
-    this.emit(true);
+    this.updateAsset(asset, true);
   }
 
   getBucketByDate(bucketDate: string): AssetBucket | null {
@@ -355,20 +338,14 @@ export class AssetStore {
     return null;
   }
 
-  updateAsset(_asset: AssetResponseDto) {
+  updateAsset(_asset: AssetResponseDto, recalculate = false) {
     const asset = this.assets.find((asset) => asset.id === _asset.id);
     if (!asset) {
       return;
     }
 
-    const recalculate = asset.fileCreatedAt !== _asset.fileCreatedAt;
-    if (recalculate) {
-      this.removeAsset(asset.id);
-      this.addAssetToBucket(_asset);
-      return;
-    }
-
     Object.assign(asset, _asset);
+
     this.emit(recalculate);
   }
 
@@ -380,9 +357,6 @@ export class AssetStore {
   }
 
   removeAsset(id: string) {
-    this.assets = this.assets.filter((asset) => asset.id !== id);
-    delete this.assetToBucket[id];
-
     for (let index = 0; index < this.buckets.length; index++) {
       const bucket = this.buckets[index];
       for (let index_ = 0; index_ < bucket.assets.length; index_++) {

web/src/lib/utils.ts

@@ -13,101 +13,6 @@ import {
   type UserResponseDto,
 } from '@immich/sdk';
 
-interface DownloadRequestOptions<T = unknown> {
-  method?: 'GET' | 'POST' | 'PUT' | 'DELETE';
-  url: string;
-  data?: T;
-  signal?: AbortSignal;
-  onDownloadProgress?: (event: ProgressEvent<XMLHttpRequestEventTarget>) => void;
-}
-
-interface UploadRequestOptions {
-  url: string;
-  data: FormData;
-  onUploadProgress?: (event: ProgressEvent<XMLHttpRequestEventTarget>) => void;
-}
-
-class AbortError extends Error {
-  name = 'AbortError';
-}
-
-class ApiError extends Error {
-  name = 'ApiError';
-
-  constructor(
-    public message: string,
-    public statusCode: number,
-    public details: string,
-  ) {
-    super(message);
-  }
-}
-
-export const uploadRequest = async <T>(options: UploadRequestOptions): Promise<{ data: T; status: number }> => {
-  const { onUploadProgress: onProgress, data, url } = options;
-
-  return new Promise((resolve, reject) => {
-    const xhr = new XMLHttpRequest();
-
-    xhr.addEventListener('error', (error) => reject(error));
-    xhr.addEventListener('load', () => {
-      if (xhr.readyState === 4 && xhr.status >= 200 && xhr.status < 300) {
-        resolve({ data: xhr.response as T, status: xhr.status });
-      } else {
-        reject(new ApiError(xhr.statusText, xhr.status, xhr.response));
-      }
-    });
-
-    if (onProgress) {
-      xhr.addEventListener('progress', (event) => onProgress(event));
-    }
-
-    xhr.open('POST', url);
-    xhr.responseType = 'json';
-    xhr.send(data);
-  });
-};
-
-export const downloadRequest = <TBody = unknown>(options: DownloadRequestOptions<TBody> | string) => {
-  if (typeof options === 'string') {
-    options = { url: options };
-  }
-
-  const { signal, method, url, data: body, onDownloadProgress: onProgress } = options;
-
-  return new Promise<{ data: Blob; status: number }>((resolve, reject) => {
-    const xhr = new XMLHttpRequest();
-
-    xhr.addEventListener('error', (error) => reject(error));
-    xhr.addEventListener('abort', () => reject(new AbortError()));
-    xhr.addEventListener('load', () => {
-      if (xhr.readyState === 4 && xhr.status >= 200 && xhr.status < 300) {
-        resolve({ data: xhr.response as Blob, status: xhr.status });
-      } else {
-        reject(new ApiError(xhr.statusText, xhr.status, xhr.responseText));
-      }
-    });
-
-    if (onProgress) {
-      xhr.addEventListener('progress', (event) => onProgress(event));
-    }
-
-    if (signal) {
-      signal.addEventListener('abort', () => xhr.abort());
-    }
-
-    xhr.open(method || 'GET', url);
-    xhr.responseType = 'blob';
-
-    if (body) {
-      xhr.setRequestHeader('Content-Type', 'application/json');
-      xhr.send(JSON.stringify(body));
-    } else {
-      xhr.send();
-    }
-  });
-};
-
 export const getJobName = (jobName: JobName) => {
   const names: Record<JobName, string> = {
     [JobName.ThumbnailGeneration]: 'Generate Thumbnails',

web/src/lib/utils/asset-utils.ts

@@ -1,9 +1,8 @@
+import { api } from '$lib/api';
 import { notificationController, NotificationType } from '$lib/components/shared-components/notification/notification';
 import { downloadManager } from '$lib/stores/download';
-import { downloadRequest, getKey } from '$lib/utils';
 import {
   addAssetsToAlbum as addAssets,
-  defaults,
   getDownloadInfo,
   type AssetResponseDto,
   type AssetTypeEnum,
@@ -13,6 +12,7 @@ import {
   type UserResponseDto,
 } from '@immich/sdk';
 import { DateTime } from 'luxon';
+import { getKey } from '../utils';
 import { handleError } from './handle-error';
 
 export const addAssetsToAlbum = async (albumId: string, assetIds: Array<string>): Promise<BulkIdResponseDto[]> =>
@@ -61,7 +61,6 @@ export const downloadArchive = async (fileName: string, options: DownloadInfoDto
     const archive = downloadInfo.archives[index];
     const suffix = downloadInfo.archives.length === 1 ? '' : `+${index + 1}`;
     const archiveName = fileName.replace('.zip', `${suffix}-${DateTime.now().toFormat('yyyy-LL-dd-HH-mm-ss')}.zip`);
-    const key = getKey();
 
     let downloadKey = `${archiveName} `;
     if (downloadInfo.archives.length > 1) {
@@ -72,14 +71,14 @@ export const downloadArchive = async (fileName: string, options: DownloadInfoDto
     downloadManager.add(downloadKey, archive.size, abort);
 
     try {
-      // TODO use sdk once it supports progress events
-      const { data } = await downloadRequest({
-        method: 'POST',
-        url: defaults.baseUrl + '/download/archive' + (key ? `?key=${key}` : ''),
-        data: { assetIds: archive.assetIds },
-        signal: abort.signal,
-        onDownloadProgress: (event) => downloadManager.update(downloadKey, event.loaded),
-      });
+      const { data } = await api.downloadApi.downloadArchive(
+        { assetIdsDto: { assetIds: archive.assetIds }, key: getKey() },
+        {
+          responseType: 'blob',
+          signal: abort.signal,
+          onDownloadProgress: (event) => downloadManager.update(downloadKey, event.loaded),
+        },
+      );
 
       downloadBlob(data, archiveName);
     } catch (error) {
@@ -121,21 +120,25 @@ export const downloadFile = async (asset: AssetResponseDto) => {
     try {
       const abort = new AbortController();
       downloadManager.add(downloadKey, size, abort);
-      const key = getKey();
+
+      const { data } = await api.downloadApi.downloadFile(
+        { id, key: getKey() },
+        {
+          responseType: 'blob',
+          onDownloadProgress: ({ event }) => {
+            if (event.lengthComputable) {
+              downloadManager.update(downloadKey, event.loaded, event.total);
+            }
+          },
+          signal: abort.signal,
+        },
+      );
 
       notificationController.show({
         type: NotificationType.Info,
         message: `Downloading asset ${asset.originalFileName}`,
       });
 
-      // TODO use sdk once it supports progress events
-      const { data } = await downloadRequest({
-        method: 'POST',
-        url: defaults.baseUrl + `/download/asset/${id}` + (key ? `?key=${key}` : ''),
-        signal: abort.signal,
-        onDownloadProgress: (event) => downloadManager.update(downloadKey, event.loaded, event.total),
-      });
-
       downloadBlob(data, filename);
     } catch (error) {
       handleError(error, `Error downloading ${filename}`);

web/src/lib/utils/file-uploader.ts

@@ -1,9 +1,10 @@
+import { api } from '$lib/api';
 import { UploadState } from '$lib/models/upload-asset';
 import { uploadAssetsStore } from '$lib/stores/upload';
-import { getKey, uploadRequest } from '$lib/utils';
+import { getKey } from '$lib/utils';
 import { addAssetsToAlbum } from '$lib/utils/asset-utils';
 import { ExecutorQueue } from '$lib/utils/executor-queue';
-import { defaults, getSupportedMediaTypes, type AssetFileUploadResponseDto } from '@immich/sdk';
+import { getSupportedMediaTypes, type AssetFileUploadResponseDto } from '@immich/sdk';
 import { getServerErrorMessage, handleError } from './handle-error';
 
 let _extensions: string[];
@@ -71,28 +72,26 @@ async function fileUploader(asset: File, albumId: string | undefined = undefined
   const deviceAssetId = getDeviceAssetId(asset);
 
   return new Promise((resolve) => resolve(uploadAssetsStore.markStarted(deviceAssetId)))
-    .then(() => {
-      const formData = new FormData();
-      for (const [key, value] of Object.entries({
-        deviceAssetId,
-        deviceId: 'WEB',
-        fileCreatedAt,
-        fileModifiedAt: new Date(asset.lastModified).toISOString(),
-        isFavorite: 'false',
-        duration: '0:00:00.000000',
-        assetData: new File([asset], asset.name),
-      })) {
-        formData.append(key, value);
-      }
-
-      const key = getKey();
-
-      return uploadRequest<AssetFileUploadResponseDto>({
-        url: defaults.baseUrl + '/asset/upload' + (key ? `?key=${key}` : ''),
-        data: formData,
-        onUploadProgress: (event) => uploadAssetsStore.updateProgress(deviceAssetId, event.loaded, event.total),
-      });
-    })
+    .then(() =>
+      api.assetApi.uploadFile(
+        {
+          deviceAssetId,
+          deviceId: 'WEB',
+          fileCreatedAt,
+          fileModifiedAt: new Date(asset.lastModified).toISOString(),
+          isFavorite: false,
+          duration: '0:00:00.000000',
+          assetData: new File([asset], asset.name),
+          key: getKey(),
+        },
+        {
+          onUploadProgress: ({ event }) => {
+            const { loaded, total } = event;
+            uploadAssetsStore.updateProgress(deviceAssetId, loaded, total);
+          },
+        },
+      ),
+    )
     .then(async (response) => {
       if (response.status == 200 || response.status == 201) {
         const res: AssetFileUploadResponseDto = response.data;
@@ -119,9 +118,9 @@ async function fileUploader(asset: File, albumId: string | undefined = undefined
         return res.id;
       }
     })
-    .catch((error) => {
+    .catch(async (error) => {
       handleError(error, 'Unable to upload file');
-      const reason = getServerErrorMessage(error) || error;
+      const reason = (await getServerErrorMessage(error)) || error;
       uploadAssetsStore.updateAsset(deviceAssetId, { state: UploadState.ERROR, error: reason });
       return undefined;
     });

web/src/lib/utils/handle-error.ts

@@ -1,9 +1,24 @@
 import { isHttpError } from '@immich/sdk';
+import { isAxiosError } from 'axios';
 import { notificationController, NotificationType } from '../components/shared-components/notification/notification';
 
-export function getServerErrorMessage(error: unknown) {
+export async function getServerErrorMessage(error: unknown) {
   if (isHttpError(error)) {
-    return error.data?.message || error.message;
+    return error.data?.message || error.data;
+  }
+
+  if (isAxiosError(error)) {
+    let data = error.response?.data;
+    if (data instanceof Blob) {
+      const response = await data.text();
+      try {
+        data = JSON.parse(response);
+      } catch {
+        data = { message: response };
+      }
+    }
+
+    return data?.message;
   }
 }
 
@@ -14,17 +29,18 @@ export function handleError(error: unknown, message: string) {
 
   console.error(`[handleError]: ${message}`, error, (error as Error)?.stack);
 
-  try {
-    let serverMessage = getServerErrorMessage(error);
-    if (serverMessage) {
-      serverMessage = `${String(serverMessage).slice(0, 75)}\n(Immich Server Error)`;
-    }
+  getServerErrorMessage(error)
+    .then((serverMessage) => {
+      if (serverMessage) {
+        serverMessage = `${String(serverMessage).slice(0, 75)}\n(Immich Server Error)`;
+      }
 
-    notificationController.show({
-      message: serverMessage || message,
-      type: NotificationType.Error,
+      notificationController.show({
+        message: serverMessage || message,
+        type: NotificationType.Error,
+      });
+    })
+    .catch((error) => {
+      console.error(error);
     });
-  } catch (error) {
-    console.error(error);
-  }
 }

web/src/routes/(user)/albums/[albumId]/+page.svelte

@@ -30,6 +30,7 @@
     NotificationType,
     notificationController,
   } from '$lib/components/shared-components/notification/notification';
+  import UpdatePanel from '$lib/components/shared-components/update-panel.svelte';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
   import { AppRoute, dateFormats } from '$lib/constants';
   import { numberOfComments, setNumberOfComments, updateNumberOfComments } from '$lib/stores/activity.store';
@@ -717,6 +718,8 @@
   />
 {/if}
 
+<UpdatePanel {assetStore} />
+
 <style>
   ::placeholder {
     color: rgb(60, 60, 60);