add extension to tmp path

re-add extends section

.gitattributes

@@ -2,8 +2,6 @@ mobile/openapi/**/*.md -diff -merge
 mobile/openapi/**/*.md linguist-generated=true
 mobile/openapi/**/*.dart -diff -merge
 mobile/openapi/**/*.dart linguist-generated=true
-mobile/openapi/.openapi-generator/FILES -diff -merge
-mobile/openapi/.openapi-generator/FILES linguist-generated=true
 
 mobile/lib/**/*.g.dart -diff -merge
 mobile/lib/**/*.g.dart linguist-generated=true

.github/workflows/pr-require-conventional-commit.yml

@@ -0,0 +1,15 @@
+name: PR Conventional Commit Validation
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  validate-pr-title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Conventional Commit Validation
+        uses:  ytanikin/PRConventionalCommits@1.2.0
+        with:
+          task_types: '["feat","fix","docs","test","ci","refactor","perf","chore","revert"]'
+          add_label: 'false'

.github/workflows/test.yml

@@ -260,9 +260,18 @@ jobs:
     name: OpenAPI Clients
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install server dependencies
+        run: npm --prefix=server ci
+
+      - name: Build the app
+        run: npm --prefix=server run build
+
       - name: Run API generation
         run: make open-api
+
       - name: Find file changes
         uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files
@@ -270,6 +279,8 @@ jobs:
           files: |
             mobile/openapi
             open-api/typescript-sdk
+            open-api/immich-openapi-specs.json
+
       - name: Verify files have not changed
         if: steps.verify-changed-files.outputs.files_changed == 'true'
         run: |
@@ -332,7 +343,7 @@ jobs:
           exit 1
 
       - name: Run SQL generation
-        run: npm run sql:generate
+        run: npm run sync:sql
         env:
           DB_URL: postgres://postgres:postgres@localhost:5432/immich
 

.gitignore

@@ -14,7 +14,10 @@ mobile/gradle.properties
 mobile/openapi/pubspec.lock
 mobile/*.jks
 mobile/libisar.dylib
+mobile/openapi/test
+mobile/openapi/doc
+mobile/openapi/.openapi-generator/FILES
 
 open-api/typescript-sdk/build
 mobile/android/fastlane/report.xml
-mobile/ios/fastlane/report.xml
+mobile/ios/fastlane/report.xml

Makefile

@@ -37,7 +37,7 @@ open-api-typescript:
 	cd ./open-api && bash ./bin/generate-open-api.sh typescript
 
 sql:
-	npm --prefix server run sql:generate
+	npm --prefix server run sync:sql
 
 attach-server:
 	docker exec -it docker_immich-server_1 sh

cli/src/commands/auth.ts

@@ -1,4 +1,4 @@
-import { getMyUserInfo } from '@immich/sdk';
+import { getMyUser } from '@immich/sdk';
 import { existsSync } from 'node:fs';
 import { mkdir, unlink } from 'node:fs/promises';
 import { BaseOptions, connect, getAuthFilePath, logError, withError, writeAuthFile } from 'src/utils';
@@ -10,13 +10,13 @@ export const login = async (url: string, key: string, options: BaseOptions) => {
 
   await connect(url, key);
 
-  const [error, userInfo] = await withError(getMyUserInfo());
+  const [error, user] = await withError(getMyUser());
   if (error) {
     logError(error, 'Failed to load user info');
     process.exit(1);
   }
 
-  console.log(`Logged in as ${userInfo.email}`);
+  console.log(`Logged in as ${user.email}`);
 
   if (!existsSync(configDir)) {
     // Create config folder if it doesn't exist

cli/src/commands/server-info.ts

@@ -1,4 +1,4 @@
-import { getAssetStatistics, getMyUserInfo, getServerVersion, getSupportedMediaTypes } from '@immich/sdk';
+import { getAssetStatistics, getMyUser, getServerVersion, getSupportedMediaTypes } from '@immich/sdk';
 import { BaseOptions, authenticate } from 'src/utils';
 
 export const serverInfo = async (options: BaseOptions) => {
@@ -8,7 +8,7 @@ export const serverInfo = async (options: BaseOptions) => {
     getServerVersion(),
     getSupportedMediaTypes(),
     getAssetStatistics({}),
-    getMyUserInfo(),
+    getMyUser(),
   ]);
 
   console.log(`Server Info (via ${userInfo.email})`);

cli/src/utils.ts

@@ -1,4 +1,4 @@
-import { getMyUserInfo, init, isHttpError } from '@immich/sdk';
+import { getMyUser, init, isHttpError } from '@immich/sdk';
 import { glob } from 'fast-glob';
 import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
@@ -48,7 +48,7 @@ export const connect = async (url: string, key: string) => {
 
   init({ baseUrl: url, apiKey: key });
 
-  const [error] = await withError(getMyUserInfo());
+  const [error] = await withError(getMyUser());
   if (isHttpError(error)) {
     logError(error, 'Failed to connect to server');
     process.exit(1);

docker/docker-compose.dev.yml

@@ -9,6 +9,9 @@ services:
     container_name: immich_server
     command: ['/usr/src/app/bin/immich-dev']
     image: immich-server-dev:latest
+    # extends:
+    #   file: hwaccel.transcoding.yml
+    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     build:
       context: ../
       dockerfile: server/Dockerfile
@@ -81,7 +84,9 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:c0634a08e74a4bb576d02d1ee993dc05dba10e8b7b9492dfa28a7af100d46c01
+    image: redis:6.2-alpine@sha256:e31ca60b18f7e9b78b573d156702471d4eda038803c0b8e6f01559f350031e93
+    healthcheck:
+      test: redis-cli ping || exit 1
 
   database:
     container_name: immich_postgres
@@ -97,6 +102,11 @@ services:
       - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
     ports:
       - 5432:5432
+    healthcheck:
+      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT SUM(checksum_failures) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
+      interval: 5m
+      start_interval: 30s
+      start_period: 5m
     command: ["postgres", "-c" ,"shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
 
   # set IMMICH_METRICS=true in .env to enable metrics

docker/docker-compose.prod.yml

@@ -4,6 +4,9 @@ services:
   immich-server:
     container_name: immich_server
     image: immich-server:latest
+    # extends:
+    #   file: hwaccel.transcoding.yml
+    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     build:
       context: ../
       dockerfile: server/Dockerfile
@@ -12,12 +15,12 @@ services:
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
-    restart: always
     ports:
       - 2283:3001
     depends_on:
       - redis
       - database
+    restart: always
 
   immich-machine-learning:
     container_name: immich_machine_learning
@@ -38,7 +41,9 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:c0634a08e74a4bb576d02d1ee993dc05dba10e8b7b9492dfa28a7af100d46c01
+    image: redis:6.2-alpine@sha256:e31ca60b18f7e9b78b573d156702471d4eda038803c0b8e6f01559f350031e93
+    healthcheck:
+      test: redis-cli ping || exit 1
     restart: always
 
   database:
@@ -55,7 +60,13 @@ services:
       - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
     ports:
       - 5432:5432
+    healthcheck:
+      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT SUM(checksum_failures) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
+      interval: 5m
+      start_interval: 30s
+      start_period: 5m
     command: ["postgres", "-c" ,"shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
+    restart: always
 
   # set IMMICH_METRICS=true in .env to enable metrics
   immich-prometheus:

docker/docker-compose.yml

@@ -12,6 +12,9 @@ services:
   immich-server:
     container_name: immich_server
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
+    # extends:
+    #   file: hwaccel.transcoding.yml
+    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
@@ -40,7 +43,9 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/redis:6.2-alpine@sha256:c0634a08e74a4bb576d02d1ee993dc05dba10e8b7b9492dfa28a7af100d46c01
+    image: docker.io/redis:6.2-alpine@sha256:e31ca60b18f7e9b78b573d156702471d4eda038803c0b8e6f01559f350031e93
+    healthcheck:
+      test: redis-cli ping || exit 1
     restart: always
 
   database:
@@ -53,8 +58,13 @@ services:
       POSTGRES_INITDB_ARGS: '--data-checksums'
     volumes:
       - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
-    restart: always
+    healthcheck:
+      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT SUM(checksum_failures) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
+      interval: 5m
+      start_interval: 30s
+      start_period: 5m
     command: ["postgres", "-c" ,"shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
+    restart: always
 
 volumes:
   model-cache:

docs/docs/administration/oauth.md

@@ -110,8 +110,44 @@ Immich has a route (`/api/oauth/mobile-redirect`) that is already configured to
 
 ## Example Configuration
 
+<details>
+<summary>Authentik Example</summary>
+
+### Authentik Example
+
 Here's an example of OAuth configured for Authentik:
 
-![OAuth Settings](./img/oauth-settings.png)
+<img src={require('./img/oauth-settings.png').default} title="OAuth settings" />
+
+</details>
+
+<details>
+<summary>Google Example</summary>
+
+### Google Example
+
+Configuration of Authorised redirect URIs (Google Console)
+
+<img src={require('./img/google-example.webp').default} width='50%' title="Authorised redirect URIs" />
+
+Configuration of OAuth in System Settings
+
+| Setting                      | Value                                                                                                  |
+| ---------------------------- | ------------------------------------------------------------------------------------------------------ |
+| Issuer URL                   | [https://accounts.google.com](https://accounts.google.com)                                             |
+| Client ID                    | 7\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***vuls.apps.googleusercontent.com                           |
+| Client Secret                | G\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***OO                                                        |
+| Scope                        | openid email profile                                                                                   |
+| Signing Algorithm            | RS256                                                                                                  |
+| Storage Label Claim          | preferred_username                                                                                     |
+| Storage Quota Claim          | immich_quota                                                                                           |
+| Default Storage Quota (GiB)  | 0 (0 for unlimited quota)                                                                              |
+| Button Text                  | Sign in with Google (optional)                                                                         |
+| Auto Register                | Enabled (optional)                                                                                     |
+| Auto Launch                  | Enabled                                                                                                |
+| Mobile Redirect URI Override | Enabled (required)                                                                                     |
+| Mobile Redirect URI          | [https://demo.immich.app/api/oauth/mobile-redirect](https://demo.immich.app/api/oauth/mobile-redirect) |
+
+</details>
 
 [oidc]: https://openid.net/connect/

docs/docs/guides/remote-machine-learning.md

@@ -15,7 +15,7 @@ The [hwaccel.ml.yml](https://github.com/immich-app/immich/releases/latest/downlo
 :::
 
 ```yaml
-version: '3.8'
+name: immich_remote_ml
 
 services:
   immich-machine-learning:

docs/docs/install/config-file.md

@@ -157,9 +157,6 @@ The default configuration looks like this:
   "server": {
     "externalDomain": "",
     "loginPageMessage": ""
-  },
-  "user": {
-    "deleteDelay": 7
   }
 }
 ```

e2e/docker-compose.yml

@@ -27,7 +27,7 @@ services:
       - 2283:3001
 
   redis:
-    image: redis:6.2-alpine@sha256:c0634a08e74a4bb576d02d1ee993dc05dba10e8b7b9492dfa28a7af100d46c01
+    image: redis:6.2-alpine@sha256:e31ca60b18f7e9b78b573d156702471d4eda038803c0b8e6f01559f350031e93
 
   database:
     image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0

e2e/package-lock.json

@@ -11,7 +11,7 @@
       "devDependencies": {
         "@immich/cli": "file:../cli",
         "@immich/sdk": "file:../open-api/typescript-sdk",
-        "@playwright/test": "^1.41.2",
+        "@playwright/test": "^1.44.1",
         "@types/luxon": "^3.4.2",
         "@types/node": "^20.11.17",
         "@types/pg": "^8.11.0",
@@ -88,7 +88,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^20.12.12",
+        "@types/node": "^20.11.0",
         "typescript": "^5.3.3"
       }
     },
@@ -971,12 +971,12 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.0.tgz",
-      "integrity": "sha512-rNX5lbNidamSUorBhB4XZ9SQTjAqfe5M+p37Z8ic0jPFBMo5iCtQz1kRWkEMg+rYOKSlVycpQmpqjSFq7LXOfg==",
+      "version": "1.44.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.1.tgz",
+      "integrity": "sha512-1hZ4TNvD5z9VuhNJ/walIjvMVvYkZKf71axoF/uiAqpntQJXpG64dlXhoDXE3OczPuTuvjf/M5KWFg5VAVUS3Q==",
       "dev": true,
       "dependencies": {
-        "playwright": "1.44.0"
+        "playwright": "1.44.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4252,12 +4252,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.0.tgz",
-      "integrity": "sha512-F9b3GUCLQ3Nffrfb6dunPOkE5Mh68tR7zN32L4jCk4FjQamgesGay7/dAAe1WaMEGV04DkdJfcJzjoCKygUaRQ==",
+      "version": "1.44.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.1.tgz",
+      "integrity": "sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==",
       "dev": true,
       "dependencies": {
-        "playwright-core": "1.44.0"
+        "playwright-core": "1.44.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4270,9 +4270,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.0.tgz",
-      "integrity": "sha512-ZTbkNpFfYcGWohvTTl+xewITm7EOuqIqex0c7dNZ+aXsbrLj0qI8XlGKfPpipjm0Wny/4Lt4CJsWJk1stVS5qQ==",
+      "version": "1.44.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.1.tgz",
+      "integrity": "sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==",
       "dev": true,
       "bin": {
         "playwright-core": "cli.js"

e2e/package.json

@@ -21,7 +21,7 @@
   "devDependencies": {
     "@immich/cli": "file:../cli",
     "@immich/sdk": "file:../open-api/typescript-sdk",
-    "@playwright/test": "^1.41.2",
+    "@playwright/test": "^1.44.1",
     "@types/luxon": "^3.4.2",
     "@types/node": "^20.11.17",
     "@types/pg": "^8.11.0",

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

@@ -14,7 +14,7 @@ import { app, asBearerAuth, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
-describe('/activity', () => {
+describe('/activities', () => {
   let admin: LoginResponseDto;
   let nonOwner: LoginResponseDto;
   let asset: AssetFileUploadResponseDto;
@@ -45,22 +45,24 @@ describe('/activity', () => {
     await utils.resetDatabase(['activity']);
   });
 
-  describe('GET /activity', () => {
+  describe('GET /activities', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/activity');
+      const { status, body } = await request(app).get('/activities');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should require an albumId', async () => {
-      const { status, body } = await request(app).get('/activity').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/activities')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(400);
       expect(body).toEqual(errorDto.badRequest(expect.arrayContaining(['albumId must be a UUID'])));
     });
 
     it('should reject an invalid albumId', async () => {
       const { status, body } = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: uuidDto.invalid })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(400);
@@ -69,7 +71,7 @@ describe('/activity', () => {
 
     it('should reject an invalid assetId', async () => {
       const { status, body } = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: uuidDto.notFound, assetId: uuidDto.invalid })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(400);
@@ -78,7 +80,7 @@ describe('/activity', () => {
 
     it('should start off empty', async () => {
       const { status, body } = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: album.id })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(body).toEqual([]);
@@ -102,7 +104,7 @@ describe('/activity', () => {
       ]);
 
       const { status, body } = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: album.id })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
@@ -121,7 +123,7 @@ describe('/activity', () => {
       ]);
 
       const { status, body } = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: album.id, type: 'comment' })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
@@ -140,7 +142,7 @@ describe('/activity', () => {
       ]);
 
       const { status, body } = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: album.id, type: 'like' })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
@@ -152,7 +154,7 @@ describe('/activity', () => {
       const reaction = await createActivity({ albumId: album.id, type: ReactionType.Like });
 
       const response1 = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: album.id, userId: uuidDto.notFound })
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
@@ -160,7 +162,7 @@ describe('/activity', () => {
       expect(response1.body.length).toBe(0);
 
       const response2 = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: album.id, userId: admin.userId })
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
@@ -180,7 +182,7 @@ describe('/activity', () => {
       ]);
 
       const { status, body } = await request(app)
-        .get('/activity')
+        .get('/activities')
         .query({ albumId: album.id, assetId: asset.id })
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
@@ -189,16 +191,16 @@ describe('/activity', () => {
     });
   });
 
-  describe('POST /activity', () => {
+  describe('POST /activities', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/activity');
+      const { status, body } = await request(app).post('/activities');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should require an albumId', async () => {
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: uuidDto.invalid });
       expect(status).toEqual(400);
@@ -207,7 +209,7 @@ describe('/activity', () => {
 
     it('should require a comment when type is comment', async () => {
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: uuidDto.notFound, type: 'comment', comment: null });
       expect(status).toEqual(400);
@@ -216,7 +218,7 @@ describe('/activity', () => {
 
     it('should add a comment to an album', async () => {
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           albumId: album.id,
@@ -236,7 +238,7 @@ describe('/activity', () => {
 
     it('should add a like to an album', async () => {
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: album.id, type: 'like' });
       expect(status).toEqual(201);
@@ -253,7 +255,7 @@ describe('/activity', () => {
     it('should return a 200 for a duplicate like on the album', async () => {
       const reaction = await createActivity({ albumId: album.id, type: ReactionType.Like });
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: album.id, type: 'like' });
       expect(status).toEqual(200);
@@ -267,7 +269,7 @@ describe('/activity', () => {
         type: ReactionType.Like,
       });
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: album.id, type: 'like' });
       expect(status).toEqual(201);
@@ -276,7 +278,7 @@ describe('/activity', () => {
 
     it('should add a comment to an asset', async () => {
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           albumId: album.id,
@@ -297,7 +299,7 @@ describe('/activity', () => {
 
     it('should add a like to an asset', async () => {
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: album.id, assetId: asset.id, type: 'like' });
       expect(status).toEqual(201);
@@ -319,7 +321,7 @@ describe('/activity', () => {
       });
 
       const { status, body } = await request(app)
-        .post('/activity')
+        .post('/activities')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ albumId: album.id, assetId: asset.id, type: 'like' });
       expect(status).toEqual(200);
@@ -327,16 +329,16 @@ describe('/activity', () => {
     });
   });
 
-  describe('DELETE /activity/:id', () => {
+  describe('DELETE /activities/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/activity/${uuidDto.notFound}`);
+      const { status, body } = await request(app).delete(`/activities/${uuidDto.notFound}`);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should require a valid uuid', async () => {
       const { status, body } = await request(app)
-        .delete(`/activity/${uuidDto.invalid}`)
+        .delete(`/activities/${uuidDto.invalid}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
@@ -349,7 +351,7 @@ describe('/activity', () => {
         comment: 'This is a test comment',
       });
       const { status } = await request(app)
-        .delete(`/activity/${reaction.id}`)
+        .delete(`/activities/${reaction.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(204);
     });
@@ -360,7 +362,7 @@ describe('/activity', () => {
         type: ReactionType.Like,
       });
       const { status } = await request(app)
-        .delete(`/activity/${reaction.id}`)
+        .delete(`/activities/${reaction.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(204);
     });
@@ -373,7 +375,7 @@ describe('/activity', () => {
       });
 
       const { status } = await request(app)
-        .delete(`/activity/${reaction.id}`)
+        .delete(`/activities/${reaction.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toEqual(204);
@@ -387,7 +389,7 @@ describe('/activity', () => {
       });
 
       const { status, body } = await request(app)
-        .delete(`/activity/${reaction.id}`)
+        .delete(`/activities/${reaction.id}`)
         .set('Authorization', `Bearer ${nonOwner.accessToken}`);
 
       expect(status).toBe(400);
@@ -405,7 +407,7 @@ describe('/activity', () => {
       );
 
       const { status } = await request(app)
-        .delete(`/activity/${reaction.id}`)
+        .delete(`/activities/${reaction.id}`)
         .set('Authorization', `Bearer ${nonOwner.accessToken}`);
 
       expect(status).toBe(204);

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

@@ -4,7 +4,7 @@ import {
   AlbumUserRole,
   AssetFileUploadResponseDto,
   AssetOrder,
-  deleteUser,
+  deleteUserAdmin,
   getAlbumInfo,
   LoginResponseDto,
   SharedLinkType,
@@ -23,7 +23,7 @@ const user2SharedUser = 'user2SharedUser';
 const user2SharedLink = 'user2SharedLink';
 const user2NotShared = 'user2NotShared';
 
-describe('/album', () => {
+describe('/albums', () => {
   let admin: LoginResponseDto;
   let user1: LoginResponseDto;
   let user1Asset1: AssetFileUploadResponseDto;
@@ -107,19 +107,19 @@ describe('/album', () => {
       }),
     ]);
 
-    await deleteUser({ id: user3.userId, deleteUserDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
   });
 
-  describe('GET /album', () => {
+  describe('GET /albums', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/album');
+      const { status, body } = await request(app).get('/albums');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should reject an invalid shared param', async () => {
       const { status, body } = await request(app)
-        .get('/album?shared=invalid')
+        .get('/albums?shared=invalid')
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toEqual(400);
       expect(body).toEqual(errorDto.badRequest(['shared must be a boolean value']));
@@ -127,7 +127,7 @@ describe('/album', () => {
 
     it('should reject an invalid assetId param', async () => {
       const { status, body } = await request(app)
-        .get('/album?assetId=invalid')
+        .get('/albums?assetId=invalid')
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toEqual(400);
       expect(body).toEqual(errorDto.badRequest(['assetId must be a UUID']));
@@ -135,7 +135,7 @@ describe('/album', () => {
 
     it("should not show other users' favorites", async () => {
       const { status, body } = await request(app)
-        .get(`/album/${user1Albums[0].id}?withoutAssets=false`)
+        .get(`/albums/${user1Albums[0].id}?withoutAssets=false`)
         .set('Authorization', `Bearer ${user2.accessToken}`);
       expect(status).toEqual(200);
       expect(body).toEqual({
@@ -146,7 +146,7 @@ describe('/album', () => {
 
     it('should not return shared albums with a deleted owner', async () => {
       const { status, body } = await request(app)
-        .get('/album?shared=true')
+        .get('/albums?shared=true')
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -178,7 +178,7 @@ 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('/albums').set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(4);
       expect(body).toEqual(
@@ -209,7 +209,7 @@ describe('/album', () => {
 
     it('should return the album collection filtered by shared', async () => {
       const { status, body } = await request(app)
-        .get('/album?shared=true')
+        .get('/albums?shared=true')
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(4);
@@ -241,7 +241,7 @@ describe('/album', () => {
 
     it('should return the album collection filtered by NOT shared', async () => {
       const { status, body } = await request(app)
-        .get('/album?shared=false')
+        .get('/albums?shared=false')
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(1);
@@ -258,7 +258,7 @@ describe('/album', () => {
 
     it('should return the album collection filtered by assetId', async () => {
       const { status, body } = await request(app)
-        .get(`/album?assetId=${user1Asset2.id}`)
+        .get(`/albums?assetId=${user1Asset2.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(1);
@@ -266,7 +266,7 @@ describe('/album', () => {
 
     it('should return the album collection filtered by assetId and ignores shared=true', async () => {
       const { status, body } = await request(app)
-        .get(`/album?shared=true&assetId=${user1Asset1.id}`)
+        .get(`/albums?shared=true&assetId=${user1Asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(5);
@@ -274,23 +274,23 @@ describe('/album', () => {
 
     it('should return the album collection filtered by assetId and ignores shared=false', async () => {
       const { status, body } = await request(app)
-        .get(`/album?shared=false&assetId=${user1Asset1.id}`)
+        .get(`/albums?shared=false&assetId=${user1Asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
       expect(body).toHaveLength(5);
     });
   });
 
-  describe('GET /album/:id', () => {
+  describe('GET /albums/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/album/${user1Albums[0].id}`);
+      const { status, body } = await request(app).get(`/albums/${user1Albums[0].id}`);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should return album info for own album', async () => {
       const { status, body } = await request(app)
-        .get(`/album/${user1Albums[0].id}?withoutAssets=false`)
+        .get(`/albums/${user1Albums[0].id}?withoutAssets=false`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -302,7 +302,7 @@ describe('/album', () => {
 
     it('should return album info for shared album (editor)', async () => {
       const { status, body } = await request(app)
-        .get(`/album/${user2Albums[0].id}?withoutAssets=false`)
+        .get(`/albums/${user2Albums[0].id}?withoutAssets=false`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -311,7 +311,7 @@ describe('/album', () => {
 
     it('should return album info for shared album (viewer)', async () => {
       const { status, body } = await request(app)
-        .get(`/album/${user1Albums[3].id}?withoutAssets=false`)
+        .get(`/albums/${user1Albums[3].id}?withoutAssets=false`)
         .set('Authorization', `Bearer ${user2.accessToken}`);
 
       expect(status).toBe(200);
@@ -320,7 +320,7 @@ describe('/album', () => {
 
     it('should return album info with assets when withoutAssets is undefined', async () => {
       const { status, body } = await request(app)
-        .get(`/album/${user1Albums[0].id}`)
+        .get(`/albums/${user1Albums[0].id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -332,7 +332,7 @@ describe('/album', () => {
 
     it('should return album info without assets when withoutAssets is true', async () => {
       const { status, body } = await request(app)
-        .get(`/album/${user1Albums[0].id}?withoutAssets=true`)
+        .get(`/albums/${user1Albums[0].id}?withoutAssets=true`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -344,16 +344,16 @@ describe('/album', () => {
     });
   });
 
-  describe('GET /album/count', () => {
+  describe('GET /albums/count', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/album/count');
+      const { status, body } = await request(app).get('/albums/count');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should return total count of albums the user has access to', async () => {
       const { status, body } = await request(app)
-        .get('/album/count')
+        .get('/albums/count')
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -361,16 +361,16 @@ describe('/album', () => {
     });
   });
 
-  describe('POST /album', () => {
+  describe('POST /albums', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/album').send({ albumName: 'New album' });
+      const { status, body } = await request(app).post('/albums').send({ albumName: 'New album' });
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should create an album', async () => {
       const { status, body } = await request(app)
-        .post('/album')
+        .post('/albums')
         .send({ albumName: 'New album' })
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(201);
@@ -383,7 +383,6 @@ describe('/album', () => {
         description: '',
         albumThumbnailAssetId: null,
         shared: false,
-        sharedUsers: [],
         albumUsers: [],
         hasSharedLink: false,
         assets: [],
@@ -395,9 +394,9 @@ describe('/album', () => {
     });
   });
 
-  describe('PUT /album/:id/assets', () => {
+  describe('PUT /albums/: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(`/albums/${user1Albums[0].id}/assets`);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -405,7 +404,7 @@ describe('/album', () => {
     it('should be able to add own asset to own album', async () => {
       const asset = await utils.createAsset(user1.accessToken);
       const { status, body } = await request(app)
-        .put(`/album/${user1Albums[0].id}/assets`)
+        .put(`/albums/${user1Albums[0].id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ ids: [asset.id] });
 
@@ -416,7 +415,7 @@ describe('/album', () => {
     it('should be able to add own asset to shared album', async () => {
       const asset = await utils.createAsset(user1.accessToken);
       const { status, body } = await request(app)
-        .put(`/album/${user2Albums[0].id}/assets`)
+        .put(`/albums/${user2Albums[0].id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ ids: [asset.id] });
 
@@ -427,7 +426,7 @@ describe('/album', () => {
     it('should not be able to add assets to album as a viewer', async () => {
       const asset = await utils.createAsset(user2.accessToken);
       const { status, body } = await request(app)
-        .put(`/album/${user1Albums[3].id}/assets`)
+        .put(`/albums/${user1Albums[3].id}/assets`)
         .set('Authorization', `Bearer ${user2.accessToken}`)
         .send({ ids: [asset.id] });
 
@@ -438,7 +437,7 @@ describe('/album', () => {
     it('should add duplicate assets only once', async () => {
       const asset = await utils.createAsset(user1.accessToken);
       const { status, body } = await request(app)
-        .put(`/album/${user1Albums[0].id}/assets`)
+        .put(`/albums/${user1Albums[0].id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ ids: [asset.id, asset.id] });
 
@@ -450,10 +449,10 @@ describe('/album', () => {
     });
   });
 
-  describe('PATCH /album/:id', () => {
+  describe('PATCH /albums/:id', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app)
-        .patch(`/album/${uuidDto.notFound}`)
+        .patch(`/albums/${uuidDto.notFound}`)
         .send({ albumName: 'New album name' });
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -464,7 +463,7 @@ describe('/album', () => {
         albumName: 'New album',
       });
       const { status, body } = await request(app)
-        .patch(`/album/${album.id}`)
+        .patch(`/albums/${album.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({
           albumName: 'New album name',
@@ -481,7 +480,7 @@ describe('/album', () => {
 
     it('should not be able to update as a viewer', async () => {
       const { status, body } = await request(app)
-        .patch(`/album/${user1Albums[3].id}`)
+        .patch(`/albums/${user1Albums[3].id}`)
         .set('Authorization', `Bearer ${user2.accessToken}`)
         .send({ albumName: 'New album name' });
 
@@ -491,7 +490,7 @@ describe('/album', () => {
 
     it('should not be able to update as an editor', async () => {
       const { status, body } = await request(app)
-        .patch(`/album/${user1Albums[0].id}`)
+        .patch(`/albums/${user1Albums[0].id}`)
         .set('Authorization', `Bearer ${user2.accessToken}`)
         .send({ albumName: 'New album name' });
 
@@ -500,10 +499,10 @@ describe('/album', () => {
     });
   });
 
-  describe('DELETE /album/:id/assets', () => {
+  describe('DELETE /albums/:id/assets', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app)
-        .delete(`/album/${user1Albums[0].id}/assets`)
+        .delete(`/albums/${user1Albums[0].id}/assets`)
         .send({ ids: [user1Asset1.id] });
 
       expect(status).toBe(401);
@@ -512,7 +511,7 @@ describe('/album', () => {
 
     it('should not be able to remove foreign asset from own album', async () => {
       const { status, body } = await request(app)
-        .delete(`/album/${user2Albums[0].id}/assets`)
+        .delete(`/albums/${user2Albums[0].id}/assets`)
         .set('Authorization', `Bearer ${user2.accessToken}`)
         .send({ ids: [user1Asset1.id] });
 
@@ -528,7 +527,7 @@ describe('/album', () => {
 
     it('should not be able to remove foreign asset from foreign album', async () => {
       const { status, body } = await request(app)
-        .delete(`/album/${user1Albums[0].id}/assets`)
+        .delete(`/albums/${user1Albums[0].id}/assets`)
         .set('Authorization', `Bearer ${user2.accessToken}`)
         .send({ ids: [user1Asset1.id] });
 
@@ -544,7 +543,7 @@ describe('/album', () => {
 
     it('should be able to remove own asset from own album', async () => {
       const { status, body } = await request(app)
-        .delete(`/album/${user1Albums[0].id}/assets`)
+        .delete(`/albums/${user1Albums[0].id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ ids: [user1Asset1.id] });
 
@@ -554,7 +553,7 @@ describe('/album', () => {
 
     it('should be able to remove own asset from shared album', async () => {
       const { status, body } = await request(app)
-        .delete(`/album/${user2Albums[0].id}/assets`)
+        .delete(`/albums/${user2Albums[0].id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ ids: [user1Asset1.id] });
 
@@ -564,7 +563,7 @@ describe('/album', () => {
 
     it('should not be able to remove assets from album as a viewer', async () => {
       const { status, body } = await request(app)
-        .delete(`/album/${user1Albums[3].id}/assets`)
+        .delete(`/albums/${user1Albums[3].id}/assets`)
         .set('Authorization', `Bearer ${user2.accessToken}`)
         .send({ ids: [user1Asset1.id] });
 
@@ -574,7 +573,7 @@ describe('/album', () => {
 
     it('should remove duplicate assets only once', async () => {
       const { status, body } = await request(app)
-        .delete(`/album/${user1Albums[1].id}/assets`)
+        .delete(`/albums/${user1Albums[1].id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ ids: [user1Asset1.id, user1Asset1.id] });
 
@@ -596,7 +595,7 @@ 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(`/albums/${user1Albums[0].id}/users`).send({ sharedUserIds: [] });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -604,21 +603,25 @@ describe('/album', () => {
 
     it('should be able to add user to own album', async () => {
       const { status, body } = await request(app)
-        .put(`/album/${album.id}/users`)
+        .put(`/albums/${album.id}/users`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Editor }] });
 
       expect(status).toBe(200);
       expect(body).toEqual(
         expect.objectContaining({
-          sharedUsers: [expect.objectContaining({ id: user2.userId })],
+          albumUsers: [
+            expect.objectContaining({
+              user: expect.objectContaining({ id: user2.userId }),
+            }),
+          ],
         }),
       );
     });
 
     it('should not be able to share album with owner', async () => {
       const { status, body } = await request(app)
-        .put(`/album/${album.id}/users`)
+        .put(`/albums/${album.id}/users`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ albumUsers: [{ userId: user1.userId, role: AlbumUserRole.Editor }] });
 
@@ -628,12 +631,12 @@ describe('/album', () => {
 
     it('should not be able to add existing user to shared album', async () => {
       await request(app)
-        .put(`/album/${album.id}/users`)
+        .put(`/albums/${album.id}/users`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Editor }] });
 
       const { status, body } = await request(app)
-        .put(`/album/${album.id}/users`)
+        .put(`/albums/${album.id}/users`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ albumUsers: [{ userId: user2.userId, role: AlbumUserRole.Editor }] });
 
@@ -652,14 +655,16 @@ describe('/album', () => {
       expect(album.albumUsers[0].role).toEqual(AlbumUserRole.Viewer);
 
       const { status } = await request(app)
-        .put(`/album/${album.id}/user/${user2.userId}`)
+        .put(`/albums/${album.id}/user/${user2.userId}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ role: AlbumUserRole.Editor });
 
       expect(status).toBe(200);
 
       // Get album to verify the role change
-      const { body } = await request(app).get(`/album/${album.id}`).set('Authorization', `Bearer ${user1.accessToken}`);
+      const { body } = await request(app)
+        .get(`/albums/${album.id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(body).toEqual(
         expect.objectContaining({
           albumUsers: [expect.objectContaining({ role: AlbumUserRole.Editor })],
@@ -676,7 +681,7 @@ describe('/album', () => {
       expect(album.albumUsers[0].role).toEqual(AlbumUserRole.Viewer);
 
       const { status, body } = await request(app)
-        .put(`/album/${album.id}/user/${user2.userId}`)
+        .put(`/albums/${album.id}/user/${user2.userId}`)
         .set('Authorization', `Bearer ${user2.accessToken}`)
         .send({ role: AlbumUserRole.Editor });
 

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

@@ -5,6 +5,7 @@ import {
   LoginResponseDto,
   SharedLinkType,
   getAssetInfo,
+  getMyUser,
   updateAssets,
 } from '@immich/sdk';
 import { exiftool } from 'exiftool-vendored';
@@ -71,7 +72,7 @@ describe('/asset', () => {
   let stackAssets: AssetFileUploadResponseDto[];
   let locationAsset: AssetFileUploadResponseDto;
 
-  beforeAll(async () => {
+  const setupTests = async () => {
     await utils.resetDatabase();
     admin = await utils.adminSetup({ onboarding: false });
 
@@ -85,6 +86,8 @@ describe('/asset', () => {
       utils.userSetup(admin.accessToken, createUserDto.create('stack')),
     ]);
 
+    await utils.createPartner(user1.accessToken, user2.userId);
+
     // asset location
     locationAsset = await utils.createAsset(admin.accessToken, {
       assetData: {
@@ -154,7 +157,8 @@ describe('/asset', () => {
       assetId: user1Assets[0].id,
       personId: person1.id,
     });
-  }, 30_000);
+  };
+  beforeAll(setupTests, 30_000);
 
   afterAll(() => {
     utils.disconnectWebsocket(websocket);
@@ -231,6 +235,35 @@ describe('/asset', () => {
       expect(data.status).toBe(200);
       expect(data.body).toMatchObject({ people: [] });
     });
+
+    describe('partner assets', () => {
+      it('should get the asset info', async () => {
+        const { status, body } = await request(app)
+          .get(`/asset/${user1Assets[0].id}`)
+          .set('Authorization', `Bearer ${user2.accessToken}`);
+        expect(status).toBe(200);
+        expect(body).toMatchObject({ id: user1Assets[0].id });
+      });
+
+      it('disallows viewing archived assets', async () => {
+        const asset = await utils.createAsset(user1.accessToken, { isArchived: true });
+
+        const { status } = await request(app)
+          .get(`/asset/${asset.id}`)
+          .set('Authorization', `Bearer ${user2.accessToken}`);
+        expect(status).toBe(400);
+      });
+
+      it('disallows viewing trashed assets', async () => {
+        const asset = await utils.createAsset(user1.accessToken);
+        await utils.deleteAssets(user1.accessToken, [asset.id]);
+
+        const { status } = await request(app)
+          .get(`/asset/${asset.id}`)
+          .set('Authorization', `Bearer ${user2.accessToken}`);
+        expect(status).toBe(400);
+      });
+    });
   });
 
   describe('GET /asset/statistics', () => {
@@ -538,14 +571,321 @@ describe('/asset', () => {
     });
   });
 
+  describe('GET /asset/thumbnail/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get(`/asset/thumbnail/${locationAsset.id}`);
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should not include gps data for webp thumbnails', async () => {
+      await utils.waitForWebsocketEvent({
+        event: 'assetUpload',
+        id: locationAsset.id,
+      });
+
+      const { status, body, type } = await request(app)
+        .get(`/asset/thumbnail/${locationAsset.id}?format=WEBP`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toBeDefined();
+      expect(type).toBe('image/webp');
+
+      const exifData = await readTags(body, 'thumbnail.webp');
+      expect(exifData).not.toHaveProperty('GPSLongitude');
+      expect(exifData).not.toHaveProperty('GPSLatitude');
+    });
+
+    it('should not include gps data for jpeg thumbnails', async () => {
+      const { status, body, type } = await request(app)
+        .get(`/asset/thumbnail/${locationAsset.id}?format=JPEG`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toBeDefined();
+      expect(type).toBe('image/jpeg');
+
+      const exifData = await readTags(body, 'thumbnail.jpg');
+      expect(exifData).not.toHaveProperty('GPSLongitude');
+      expect(exifData).not.toHaveProperty('GPSLatitude');
+    });
+  });
+
+  describe('GET /asset/file/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get(`/asset/thumbnail/${locationAsset.id}`);
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should download the original', async () => {
+      const { status, body, type } = await request(app)
+        .get(`/asset/file/${locationAsset.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toBeDefined();
+      expect(type).toBe('image/jpeg');
+
+      const asset = await utils.getAssetInfo(admin.accessToken, locationAsset.id);
+
+      const original = await readFile(locationAssetFilepath);
+      const originalChecksum = utils.sha1(original);
+      const downloadChecksum = utils.sha1(body);
+
+      expect(originalChecksum).toBe(downloadChecksum);
+      expect(downloadChecksum).toBe(asset.checksum);
+    });
+  });
+
+  describe('GET /asset/map-marker', () => {
+    beforeAll(async () => {
+      const files = [
+        'formats/avif/8bit-sRGB.avif',
+        'formats/jpg/el_torcal_rocks.jpg',
+        'formats/jxl/8bit-sRGB.jxl',
+        'formats/heic/IMG_2682.heic',
+        'formats/png/density_plot.png',
+        'formats/raw/Nikon/D80/glarus.nef',
+        'formats/raw/Nikon/D700/philadelphia.nef',
+        'formats/raw/Panasonic/DMC-GH4/4_3.rw2',
+        'formats/raw/Sony/ILCE-6300/12bit-compressed-(3_2).arw',
+        'formats/raw/Sony/ILCE-7M2/14bit-uncompressed-(3_2).arw',
+      ];
+      utils.resetEvents();
+      const uploadFile = async (input: string) => {
+        const filepath = join(testAssetDir, input);
+        const { id } = await utils.createAsset(admin.accessToken, {
+          assetData: { bytes: await readFile(filepath), filename: basename(filepath) },
+        });
+        await utils.waitForWebsocketEvent({ event: 'assetUpload', id });
+      };
+      const uploads = files.map((f) => uploadFile(f));
+      await Promise.all(uploads);
+    }, 30_000);
+
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get('/asset/map-marker');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    // TODO archive one of these assets
+    it('should get map markers for all non-archived assets', async () => {
+      const { status, body } = await request(app)
+        .get('/asset/map-marker')
+        .query({ isArchived: false })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(2);
+      expect(body).toEqual([
+        {
+          city: 'Palisade',
+          country: 'United States of America',
+          id: expect.any(String),
+          lat: expect.closeTo(39.115),
+          lon: expect.closeTo(-108.400_968),
+          state: 'Colorado',
+        },
+        {
+          city: 'Ralston',
+          country: 'United States of America',
+          id: expect.any(String),
+          lat: expect.closeTo(41.2203),
+          lon: expect.closeTo(-96.071_625),
+          state: 'Nebraska',
+        },
+      ]);
+    });
+
+    // TODO archive one of these assets
+    it('should get all map markers', async () => {
+      const { status, body } = await request(app)
+        .get('/asset/map-marker')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual([
+        {
+          city: 'Palisade',
+          country: 'United States of America',
+          id: expect.any(String),
+          lat: expect.closeTo(39.115),
+          lon: expect.closeTo(-108.400_968),
+          state: 'Colorado',
+        },
+        {
+          city: 'Ralston',
+          country: 'United States of America',
+          id: expect.any(String),
+          lat: expect.closeTo(41.2203),
+          lon: expect.closeTo(-96.071_625),
+          state: 'Nebraska',
+        },
+      ]);
+    });
+  });
+
+  describe('PUT /asset', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).put('/asset');
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require a valid parent id', async () => {
+      const { status, body } = await request(app)
+        .put('/asset')
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .send({ stackParentId: uuidDto.invalid, ids: [stackAssets[0].id] });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['stackParentId must be a UUID']));
+    });
+
+    it('should require access to the parent', async () => {
+      const { status, body } = await request(app)
+        .put('/asset')
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .send({ stackParentId: stackAssets[3].id, ids: [user1Assets[0].id] });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.noPermission);
+    });
+
+    it('should add stack children', async () => {
+      const { status } = await request(app)
+        .put('/asset')
+        .set('Authorization', `Bearer ${stackUser.accessToken}`)
+        .send({ stackParentId: stackAssets[0].id, ids: [stackAssets[3].id] });
+
+      expect(status).toBe(204);
+
+      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
+      expect(asset.stack).not.toBeUndefined();
+      expect(asset.stack).toEqual(expect.arrayContaining([expect.objectContaining({ id: stackAssets[3].id })]));
+    });
+
+    it('should remove stack children', async () => {
+      const { status } = await request(app)
+        .put('/asset')
+        .set('Authorization', `Bearer ${stackUser.accessToken}`)
+        .send({ removeParent: true, ids: [stackAssets[1].id] });
+
+      expect(status).toBe(204);
+
+      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
+      expect(asset.stack).not.toBeUndefined();
+      expect(asset.stack).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: stackAssets[2].id }),
+          expect.objectContaining({ id: stackAssets[3].id }),
+        ]),
+      );
+    });
+
+    it('should remove all stack children', async () => {
+      const { status } = await request(app)
+        .put('/asset')
+        .set('Authorization', `Bearer ${stackUser.accessToken}`)
+        .send({ removeParent: true, ids: [stackAssets[2].id, stackAssets[3].id] });
+
+      expect(status).toBe(204);
+
+      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
+      expect(asset.stack).toBeUndefined();
+    });
+
+    it('should merge stack children', async () => {
+      // create stack after previous test removed stack children
+      await updateAssets(
+        { assetBulkUpdateDto: { stackParentId: stackAssets[0].id, ids: [stackAssets[1].id, stackAssets[2].id] } },
+        { headers: asBearerAuth(stackUser.accessToken) },
+      );
+
+      const { status } = await request(app)
+        .put('/asset')
+        .set('Authorization', `Bearer ${stackUser.accessToken}`)
+        .send({ stackParentId: stackAssets[3].id, ids: [stackAssets[0].id] });
+
+      expect(status).toBe(204);
+
+      const asset = await getAssetInfo({ id: stackAssets[3].id }, { headers: asBearerAuth(stackUser.accessToken) });
+      expect(asset.stack).not.toBeUndefined();
+      expect(asset.stack).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: stackAssets[0].id }),
+          expect.objectContaining({ id: stackAssets[1].id }),
+          expect.objectContaining({ id: stackAssets[2].id }),
+        ]),
+      );
+    });
+  });
+
+  describe('PUT /asset/stack/parent', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).put('/asset/stack/parent');
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require a valid id', async () => {
+      const { status, body } = await request(app)
+        .put('/asset/stack/parent')
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .send({ oldParentId: uuidDto.invalid, newParentId: uuidDto.invalid });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest());
+    });
+
+    it('should require access', async () => {
+      const { status, body } = await request(app)
+        .put('/asset/stack/parent')
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .send({ oldParentId: stackAssets[3].id, newParentId: stackAssets[0].id });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.noPermission);
+    });
+
+    it('should make old parent child of new parent', async () => {
+      const { status } = await request(app)
+        .put('/asset/stack/parent')
+        .set('Authorization', `Bearer ${stackUser.accessToken}`)
+        .send({ oldParentId: stackAssets[3].id, newParentId: stackAssets[0].id });
+
+      expect(status).toBe(200);
+
+      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
+
+      // new parent
+      expect(asset.stack).not.toBeUndefined();
+      expect(asset.stack).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: stackAssets[1].id }),
+          expect.objectContaining({ id: stackAssets[2].id }),
+          expect.objectContaining({ id: stackAssets[3].id }),
+        ]),
+      );
+    });
+  });
   describe('POST /asset/upload', () => {
+    beforeAll(setupTests, 30_000);
+
     it('should require authentication', async () => {
       const { status, body } = await request(app).post(`/asset/upload`);
       expect(body).toEqual(errorDto.unauthorized);
       expect(status).toBe(401);
     });
 
-    const invalid = [
+    it.each([
       { should: 'require `deviceAssetId`', dto: { ...makeUploadDto({ omit: 'deviceAssetId' }) } },
       { should: 'require `deviceId`', dto: { ...makeUploadDto({ omit: 'deviceId' }) } },
       { should: 'require `fileCreatedAt`', dto: { ...makeUploadDto({ omit: 'fileCreatedAt' }) } },
@@ -554,21 +894,17 @@ describe('/asset', () => {
       { should: 'throw if `isFavorite` is not a boolean', dto: { ...makeUploadDto(), isFavorite: 'not-a-boolean' } },
       { should: 'throw if `isVisible` is not a boolean', dto: { ...makeUploadDto(), isVisible: 'not-a-boolean' } },
       { should: 'throw if `isArchived` is not a boolean', dto: { ...makeUploadDto(), isArchived: 'not-a-boolean' } },
-    ];
+    ])('should $should', async ({ dto }) => {
+      const { status, body } = await request(app)
+        .post('/asset/upload')
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .attach('assetData', makeRandomImage(), 'example.png')
+        .field(dto);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest());
+    });
 
-    for (const { should, dto } of invalid) {
-      it(`should ${should}`, async () => {
-        const { status, body } = await request(app)
-          .post('/asset/upload')
-          .set('Authorization', `Bearer ${user1.accessToken}`)
-          .attach('assetData', makeRandomImage(), 'example.png')
-          .field(dto);
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      });
-    }
-
-    const tests = [
+    it.each([
       {
         input: 'formats/avif/8bit-sRGB.avif',
         expected: {
@@ -784,26 +1120,22 @@ describe('/asset', () => {
           },
         },
       },
-    ];
-
-    for (const { input, expected } of tests) {
-      it(`should upload and generate a thumbnail for ${input}`, async () => {
-        const filepath = join(testAssetDir, input);
-        const { id, duplicate } = await utils.createAsset(admin.accessToken, {
-          assetData: { bytes: await readFile(filepath), filename: basename(filepath) },
-        });
-
-        expect(duplicate).toBe(false);
-
-        await utils.waitForWebsocketEvent({ event: 'assetUpload', id: id });
-
-        const asset = await utils.getAssetInfo(admin.accessToken, id);
-
-        expect(asset.exifInfo).toBeDefined();
-        expect(asset.exifInfo).toMatchObject(expected.exifInfo);
-        expect(asset).toMatchObject(expected);
+    ])(`should upload and generate a thumbnail for $input`, async ({ input, expected }) => {
+      const filepath = join(testAssetDir, input);
+      const { id, duplicate } = await utils.createAsset(admin.accessToken, {
+        assetData: { bytes: await readFile(filepath), filename: basename(filepath) },
       });
-    }
+
+      expect(duplicate).toBe(false);
+
+      await utils.waitForWebsocketEvent({ event: 'assetUpload', id: id });
+
+      const asset = await utils.getAssetInfo(admin.accessToken, id);
+
+      expect(asset.exifInfo).toBeDefined();
+      expect(asset.exifInfo).toMatchObject(expected.exifInfo);
+      expect(asset).toMatchObject(expected);
+    });
 
     it('should handle a duplicate', async () => {
       const filepath = 'formats/jpeg/el_torcal_rocks.jpeg';
@@ -830,7 +1162,7 @@ describe('/asset', () => {
       expect(body).toEqual({ id: expect.any(String), duplicate: false });
       expect(status).toBe(201);
 
-      const { body: user } = await request(app).get('/user/me').set('Authorization', `Bearer ${quotaUser.accessToken}`);
+      const user = await getMyUser({ headers: asBearerAuth(quotaUser.accessToken) });
 
       expect(user).toEqual(expect.objectContaining({ quotaUsageInBytes: 70 }));
     });
@@ -854,7 +1186,7 @@ describe('/asset', () => {
     // This ensures that immich+exiftool are extracting the videos the same way Samsung does.
     // DO NOT assume immich+exiftool are doing things correctly and just copy whatever hash it gives
     // into the test here.
-    const motionTests = [
+    it.each([
       {
         filepath: 'formats/motionphoto/Samsung One UI 5.jpg',
         checksum: 'fr14niqCq6N20HB8rJYEvpsUVtI=',
@@ -867,329 +1199,23 @@ describe('/asset', () => {
         filepath: 'formats/motionphoto/Samsung One UI 6.heic',
         checksum: '/ejgzywvgvzvVhUYVfvkLzFBAF0=',
       },
-    ];
-
-    for (const { filepath, checksum } of motionTests) {
-      it(`should extract motionphoto video from ${filepath}`, async () => {
-        const response = await utils.createAsset(admin.accessToken, {
-          assetData: {
-            bytes: await readFile(join(testAssetDir, filepath)),
-            filename: basename(filepath),
-          },
-        });
-
-        await utils.waitForWebsocketEvent({ event: 'assetUpload', id: response.id });
-
-        expect(response.duplicate).toBe(false);
-
-        const asset = await utils.getAssetInfo(admin.accessToken, response.id);
-        expect(asset.livePhotoVideoId).toBeDefined();
-
-        const video = await utils.getAssetInfo(admin.accessToken, asset.livePhotoVideoId as string);
-        expect(video.checksum).toStrictEqual(checksum);
-      });
-    }
-  });
-
-  describe('GET /asset/thumbnail/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/thumbnail/${locationAsset.id}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should not include gps data for webp thumbnails', async () => {
-      await utils.waitForWebsocketEvent({
-        event: 'assetUpload',
-        id: locationAsset.id,
+    ])(`should extract motionphoto video from $filepath`, async ({ filepath, checksum }) => {
+      const response = await utils.createAsset(admin.accessToken, {
+        assetData: {
+          bytes: await readFile(join(testAssetDir, filepath)),
+          filename: basename(filepath),
+        },
       });
 
-      const { status, body, type } = await request(app)
-        .get(`/asset/thumbnail/${locationAsset.id}?format=WEBP`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
+      await utils.waitForWebsocketEvent({ event: 'assetUpload', id: response.id });
 
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/webp');
+      expect(response.duplicate).toBe(false);
 
-      const exifData = await readTags(body, 'thumbnail.webp');
-      expect(exifData).not.toHaveProperty('GPSLongitude');
-      expect(exifData).not.toHaveProperty('GPSLatitude');
-    });
+      const asset = await utils.getAssetInfo(admin.accessToken, response.id);
+      expect(asset.livePhotoVideoId).toBeDefined();
 
-    it('should not include gps data for jpeg thumbnails', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/thumbnail/${locationAsset.id}?format=JPEG`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/jpeg');
-
-      const exifData = await readTags(body, 'thumbnail.jpg');
-      expect(exifData).not.toHaveProperty('GPSLongitude');
-      expect(exifData).not.toHaveProperty('GPSLatitude');
-    });
-  });
-
-  describe('GET /asset/file/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/asset/thumbnail/${locationAsset.id}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should download the original', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/file/${locationAsset.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/jpeg');
-
-      const asset = await utils.getAssetInfo(admin.accessToken, locationAsset.id);
-
-      const original = await readFile(locationAssetFilepath);
-      const originalChecksum = utils.sha1(original);
-      const downloadChecksum = utils.sha1(body);
-
-      expect(originalChecksum).toBe(downloadChecksum);
-      expect(downloadChecksum).toBe(asset.checksum);
-    });
-  });
-
-  describe('GET /asset/map-marker', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/asset/map-marker');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    // TODO archive one of these assets
-    it('should get map markers for all non-archived assets', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/map-marker')
-        .query({ isArchived: false })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toHaveLength(2);
-      expect(body).toEqual([
-        {
-          city: 'Palisade',
-          country: 'United States of America',
-          id: expect.any(String),
-          lat: expect.closeTo(39.115),
-          lon: expect.closeTo(-108.400_968),
-          state: 'Colorado',
-        },
-        {
-          city: 'Ralston',
-          country: 'United States of America',
-          id: expect.any(String),
-          lat: expect.closeTo(41.2203),
-          lon: expect.closeTo(-96.071_625),
-          state: 'Nebraska',
-        },
-      ]);
-    });
-
-    // TODO archive one of these assets
-    it('should get all map markers', async () => {
-      const { status, body } = await request(app)
-        .get('/asset/map-marker')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual([
-        {
-          city: 'Palisade',
-          country: 'United States of America',
-          id: expect.any(String),
-          lat: expect.closeTo(39.115),
-          lon: expect.closeTo(-108.400_968),
-          state: 'Colorado',
-        },
-        {
-          city: 'Ralston',
-          country: 'United States of America',
-          id: expect.any(String),
-          lat: expect.closeTo(41.2203),
-          lon: expect.closeTo(-96.071_625),
-          state: 'Nebraska',
-        },
-      ]);
-    });
-  });
-
-  describe('GET /asset', () => {
-    it('should return stack data', async () => {
-      const { status, body } = await request(app).get('/asset').set('Authorization', `Bearer ${stackUser.accessToken}`);
-
-      const stack = body.find((asset: AssetResponseDto) => asset.id === stackAssets[0].id);
-
-      expect(status).toBe(200);
-      expect(stack).toEqual(
-        expect.objectContaining({
-          stackCount: 3,
-          stack:
-            // Response includes children at the root level
-            expect.arrayContaining([
-              expect.objectContaining({ id: stackAssets[1].id }),
-              expect.objectContaining({ id: stackAssets[2].id }),
-            ]),
-        }),
-      );
-    });
-  });
-
-  describe('PUT /asset', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put('/asset');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid parent id', async () => {
-      const { status, body } = await request(app)
-        .put('/asset')
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ stackParentId: uuidDto.invalid, ids: [stackAssets[0].id] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['stackParentId must be a UUID']));
-    });
-
-    it('should require access to the parent', async () => {
-      const { status, body } = await request(app)
-        .put('/asset')
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ stackParentId: stackAssets[3].id, ids: [user1Assets[0].id] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.noPermission);
-    });
-
-    it('should add stack children', async () => {
-      const { status } = await request(app)
-        .put('/asset')
-        .set('Authorization', `Bearer ${stackUser.accessToken}`)
-        .send({ stackParentId: stackAssets[0].id, ids: [stackAssets[3].id] });
-
-      expect(status).toBe(204);
-
-      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
-      expect(asset.stack).not.toBeUndefined();
-      expect(asset.stack).toEqual(expect.arrayContaining([expect.objectContaining({ id: stackAssets[3].id })]));
-    });
-
-    it('should remove stack children', async () => {
-      const { status } = await request(app)
-        .put('/asset')
-        .set('Authorization', `Bearer ${stackUser.accessToken}`)
-        .send({ removeParent: true, ids: [stackAssets[1].id] });
-
-      expect(status).toBe(204);
-
-      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
-      expect(asset.stack).not.toBeUndefined();
-      expect(asset.stack).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ id: stackAssets[2].id }),
-          expect.objectContaining({ id: stackAssets[3].id }),
-        ]),
-      );
-    });
-
-    it('should remove all stack children', async () => {
-      const { status } = await request(app)
-        .put('/asset')
-        .set('Authorization', `Bearer ${stackUser.accessToken}`)
-        .send({ removeParent: true, ids: [stackAssets[2].id, stackAssets[3].id] });
-
-      expect(status).toBe(204);
-
-      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
-      expect(asset.stack).toBeUndefined();
-    });
-
-    it('should merge stack children', async () => {
-      // create stack after previous test removed stack children
-      await updateAssets(
-        { assetBulkUpdateDto: { stackParentId: stackAssets[0].id, ids: [stackAssets[1].id, stackAssets[2].id] } },
-        { headers: asBearerAuth(stackUser.accessToken) },
-      );
-
-      const { status } = await request(app)
-        .put('/asset')
-        .set('Authorization', `Bearer ${stackUser.accessToken}`)
-        .send({ stackParentId: stackAssets[3].id, ids: [stackAssets[0].id] });
-
-      expect(status).toBe(204);
-
-      const asset = await getAssetInfo({ id: stackAssets[3].id }, { headers: asBearerAuth(stackUser.accessToken) });
-      expect(asset.stack).not.toBeUndefined();
-      expect(asset.stack).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ id: stackAssets[0].id }),
-          expect.objectContaining({ id: stackAssets[1].id }),
-          expect.objectContaining({ id: stackAssets[2].id }),
-        ]),
-      );
-    });
-  });
-
-  describe('PUT /asset/stack/parent', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put('/asset/stack/parent');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .put('/asset/stack/parent')
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ oldParentId: uuidDto.invalid, newParentId: uuidDto.invalid });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest());
-    });
-
-    it('should require access', async () => {
-      const { status, body } = await request(app)
-        .put('/asset/stack/parent')
-        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .send({ oldParentId: stackAssets[3].id, newParentId: stackAssets[0].id });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.noPermission);
-    });
-
-    it('should make old parent child of new parent', async () => {
-      const { status } = await request(app)
-        .put('/asset/stack/parent')
-        .set('Authorization', `Bearer ${stackUser.accessToken}`)
-        .send({ oldParentId: stackAssets[3].id, newParentId: stackAssets[0].id });
-
-      expect(status).toBe(200);
-
-      const asset = await getAssetInfo({ id: stackAssets[0].id }, { headers: asBearerAuth(stackUser.accessToken) });
-
-      // new parent
-      expect(asset.stack).not.toBeUndefined();
-      expect(asset.stack).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ id: stackAssets[1].id }),
-          expect.objectContaining({ id: stackAssets[2].id }),
-          expect.objectContaining({ id: stackAssets[3].id }),
-        ]),
-      );
+      const video = await utils.getAssetInfo(admin.accessToken, asset.livePhotoVideoId as string);
+      expect(video.checksum).toStrictEqual(checksum);
     });
   });
 });

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

@@ -2,7 +2,7 @@ import { deleteAssets, getAuditFiles, updateAsset, type LoginResponseDto } from
 import { asBearerAuth, utils } from 'src/utils';
 import { beforeAll, describe, expect, it } from 'vitest';
 
-describe('/audit', () => {
+describe('/audits', () => {
   let admin: LoginResponseDto;
 
   beforeAll(async () => {

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

@@ -11,7 +11,7 @@ import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
 const scan = async (accessToken: string, id: string, dto: ScanLibraryDto = {}) =>
   scanLibrary({ id, scanLibraryDto: dto }, { headers: asBearerAuth(accessToken) });
 
-describe('/library', () => {
+describe('/libraries', () => {
   let admin: LoginResponseDto;
   let user: LoginResponseDto;
   let library: LibraryResponseDto;
@@ -37,24 +37,24 @@ describe('/library', () => {
     utils.resetEvents();
   });
 
-  describe('GET /library', () => {
+  describe('GET /libraries', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/library');
+      const { status, body } = await request(app).get('/libraries');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
   });
 
-  describe('POST /library', () => {
+  describe('POST /libraries', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/library').send({});
+      const { status, body } = await request(app).post('/libraries').send({});
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should require admin authentication', async () => {
       const { status, body } = await request(app)
-        .post('/library')
+        .post('/libraries')
         .set('Authorization', `Bearer ${user.accessToken}`)
         .send({ ownerId: admin.userId });
 
@@ -64,7 +64,7 @@ describe('/library', () => {
 
     it('should create an external library with defaults', async () => {
       const { status, body } = await request(app)
-        .post('/library')
+        .post('/libraries')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ ownerId: admin.userId });
 
@@ -83,7 +83,7 @@ describe('/library', () => {
 
     it('should create an external library with options', async () => {
       const { status, body } = await request(app)
-        .post('/library')
+        .post('/libraries')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           ownerId: admin.userId,
@@ -103,7 +103,7 @@ describe('/library', () => {
 
     it('should not create an external library with duplicate import paths', async () => {
       const { status, body } = await request(app)
-        .post('/library')
+        .post('/libraries')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           ownerId: admin.userId,
@@ -118,7 +118,7 @@ describe('/library', () => {
 
     it('should not create an external library with duplicate exclusion patterns', async () => {
       const { status, body } = await request(app)
-        .post('/library')
+        .post('/libraries')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           ownerId: admin.userId,
@@ -132,16 +132,16 @@ describe('/library', () => {
     });
   });
 
-  describe('PUT /library/:id', () => {
+  describe('PUT /libraries/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/library/${uuidDto.notFound}`).send({});
+      const { status, body } = await request(app).put(`/libraries/${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}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ name: 'New Library Name' });
 
@@ -155,7 +155,7 @@ describe('/library', () => {
 
     it('should not set an empty name', async () => {
       const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ name: '' });
 
@@ -165,7 +165,7 @@ describe('/library', () => {
 
     it('should change the import paths', async () => {
       const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ importPaths: [testAssetDirInternal] });
 
@@ -179,7 +179,7 @@ describe('/library', () => {
 
     it('should reject an empty import path', async () => {
       const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ importPaths: [''] });
 
@@ -189,7 +189,7 @@ describe('/library', () => {
 
     it('should reject duplicate import paths', async () => {
       const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ importPaths: ['/path', '/path'] });
 
@@ -199,7 +199,7 @@ describe('/library', () => {
 
     it('should change the exclusion pattern', async () => {
       const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ exclusionPatterns: ['**/Raw/**'] });
 
@@ -213,7 +213,7 @@ describe('/library', () => {
 
     it('should reject duplicate exclusion patterns', async () => {
       const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ exclusionPatterns: ['**/*.jpg', '**/*.jpg'] });
 
@@ -223,7 +223,7 @@ describe('/library', () => {
 
     it('should reject an empty exclusion pattern', async () => {
       const { status, body } = await request(app)
-        .put(`/library/${library.id}`)
+        .put(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ exclusionPatterns: [''] });
 
@@ -232,9 +232,9 @@ describe('/library', () => {
     });
   });
 
-  describe('GET /library/:id', () => {
+  describe('GET /libraries/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/library/${uuidDto.notFound}`);
+      const { status, body } = await request(app).get(`/libraries/${uuidDto.notFound}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -242,7 +242,7 @@ describe('/library', () => {
 
     it('should require admin access', async () => {
       const { status, body } = await request(app)
-        .get(`/library/${uuidDto.notFound}`)
+        .get(`/libraries/${uuidDto.notFound}`)
         .set('Authorization', `Bearer ${user.accessToken}`);
       expect(status).toBe(403);
       expect(body).toEqual(errorDto.forbidden);
@@ -252,7 +252,7 @@ describe('/library', () => {
       const library = await utils.createLibrary(admin.accessToken, { ownerId: admin.userId });
 
       const { status, body } = await request(app)
-        .get(`/library/${library.id}`)
+        .get(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -269,18 +269,18 @@ describe('/library', () => {
     });
   });
 
-  describe('GET /library/:id/statistics', () => {
+  describe('GET /libraries/:id/statistics', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/library/${uuidDto.notFound}/statistics`);
+      const { status, body } = await request(app).get(`/libraries/${uuidDto.notFound}/statistics`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
   });
 
-  describe('POST /library/:id/scan', () => {
+  describe('POST /libraries/:id/scan', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/scan`).send({});
+      const { status, body } = await request(app).post(`/libraries/${uuidDto.notFound}/scan`).send({});
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -496,9 +496,9 @@ describe('/library', () => {
     });
   });
 
-  describe('POST /library/:id/removeOffline', () => {
+  describe('POST /libraries/:id/removeOffline', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/removeOffline`).send({});
+      const { status, body } = await request(app).post(`/libraries/${uuidDto.notFound}/removeOffline`).send({});
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -532,7 +532,7 @@ describe('/library', () => {
       expect(offlineAssets.count).toBe(1);
 
       const { status } = await request(app)
-        .post(`/library/${library.id}/removeOffline`)
+        .post(`/libraries/${library.id}/removeOffline`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send();
       expect(status).toBe(204);
@@ -557,7 +557,7 @@ describe('/library', () => {
       expect(assetsBefore.count).toBeGreaterThan(1);
 
       const { status } = await request(app)
-        .post(`/library/${library.id}/removeOffline`)
+        .post(`/libraries/${library.id}/removeOffline`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send();
       expect(status).toBe(204);
@@ -569,9 +569,9 @@ describe('/library', () => {
     });
   });
 
-  describe('POST /library/:id/validate', () => {
+  describe('POST /libraries/:id/validate', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/library/${uuidDto.notFound}/validate`).send({});
+      const { status, body } = await request(app).post(`/libraries/${uuidDto.notFound}/validate`).send({});
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -617,9 +617,9 @@ describe('/library', () => {
     });
   });
 
-  describe('DELETE /library/:id', () => {
+  describe('DELETE /libraries/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/library/${uuidDto.notFound}`);
+      const { status, body } = await request(app).delete(`/libraries/${uuidDto.notFound}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -629,7 +629,7 @@ describe('/library', () => {
       const library = await utils.createLibrary(admin.accessToken, { ownerId: admin.userId });
 
       const { status, body } = await request(app)
-        .delete(`/library/${library.id}`)
+        .delete(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(204);
@@ -655,7 +655,7 @@ describe('/library', () => {
       await utils.waitForWebsocketEvent({ event: 'assetUpload', total: 2 });
 
       const { status, body } = await request(app)
-        .delete(`/library/${library.id}`)
+        .delete(`/libraries/${library.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(204);

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

@@ -5,7 +5,7 @@ import { app, asBearerAuth, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';
 
-describe('/partner', () => {
+describe('/partners', () => {
   let admin: LoginResponseDto;
   let user1: LoginResponseDto;
   let user2: LoginResponseDto;
@@ -28,9 +28,9 @@ describe('/partner', () => {
     ]);
   });
 
-  describe('GET /partner', () => {
+  describe('GET /partners', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/partner');
+      const { status, body } = await request(app).get('/partners');
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -38,7 +38,7 @@ describe('/partner', () => {
 
     it('should get all partners shared by user', async () => {
       const { status, body } = await request(app)
-        .get('/partner')
+        .get('/partners')
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .query({ direction: 'shared-by' });
 
@@ -48,7 +48,7 @@ describe('/partner', () => {
 
     it('should get all partners that share with user', async () => {
       const { status, body } = await request(app)
-        .get('/partner')
+        .get('/partners')
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .query({ direction: 'shared-with' });
 
@@ -57,9 +57,9 @@ describe('/partner', () => {
     });
   });
 
-  describe('POST /partner/:id', () => {
+  describe('POST /partners/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).post(`/partners/${user3.userId}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -67,7 +67,7 @@ describe('/partner', () => {
 
     it('should share with new partner', async () => {
       const { status, body } = await request(app)
-        .post(`/partner/${user3.userId}`)
+        .post(`/partners/${user3.userId}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(201);
@@ -76,7 +76,7 @@ describe('/partner', () => {
 
     it('should not share with new partner if already sharing with this partner', async () => {
       const { status, body } = await request(app)
-        .post(`/partner/${user2.userId}`)
+        .post(`/partners/${user2.userId}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
@@ -84,9 +84,9 @@ describe('/partner', () => {
     });
   });
 
-  describe('PUT /partner/:id', () => {
+  describe('PUT /partners/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/partner/${user2.userId}`);
+      const { status, body } = await request(app).put(`/partners/${user2.userId}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -94,7 +94,7 @@ describe('/partner', () => {
 
     it('should update partner', async () => {
       const { status, body } = await request(app)
-        .put(`/partner/${user2.userId}`)
+        .put(`/partners/${user2.userId}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ inTimeline: false });
 
@@ -103,9 +103,9 @@ describe('/partner', () => {
     });
   });
 
-  describe('DELETE /partner/:id', () => {
+  describe('DELETE /partners/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).delete(`/partners/${user3.userId}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -113,7 +113,7 @@ describe('/partner', () => {
 
     it('should delete partner', async () => {
       const { status } = await request(app)
-        .delete(`/partner/${user3.userId}`)
+        .delete(`/partners/${user3.userId}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -121,7 +121,7 @@ describe('/partner', () => {
 
     it('should throw a bad request if partner not found', async () => {
       const { status, body } = await request(app)
-        .delete(`/partner/${user3.userId}`)
+        .delete(`/partners/${user3.userId}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);

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

@@ -12,7 +12,7 @@ const invalidBirthday = [
   { birthDate: new Date(9999, 0, 0).toISOString(), response: ['Birth date cannot be in the future'] },
 ];
 
-describe('/person', () => {
+describe('/people', () => {
   let admin: LoginResponseDto;
   let visiblePerson: PersonResponseDto;
   let hiddenPerson: PersonResponseDto;
@@ -47,11 +47,11 @@ describe('/person', () => {
     ]);
   });
 
-  describe('GET /person', () => {
+  describe('GET /people', () => {
     beforeEach(async () => {});
 
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/person');
+      const { status, body } = await request(app).get('/people');
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -59,7 +59,7 @@ describe('/person', () => {
 
     it('should return all people (including hidden)', async () => {
       const { status, body } = await request(app)
-        .get('/person')
+        .get('/people')
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .query({ withHidden: true });
 
@@ -76,7 +76,7 @@ describe('/person', () => {
     });
 
     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('/people').set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
       expect(body).toEqual({
@@ -90,9 +90,9 @@ describe('/person', () => {
     });
   });
 
-  describe('GET /person/:id', () => {
+  describe('GET /people/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/person/${uuidDto.notFound}`);
+      const { status, body } = await request(app).get(`/people/${uuidDto.notFound}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -100,7 +100,7 @@ describe('/person', () => {
 
     it('should throw error if person with id does not exist', async () => {
       const { status, body } = await request(app)
-        .get(`/person/${uuidDto.notFound}`)
+        .get(`/people/${uuidDto.notFound}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
@@ -109,7 +109,7 @@ describe('/person', () => {
 
     it('should return person information', async () => {
       const { status, body } = await request(app)
-        .get(`/person/${visiblePerson.id}`)
+        .get(`/people/${visiblePerson.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -117,9 +117,9 @@ describe('/person', () => {
     });
   });
 
-  describe('GET /person/:id/statistics', () => {
+  describe('GET /people/:id/statistics', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/person/${multipleAssetsPerson.id}/statistics`);
+      const { status, body } = await request(app).get(`/people/${multipleAssetsPerson.id}/statistics`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -127,7 +127,7 @@ describe('/person', () => {
 
     it('should throw error if person with id does not exist', async () => {
       const { status, body } = await request(app)
-        .get(`/person/${uuidDto.notFound}/statistics`)
+        .get(`/people/${uuidDto.notFound}/statistics`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
@@ -136,7 +136,7 @@ describe('/person', () => {
 
     it('should return the correct number of assets', async () => {
       const { status, body } = await request(app)
-        .get(`/person/${multipleAssetsPerson.id}/statistics`)
+        .get(`/people/${multipleAssetsPerson.id}/statistics`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -144,9 +144,9 @@ describe('/person', () => {
     });
   });
 
-  describe('POST /person', () => {
+  describe('POST /people', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/person`);
+      const { status, body } = await request(app).post(`/people`);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -154,7 +154,7 @@ describe('/person', () => {
     for (const { birthDate, response } of invalidBirthday) {
       it(`should not accept an invalid birth date [${birthDate}]`, async () => {
         const { status, body } = await request(app)
-          .post(`/person`)
+          .post(`/people`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
           .send({ birthDate });
         expect(status).toBe(400);
@@ -164,7 +164,7 @@ describe('/person', () => {
 
     it('should create a person', async () => {
       const { status, body } = await request(app)
-        .post(`/person`)
+        .post(`/people`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           name: 'New Person',
@@ -179,9 +179,9 @@ describe('/person', () => {
     });
   });
 
-  describe('PUT /person/:id', () => {
+  describe('PUT /people/:id', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/person/${uuidDto.notFound}`);
+      const { status, body } = await request(app).put(`/people/${uuidDto.notFound}`);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
@@ -193,7 +193,7 @@ describe('/person', () => {
     ]) {
       it(`should not allow null ${key}`, async () => {
         const { status, body } = await request(app)
-          .put(`/person/${visiblePerson.id}`)
+          .put(`/people/${visiblePerson.id}`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
           .send({ [key]: null });
         expect(status).toBe(400);
@@ -204,7 +204,7 @@ describe('/person', () => {
     for (const { birthDate, response } of invalidBirthday) {
       it(`should not accept an invalid birth date [${birthDate}]`, async () => {
         const { status, body } = await request(app)
-          .put(`/person/${visiblePerson.id}`)
+          .put(`/people/${visiblePerson.id}`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
           .send({ birthDate });
         expect(status).toBe(400);
@@ -214,7 +214,7 @@ describe('/person', () => {
 
     it('should update a date of birth', async () => {
       const { status, body } = await request(app)
-        .put(`/person/${visiblePerson.id}`)
+        .put(`/people/${visiblePerson.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ birthDate: '1990-01-01T05:00:00.000Z' });
       expect(status).toBe(200);
@@ -223,7 +223,7 @@ describe('/person', () => {
 
     it('should clear a date of birth', async () => {
       const { status, body } = await request(app)
-        .put(`/person/${visiblePerson.id}`)
+        .put(`/people/${visiblePerson.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({ birthDate: null });
       expect(status).toBe(200);

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

@@ -15,16 +15,16 @@ describe('/server-info', () => {
     nonAdmin = await utils.userSetup(admin.accessToken, createUserDto.user1);
   });
 
-  describe('GET /server-info', () => {
+  describe('GET /server-info/storage', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/server-info');
+      const { status, body } = await request(app).get('/server-info/storage');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     it('should return the disk information', async () => {
       const { status, body } = await request(app)
-        .get('/server-info')
+        .get('/server-info/storage')
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(200);
       expect(body).toEqual({

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

@@ -5,7 +5,7 @@ import {
   SharedLinkResponseDto,
   SharedLinkType,
   createAlbum,
-  deleteUser,
+  deleteUserAdmin,
 } from '@immich/sdk';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
@@ -13,7 +13,7 @@ import { app, asBearerAuth, shareUrl, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';
 
-describe('/shared-link', () => {
+describe('/shared-links', () => {
   let admin: LoginResponseDto;
   let asset1: AssetFileUploadResponseDto;
   let asset2: AssetFileUploadResponseDto;
@@ -86,7 +86,7 @@ describe('/shared-link', () => {
         }),
       ]);
 
-    await deleteUser({ id: user2.userId, deleteUserDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUserAdmin({ id: user2.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
   });
 
   describe('GET /share/${key}', () => {
@@ -114,9 +114,9 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('GET /shared-link', () => {
+  describe('GET /shared-links', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/shared-link');
+      const { status, body } = await request(app).get('/shared-links');
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -124,7 +124,7 @@ describe('/shared-link', () => {
 
     it('should get all shared links created by user', async () => {
       const { status, body } = await request(app)
-        .get('/shared-link')
+        .get('/shared-links')
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -142,7 +142,7 @@ describe('/shared-link', () => {
 
     it('should not get shared links created by other users', async () => {
       const { status, body } = await request(app)
-        .get('/shared-link')
+        .get('/shared-links')
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -150,15 +150,15 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('GET /shared-link/me', () => {
+  describe('GET /shared-links/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-links/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-links/me').query({ key: linkWithAlbum.key });
 
       expect(status).toBe(200);
       expect(body).toEqual(
@@ -172,7 +172,7 @@ describe('/shared-link', () => {
 
     it('should return unauthorized for incorrect shared link', async () => {
       const { status, body } = await request(app)
-        .get('/shared-link/me')
+        .get('/shared-links/me')
         .query({ key: linkWithAlbum.key + 'foo' });
 
       expect(status).toBe(401);
@@ -180,14 +180,14 @@ 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-links/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-links/me').query({ key: linkWithPassword.key });
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.invalidSharePassword);
@@ -195,7 +195,7 @@ describe('/shared-link', () => {
 
     it('should get data for correct password protected link', async () => {
       const { status, body } = await request(app)
-        .get('/shared-link/me')
+        .get('/shared-links/me')
         .query({ key: linkWithPassword.key, password: 'foo' });
 
       expect(status).toBe(200);
@@ -209,7 +209,7 @@ 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-links/me').query({ key: linkWithMetadata.key });
 
       expect(status).toBe(200);
       expect(body.assets).toHaveLength(1);
@@ -225,7 +225,7 @@ 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-links/me').query({ key: linkWithoutMetadata.key });
 
       expect(status).toBe(200);
       expect(body.assets).toHaveLength(1);
@@ -239,9 +239,9 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('GET /shared-link/:id', () => {
+  describe('GET /shared-links/: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-links/${linkWithAlbum.id}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -249,7 +249,7 @@ describe('/shared-link', () => {
 
     it('should get shared link by id', async () => {
       const { status, body } = await request(app)
-        .get(`/shared-link/${linkWithAlbum.id}`)
+        .get(`/shared-links/${linkWithAlbum.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);
@@ -264,7 +264,7 @@ describe('/shared-link', () => {
 
     it('should not get shared link by id if user has not created the link or it does not exist', async () => {
       const { status, body } = await request(app)
-        .get(`/shared-link/${linkWithAlbum.id}`)
+        .get(`/shared-links/${linkWithAlbum.id}`)
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(400);
@@ -272,10 +272,10 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('POST /shared-link', () => {
+  describe('POST /shared-links', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app)
-        .post('/shared-link')
+        .post('/shared-links')
         .send({ type: SharedLinkType.Album, albumId: uuidDto.notFound });
 
       expect(status).toBe(401);
@@ -284,7 +284,7 @@ describe('/shared-link', () => {
 
     it('should require a type and the correspondent asset/album id', async () => {
       const { status, body } = await request(app)
-        .post('/shared-link')
+        .post('/shared-links')
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
@@ -293,7 +293,7 @@ describe('/shared-link', () => {
 
     it('should require an asset/album id', async () => {
       const { status, body } = await request(app)
-        .post('/shared-link')
+        .post('/shared-links')
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ type: SharedLinkType.Album });
 
@@ -303,7 +303,7 @@ describe('/shared-link', () => {
 
     it('should require a valid asset id', async () => {
       const { status, body } = await request(app)
-        .post('/shared-link')
+        .post('/shared-links')
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ type: SharedLinkType.Individual, assetId: uuidDto.notFound });
 
@@ -313,7 +313,7 @@ describe('/shared-link', () => {
 
     it('should create a shared link', async () => {
       const { status, body } = await request(app)
-        .post('/shared-link')
+        .post('/shared-links')
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ type: SharedLinkType.Album, albumId: album.id });
 
@@ -327,10 +327,10 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('PATCH /shared-link/:id', () => {
+  describe('PATCH /shared-links/:id', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app)
-        .patch(`/shared-link/${linkWithAlbum.id}`)
+        .patch(`/shared-links/${linkWithAlbum.id}`)
         .send({ description: 'foo' });
 
       expect(status).toBe(401);
@@ -339,7 +339,7 @@ describe('/shared-link', () => {
 
     it('should fail if invalid link', async () => {
       const { status, body } = await request(app)
-        .patch(`/shared-link/${uuidDto.notFound}`)
+        .patch(`/shared-links/${uuidDto.notFound}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ description: 'foo' });
 
@@ -349,7 +349,7 @@ describe('/shared-link', () => {
 
     it('should update shared link', async () => {
       const { status, body } = await request(app)
-        .patch(`/shared-link/${linkWithAlbum.id}`)
+        .patch(`/shared-links/${linkWithAlbum.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ description: 'foo' });
 
@@ -364,10 +364,10 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('PUT /shared-link/:id/assets', () => {
+  describe('PUT /shared-links/:id/assets', () => {
     it('should not add assets to shared link (album)', async () => {
       const { status, body } = await request(app)
-        .put(`/shared-link/${linkWithAlbum.id}/assets`)
+        .put(`/shared-links/${linkWithAlbum.id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ assetIds: [asset2.id] });
 
@@ -377,7 +377,7 @@ describe('/shared-link', () => {
 
     it('should add an assets to a shared link (individual)', async () => {
       const { status, body } = await request(app)
-        .put(`/shared-link/${linkWithAssets.id}/assets`)
+        .put(`/shared-links/${linkWithAssets.id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ assetIds: [asset2.id] });
 
@@ -386,10 +386,10 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('DELETE /shared-link/:id/assets', () => {
+  describe('DELETE /shared-links/:id/assets', () => {
     it('should not remove assets from a shared link (album)', async () => {
       const { status, body } = await request(app)
-        .delete(`/shared-link/${linkWithAlbum.id}/assets`)
+        .delete(`/shared-links/${linkWithAlbum.id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ assetIds: [asset2.id] });
 
@@ -399,7 +399,7 @@ describe('/shared-link', () => {
 
     it('should remove assets from a shared link (individual)', async () => {
       const { status, body } = await request(app)
-        .delete(`/shared-link/${linkWithAssets.id}/assets`)
+        .delete(`/shared-links/${linkWithAssets.id}/assets`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ assetIds: [asset2.id] });
 
@@ -408,9 +408,9 @@ describe('/shared-link', () => {
     });
   });
 
-  describe('DELETE /shared-link/:id', () => {
+  describe('DELETE /shared-links/: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-links/${linkWithAlbum.id}`);
 
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
@@ -418,7 +418,7 @@ describe('/shared-link', () => {
 
     it('should fail if invalid link', async () => {
       const { status, body } = await request(app)
-        .delete(`/shared-link/${uuidDto.notFound}`)
+        .delete(`/shared-links/${uuidDto.notFound}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(400);
@@ -427,7 +427,7 @@ describe('/shared-link', () => {
 
     it('should delete a shared link', async () => {
       const { status } = await request(app)
-        .delete(`/shared-link/${linkWithAlbum.id}`)
+        .delete(`/shared-links/${linkWithAlbum.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toBe(200);

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

@@ -1,4 +1,4 @@
-import { LoginResponseDto, getAllAssets } from '@immich/sdk';
+import { LoginResponseDto, getAssetInfo, getAssetStatistics } from '@immich/sdk';
 import { Socket } from 'socket.io-client';
 import { errorDto } from 'src/responses';
 import { app, asBearerAuth, utils } from 'src/utils';
@@ -31,16 +31,16 @@ describe('/trash', () => {
       const { id: assetId } = await utils.createAsset(admin.accessToken);
       await utils.deleteAssets(admin.accessToken, [assetId]);
 
-      const before = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
-      expect(before).toStrictEqual([expect.objectContaining({ id: assetId, isTrashed: true })]);
+      const before = await getAssetInfo({ id: assetId }, { headers: asBearerAuth(admin.accessToken) });
+      expect(before).toStrictEqual(expect.objectContaining({ id: assetId, isTrashed: true }));
 
       const { status } = await request(app).post('/trash/empty').set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
       await utils.waitForWebsocketEvent({ event: 'assetDelete', id: assetId });
 
-      const after = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
-      expect(after.length).toBe(0);
+      const after = await getAssetStatistics({ isTrashed: true }, { headers: asBearerAuth(admin.accessToken) });
+      expect(after.total).toBe(0);
     });
   });
 
@@ -56,14 +56,14 @@ describe('/trash', () => {
       const { id: assetId } = await utils.createAsset(admin.accessToken);
       await utils.deleteAssets(admin.accessToken, [assetId]);
 
-      const before = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
-      expect(before).toStrictEqual([expect.objectContaining({ id: assetId, isTrashed: true })]);
+      const before = await getAssetInfo({ id: assetId }, { headers: asBearerAuth(admin.accessToken) });
+      expect(before).toStrictEqual(expect.objectContaining({ id: assetId, isTrashed: true }));
 
       const { status } = await request(app).post('/trash/restore').set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
-      const after = await getAllAssets({}, { headers: asBearerAuth(admin.accessToken) });
-      expect(after).toStrictEqual([expect.objectContaining({ id: assetId, isTrashed: false })]);
+      const after = await getAssetInfo({ id: assetId }, { headers: asBearerAuth(admin.accessToken) });
+      expect(after).toStrictEqual(expect.objectContaining({ id: assetId, isTrashed: false }));
     });
   });
 

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

@@ -0,0 +1,317 @@
+import { LoginResponseDto, deleteUserAdmin, getMyUser, getUserAdmin, login } from '@immich/sdk';
+import { Socket } from 'socket.io-client';
+import { createUserDto, uuidDto } from 'src/fixtures';
+import { errorDto } from 'src/responses';
+import { app, asBearerAuth, utils } from 'src/utils';
+import request from 'supertest';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+
+describe('/admin/users', () => {
+  let websocket: Socket;
+
+  let admin: LoginResponseDto;
+  let nonAdmin: LoginResponseDto;
+  let deletedUser: LoginResponseDto;
+  let userToDelete: LoginResponseDto;
+  let userToHardDelete: LoginResponseDto;
+
+  beforeAll(async () => {
+    await utils.resetDatabase();
+    admin = await utils.adminSetup({ onboarding: false });
+
+    [websocket, nonAdmin, deletedUser, userToDelete, userToHardDelete] = await Promise.all([
+      utils.connectWebsocket(admin.accessToken),
+      utils.userSetup(admin.accessToken, createUserDto.user1),
+      utils.userSetup(admin.accessToken, createUserDto.user2),
+      utils.userSetup(admin.accessToken, createUserDto.user3),
+      utils.userSetup(admin.accessToken, createUserDto.user4),
+    ]);
+
+    await deleteUserAdmin(
+      { id: deletedUser.userId, userAdminDeleteDto: {} },
+      { headers: asBearerAuth(admin.accessToken) },
+    );
+  });
+
+  afterAll(() => {
+    utils.disconnectWebsocket(websocket);
+  });
+
+  describe('GET /admin/users', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get(`/admin/users`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require authorization', async () => {
+      const { status, body } = await request(app)
+        .get(`/admin/users`)
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
+      expect(status).toBe(403);
+      expect(body).toEqual(errorDto.forbidden);
+    });
+
+    it('should hide deleted users by default', async () => {
+      const { status, body } = await request(app)
+        .get(`/admin/users`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toHaveLength(4);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ email: admin.userEmail }),
+          expect.objectContaining({ email: nonAdmin.userEmail }),
+          expect.objectContaining({ email: userToDelete.userEmail }),
+          expect.objectContaining({ email: userToHardDelete.userEmail }),
+        ]),
+      );
+    });
+
+    it('should include deleted users', async () => {
+      const { status, body } = await request(app)
+        .get(`/admin/users?withDeleted=true`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(5);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ email: admin.userEmail }),
+          expect.objectContaining({ email: nonAdmin.userEmail }),
+          expect.objectContaining({ email: userToDelete.userEmail }),
+          expect.objectContaining({ email: userToHardDelete.userEmail }),
+          expect.objectContaining({ email: deletedUser.userEmail }),
+        ]),
+      );
+    });
+  });
+
+  describe('POST /admin/users', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).post(`/admin/users`).send(createUserDto.user1);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require authorization', async () => {
+      const { status, body } = await request(app)
+        .post(`/admin/users`)
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`)
+        .send(createUserDto.user1);
+      expect(status).toBe(403);
+      expect(body).toEqual(errorDto.forbidden);
+    });
+
+    for (const key of [
+      'password',
+      'email',
+      'name',
+      'quotaSizeInBytes',
+      'shouldChangePassword',
+      'memoriesEnabled',
+      'notify',
+    ]) {
+      it(`should not allow null ${key}`, async () => {
+        const { status, body } = await request(app)
+          .post(`/admin/users`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ ...createUserDto.user1, [key]: null });
+        expect(status).toBe(400);
+        expect(body).toEqual(errorDto.badRequest());
+      });
+    }
+
+    it('should ignore `isAdmin`', async () => {
+      const { status, body } = await request(app)
+        .post(`/admin/users`)
+        .send({
+          isAdmin: true,
+          email: 'user5@immich.cloud',
+          password: 'password123',
+          name: 'Immich',
+        })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(body).toMatchObject({
+        email: 'user5@immich.cloud',
+        isAdmin: false,
+        shouldChangePassword: true,
+      });
+      expect(status).toBe(201);
+    });
+
+    it('should create a user without memories enabled', async () => {
+      const { status, body } = await request(app)
+        .post(`/admin/users`)
+        .send({
+          email: 'no-memories@immich.cloud',
+          password: 'Password123',
+          name: 'No Memories',
+          memoriesEnabled: false,
+        })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(body).toMatchObject({
+        email: 'no-memories@immich.cloud',
+        memoriesEnabled: false,
+      });
+      expect(status).toBe(201);
+    });
+  });
+
+  describe('PUT /admin/users/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).put(`/admin/users/${uuidDto.notFound}`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require authorization', async () => {
+      const { status, body } = await request(app)
+        .put(`/admin/users/${uuidDto.notFound}`)
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
+      expect(status).toBe(403);
+      expect(body).toEqual(errorDto.forbidden);
+    });
+
+    for (const key of ['password', 'email', 'name', 'shouldChangePassword', 'memoriesEnabled']) {
+      it(`should not allow null ${key}`, async () => {
+        const { status, body } = await request(app)
+          .put(`/admin/users/${uuidDto.notFound}`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ [key]: null });
+        expect(status).toBe(400);
+        expect(body).toEqual(errorDto.badRequest());
+      });
+    }
+
+    it('should not allow a non-admin to become an admin', async () => {
+      const { status, body } = await request(app)
+        .put(`/admin/users/${nonAdmin.userId}`)
+        .send({ isAdmin: true })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({ isAdmin: false });
+    });
+
+    it('ignores updates to profileImagePath', async () => {
+      const { status, body } = await request(app)
+        .put(`/admin/users/${admin.userId}`)
+        .send({ profileImagePath: 'invalid.jpg' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({ id: admin.userId, profileImagePath: '' });
+    });
+
+    it('should update first and last name', async () => {
+      const before = await getUserAdmin({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+
+      const { status, body } = await request(app)
+        .put(`/admin/users/${admin.userId}`)
+        .send({ name: 'Name' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual({
+        ...before,
+        updatedAt: expect.any(String),
+        name: 'Name',
+      });
+      expect(before.updatedAt).not.toEqual(body.updatedAt);
+    });
+
+    it('should update memories enabled', async () => {
+      const before = await getUserAdmin({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const { status, body } = await request(app)
+        .put(`/admin/users/${admin.userId}`)
+        .send({ memoriesEnabled: false })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        ...before,
+        updatedAt: expect.anything(),
+        memoriesEnabled: false,
+      });
+      expect(before.updatedAt).not.toEqual(body.updatedAt);
+    });
+
+    it('should update password', async () => {
+      const { status, body } = await request(app)
+        .put(`/admin/users/${nonAdmin.userId}`)
+        .send({ password: 'super-secret' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({ email: nonAdmin.userEmail });
+
+      const token = await login({ loginCredentialDto: { email: nonAdmin.userEmail, password: 'super-secret' } });
+      expect(token.accessToken).toBeDefined();
+
+      const user = await getMyUser({ headers: asBearerAuth(token.accessToken) });
+      expect(user).toMatchObject({ email: nonAdmin.userEmail });
+    });
+  });
+
+  describe('DELETE /admin/users/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).delete(`/admin/users/${userToDelete.userId}`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require authorization', async () => {
+      const { status, body } = await request(app)
+        .delete(`/admin/users/${userToDelete.userId}`)
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
+      expect(status).toBe(403);
+      expect(body).toEqual(errorDto.forbidden);
+    });
+
+    it('should delete user', async () => {
+      const { status, body } = await request(app)
+        .delete(`/admin/users/${userToDelete.userId}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        id: userToDelete.userId,
+        updatedAt: expect.any(String),
+        deletedAt: expect.any(String),
+      });
+    });
+
+    it('should hard delete a user', async () => {
+      const { status, body } = await request(app)
+        .delete(`/admin/users/${userToHardDelete.userId}`)
+        .send({ force: true })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        id: userToHardDelete.userId,
+        updatedAt: expect.any(String),
+        deletedAt: expect.any(String),
+      });
+
+      await utils.waitForWebsocketEvent({ event: 'userDelete', id: userToHardDelete.userId, timeout: 5000 });
+    });
+  });
+
+  describe('POST /admin/users/:id/restore', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).post(`/admin/users/${userToDelete.userId}/restore`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require authorization', async () => {
+      const { status, body } = await request(app)
+        .post(`/admin/users/${userToDelete.userId}/restore`)
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
+      expect(status).toBe(403);
+      expect(body).toEqual(errorDto.forbidden);
+    });
+  });
+});

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

@@ -1,288 +1,105 @@
-import { LoginResponseDto, deleteUser, getUserById } from '@immich/sdk';
-import { Socket } from 'socket.io-client';
-import { createUserDto, userDto } from 'src/fixtures';
+import { LoginResponseDto, SharedLinkType, deleteUserAdmin, getMyUser, login } from '@immich/sdk';
+import { createUserDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
 import { app, asBearerAuth, utils } from 'src/utils';
 import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-describe('/user', () => {
-  let websocket: Socket;
+import { beforeAll, describe, expect, it } from 'vitest';
 
+describe('/users', () => {
   let admin: LoginResponseDto;
   let deletedUser: LoginResponseDto;
-  let userToDelete: LoginResponseDto;
-  let userToHardDelete: LoginResponseDto;
   let nonAdmin: LoginResponseDto;
 
   beforeAll(async () => {
     await utils.resetDatabase();
     admin = await utils.adminSetup({ onboarding: false });
 
-    [websocket, deletedUser, nonAdmin, userToDelete, userToHardDelete] = await Promise.all([
-      utils.connectWebsocket(admin.accessToken),
+    [deletedUser, nonAdmin] = await Promise.all([
       utils.userSetup(admin.accessToken, createUserDto.user1),
       utils.userSetup(admin.accessToken, createUserDto.user2),
-      utils.userSetup(admin.accessToken, createUserDto.user3),
-      utils.userSetup(admin.accessToken, createUserDto.user4),
     ]);
 
-    await deleteUser({ id: deletedUser.userId, deleteUserDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUserAdmin(
+      { id: deletedUser.userId, userAdminDeleteDto: {} },
+      { headers: asBearerAuth(admin.accessToken) },
+    );
   });
 
-  afterAll(() => {
-    utils.disconnectWebsocket(websocket);
-  });
-
-  describe('GET /user', () => {
+  describe('GET /users', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/user');
+      const { status, body } = await request(app).get('/users');
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
     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('/users').set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
-      expect(body).toHaveLength(5);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ email: 'admin@immich.cloud' }),
-          expect.objectContaining({ email: 'user1@immich.cloud' }),
-          expect.objectContaining({ email: 'user2@immich.cloud' }),
-          expect.objectContaining({ email: 'user3@immich.cloud' }),
-          expect.objectContaining({ email: 'user4@immich.cloud' }),
-        ]),
-      );
-    });
-
-    it('should hide deleted users', async () => {
-      const { status, body } = await request(app)
-        .get(`/user`)
-        .query({ isAll: true })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toHaveLength(4);
+      expect(body).toHaveLength(2);
       expect(body).toEqual(
         expect.arrayContaining([
           expect.objectContaining({ email: 'admin@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
-          expect.objectContaining({ email: 'user3@immich.cloud' }),
-          expect.objectContaining({ email: 'user4@immich.cloud' }),
-        ]),
-      );
-    });
-
-    it('should include deleted users', async () => {
-      const { status, body } = await request(app)
-        .get(`/user`)
-        .query({ isAll: false })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toHaveLength(5);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ email: 'admin@immich.cloud' }),
-          expect.objectContaining({ email: 'user1@immich.cloud' }),
-          expect.objectContaining({ email: 'user2@immich.cloud' }),
-          expect.objectContaining({ email: 'user3@immich.cloud' }),
-          expect.objectContaining({ email: 'user4@immich.cloud' }),
         ]),
       );
     });
   });
 
-  describe('GET /user/info/:id', () => {
+  describe('GET /users/me', () => {
     it('should require authentication', async () => {
-      const { status } = await request(app).get(`/user/info/${admin.userId}`);
-      expect(status).toEqual(401);
+      const { status, body } = await request(app).get(`/users/me`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
     });
 
-    it('should get the user info', async () => {
-      const { status, body } = await request(app)
-        .get(`/user/info/${admin.userId}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
+    it('should not work for shared links', async () => {
+      const album = await utils.createAlbum(admin.accessToken, { albumName: 'Album' });
+      const sharedLink = await utils.createSharedLink(admin.accessToken, {
+        type: SharedLinkType.Album,
+        albumId: album.id,
+      });
+      const { status, body } = await request(app).get(`/users/me?key=${sharedLink.key}`);
+      expect(status).toBe(403);
+      expect(body).toEqual(errorDto.forbidden);
+    });
+
+    it('should get my user', async () => {
+      const { status, body } = await request(app).get(`/users/me`).set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(200);
       expect(body).toMatchObject({
         id: admin.userId,
         email: 'admin@immich.cloud',
+        memoriesEnabled: true,
+        quotaUsageInBytes: 0,
       });
     });
   });
 
-  describe('GET /user/me', () => {
+  describe('PUT /users/me', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/user/me`);
+      const { status, body } = await request(app).put(`/users/me`);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
-    it('should get my info', async () => {
-      const { status, body } = await request(app).get(`/user/me`).set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: admin.userId,
-        email: 'admin@immich.cloud',
-      });
-    });
-  });
-
-  describe('POST /user', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/user`).send(createUserDto.user1);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    for (const key of Object.keys(createUserDto.user1)) {
+    for (const key of ['email', 'name', 'memoriesEnabled', 'avatarColor']) {
       it(`should not allow null ${key}`, async () => {
+        const dto = { [key]: null };
         const { status, body } = await request(app)
-          .post(`/user`)
+          .put(`/users/me`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ ...createUserDto.user1, [key]: null });
+          .send(dto);
         expect(status).toBe(400);
         expect(body).toEqual(errorDto.badRequest());
       });
     }
 
-    it('should ignore `isAdmin`', async () => {
-      const { status, body } = await request(app)
-        .post(`/user`)
-        .send({
-          isAdmin: true,
-          email: 'user5@immich.cloud',
-          password: 'password123',
-          name: 'Immich',
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(body).toMatchObject({
-        email: 'user5@immich.cloud',
-        isAdmin: false,
-        shouldChangePassword: true,
-      });
-      expect(status).toBe(201);
-    });
-
-    it('should create a user without memories enabled', async () => {
-      const { status, body } = await request(app)
-        .post(`/user`)
-        .send({
-          email: 'no-memories@immich.cloud',
-          password: 'Password123',
-          name: 'No Memories',
-          memoriesEnabled: false,
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(body).toMatchObject({
-        email: 'no-memories@immich.cloud',
-        memoriesEnabled: false,
-      });
-      expect(status).toBe(201);
-    });
-  });
-
-  describe('DELETE /user/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/user/${userToDelete.userId}`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should delete user', async () => {
-      const { status, body } = await request(app)
-        .delete(`/user/${userToDelete.userId}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: userToDelete.userId,
-        updatedAt: expect.any(String),
-        deletedAt: expect.any(String),
-      });
-    });
-
-    it('should hard delete user', async () => {
-      const { status, body } = await request(app)
-        .delete(`/user/${userToHardDelete.userId}`)
-        .send({ force: true })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: userToHardDelete.userId,
-        updatedAt: expect.any(String),
-        deletedAt: expect.any(String),
-      });
-
-      await utils.waitForWebsocketEvent({ event: 'userDelete', id: userToHardDelete.userId, timeout: 5000 });
-    });
-  });
-
-  describe('PUT /user', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/user`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    for (const key of Object.keys(userDto.admin)) {
-      it(`should not allow null ${key}`, async () => {
-        const { status, body } = await request(app)
-          .put(`/user`)
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ ...userDto.admin, [key]: null });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      });
-    }
-
-    it('should not allow a non-admin to become an admin', async () => {
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({ isAdmin: true, id: nonAdmin.userId })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.alreadyHasAdmin);
-    });
-
-    it('ignores updates to profileImagePath', async () => {
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({ id: admin.userId, profileImagePath: 'invalid.jpg' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ id: admin.userId, profileImagePath: '' });
-    });
-
-    it('should ignore updates to createdAt, updatedAt and deletedAt', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
-
-      const { status, body } = await request(app)
-        .put(`/user`)
-        .send({
-          id: admin.userId,
-          createdAt: '2023-01-01T00:00:00.000Z',
-          updatedAt: '2023-01-01T00:00:00.000Z',
-          deletedAt: '2023-01-01T00:00:00.000Z',
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toStrictEqual(before);
-    });
-
     it('should update first and last name', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getMyUser({ headers: asBearerAuth(admin.accessToken) });
 
       const { status, body } = await request(app)
-        .put(`/user`)
-        .send({
-          id: admin.userId,
-          name: 'Name',
-        })
+        .put(`/users/me`)
+        .send({ name: 'Name' })
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -291,17 +108,13 @@ describe('/user', () => {
         updatedAt: expect.any(String),
         name: 'Name',
       });
-      expect(before.updatedAt).not.toEqual(body.updatedAt);
     });
 
     it('should update memories enabled', async () => {
-      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
+      const before = await getMyUser({ headers: asBearerAuth(admin.accessToken) });
       const { status, body } = await request(app)
-        .put(`/user`)
-        .send({
-          id: admin.userId,
-          memoriesEnabled: false,
-        })
+        .put(`/users/me`)
+        .send({ memoriesEnabled: false })
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -310,7 +123,80 @@ describe('/user', () => {
         updatedAt: expect.anything(),
         memoriesEnabled: false,
       });
-      expect(before.updatedAt).not.toEqual(body.updatedAt);
+
+      const after = await getMyUser({ headers: asBearerAuth(admin.accessToken) });
+      expect(after.memoriesEnabled).toBe(false);
+    });
+
+    /** @deprecated */
+    it('should allow a user to change their password (deprecated)', async () => {
+      const user = await getMyUser({ headers: asBearerAuth(nonAdmin.accessToken) });
+
+      expect(user.shouldChangePassword).toBe(true);
+
+      const { status, body } = await request(app)
+        .put(`/users/me`)
+        .send({ password: 'super-secret' })
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        email: nonAdmin.userEmail,
+        shouldChangePassword: false,
+      });
+
+      const token = await login({ loginCredentialDto: { email: nonAdmin.userEmail, password: 'super-secret' } });
+
+      expect(token.accessToken).toBeDefined();
+    });
+
+    it('should not allow user to change to a taken email', async () => {
+      const { status, body } = await request(app)
+        .put(`/users/me`)
+        .send({ email: 'admin@immich.cloud' })
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
+
+      expect(status).toBe(400);
+      expect(body).toMatchObject(errorDto.badRequest('Email already in use by another account'));
+    });
+
+    it('should update my email', async () => {
+      const before = await getMyUser({ headers: asBearerAuth(nonAdmin.accessToken) });
+      const { status, body } = await request(app)
+        .put(`/users/me`)
+        .send({ email: 'non-admin@immich.cloud' })
+        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        ...before,
+        email: 'non-admin@immich.cloud',
+        updatedAt: expect.anything(),
+      });
+    });
+  });
+
+  describe('GET /users/:id', () => {
+    it('should require authentication', async () => {
+      const { status } = await request(app).get(`/users/${admin.userId}`);
+      expect(status).toEqual(401);
+    });
+
+    it('should get the user', async () => {
+      const { status, body } = await request(app)
+        .get(`/users/${admin.userId}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        id: admin.userId,
+        email: 'admin@immich.cloud',
+      });
+
+      expect(body).not.toMatchObject({
+        shouldChangePassword: expect.anything(),
+        memoriesEnabled: expect.anything(),
+        storageLabel: expect.anything(),
+      });
     });
   });
 });

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

@@ -1,4 +1,4 @@
-import { LoginResponseDto, getAllAlbums, getAllAssets } from '@immich/sdk';
+import { LoginResponseDto, getAllAlbums, getAssetStatistics } from '@immich/sdk';
 import { readFileSync } from 'node:fs';
 import { mkdir, readdir, rm, symlink } from 'node:fs/promises';
 import { asKeyAuth, immichCli, testAssetDir, utils } from 'src/utils';
@@ -28,8 +28,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(1);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(1);
     });
 
     it('should skip a duplicate file', async () => {
@@ -40,8 +40,8 @@ describe(`immich upload`, () => {
       );
       expect(first.exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(1);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(1);
 
       const second = await immichCli(['upload', `${testAssetDir}/albums/nature/silver_fir.jpg`]);
       expect(second.stderr).toBe('');
@@ -60,8 +60,8 @@ describe(`immich upload`, () => {
       expect(stdout.split('\n')).toEqual(expect.arrayContaining([expect.stringContaining('No files found, exiting')]));
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(0);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(0);
     });
 
     it('should have accurate dry run', async () => {
@@ -76,8 +76,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(0);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(0);
     });
 
     it('dry run should handle duplicates', async () => {
@@ -88,8 +88,8 @@ describe(`immich upload`, () => {
       );
       expect(first.exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(1);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(1);
 
       const second = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--dry-run']);
       expect(second.stderr).toBe('');
@@ -112,8 +112,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(9);
     });
   });
 
@@ -135,8 +135,8 @@ describe(`immich upload`, () => {
       expect(stderr).toBe('');
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(9);
 
       const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums.length).toBe(1);
@@ -151,8 +151,8 @@ describe(`immich upload`, () => {
       expect(response1.stderr).toBe('');
       expect(response1.exitCode).toBe(0);
 
-      const assets1 = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets1.length).toBe(9);
+      const assets1 = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets1.total).toBe(9);
 
       const albums1 = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums1.length).toBe(0);
@@ -167,8 +167,8 @@ describe(`immich upload`, () => {
       expect(response2.stderr).toBe('');
       expect(response2.exitCode).toBe(0);
 
-      const assets2 = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets2.length).toBe(9);
+      const assets2 = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets2.total).toBe(9);
 
       const albums2 = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums2.length).toBe(1);
@@ -193,8 +193,8 @@ describe(`immich upload`, () => {
       expect(stderr).toBe('');
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(0);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(0);
 
       const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums.length).toBe(0);
@@ -219,8 +219,8 @@ describe(`immich upload`, () => {
       expect(stderr).toBe('');
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(9);
 
       const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums.length).toBe(1);
@@ -245,8 +245,8 @@ describe(`immich upload`, () => {
       expect(stderr).toBe('');
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(0);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(0);
 
       const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
       expect(albums.length).toBe(0);
@@ -276,8 +276,8 @@ describe(`immich upload`, () => {
       expect(stderr).toBe('');
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(9);
     });
 
     it('should have accurate dry run', async () => {
@@ -302,8 +302,8 @@ describe(`immich upload`, () => {
       expect(stderr).toBe('');
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(0);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(0);
     });
   });
 
@@ -328,8 +328,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(1);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(1);
     });
 
     it('should throw an error if attempting dry run', async () => {
@@ -344,8 +344,8 @@ describe(`immich upload`, () => {
       expect(stderr).toEqual(`error: option '-n, --dry-run' cannot be used with option '-h, --skip-hash'`);
       expect(exitCode).not.toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(0);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(0);
     });
   });
 
@@ -367,8 +367,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(9);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(9);
     });
 
     it('should reject string argument', async () => {
@@ -408,8 +408,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(8);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(8);
     });
 
     it('should ignore assets matching glob pattern', async () => {
@@ -429,8 +429,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(1);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(1);
     });
 
     it('should have accurate dry run', async () => {
@@ -451,8 +451,8 @@ describe(`immich upload`, () => {
       );
       expect(exitCode).toBe(0);
 
-      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
-      expect(assets.length).toBe(0);
+      const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
+      expect(assets.total).toBe(0);
     });
   });
 });

e2e/src/utils.ts

@@ -5,19 +5,19 @@ import {
   CreateAlbumDto,
   CreateAssetDto,
   CreateLibraryDto,
-  CreateUserDto,
   MetadataSearchDto,
   PersonCreateDto,
   SharedLinkCreateDto,
+  UserAdminCreateDto,
   ValidateLibraryDto,
   createAlbum,
   createApiKey,
   createLibrary,
+  createPartner,
   createPerson,
   createSharedLink,
-  createUser,
+  createUserAdmin,
   deleteAssets,
-  getAllAssets,
   getAllJobsStatus,
   getAssetInfo,
   getConfigDefaults,
@@ -273,8 +273,8 @@ export const utils = {
     return response;
   },
 
-  userSetup: async (accessToken: string, dto: CreateUserDto) => {
-    await createUser({ createUserDto: dto }, { headers: asBearerAuth(accessToken) });
+  userSetup: async (accessToken: string, dto: UserAdminCreateDto) => {
+    await createUserAdmin({ userAdminCreateDto: dto }, { headers: asBearerAuth(accessToken) });
     return login({
       loginCredentialDto: { email: dto.email, password: dto.password },
     });
@@ -340,8 +340,6 @@ export const utils = {
 
   getAssetInfo: (accessToken: string, id: string) => getAssetInfo({ id }, { headers: asBearerAuth(accessToken) }),
 
-  getAllAssets: (accessToken: string) => getAllAssets({}, { headers: asBearerAuth(accessToken) }),
-
   metadataSearch: async (accessToken: string, dto: MetadataSearchDto) => {
     return searchMetadata({ metadataSearchDto: dto }, { headers: asBearerAuth(accessToken) });
   },
@@ -388,6 +386,8 @@ export const utils = {
   validateLibrary: (accessToken: string, id: string, dto: ValidateLibraryDto) =>
     validate({ id, validateLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
 
+  createPartner: (accessToken: string, id: string) => createPartner({ id }, { headers: asBearerAuth(accessToken) }),
+
   setAuthCookies: async (context: BrowserContext, accessToken: string) =>
     await context.addCookies([
       {

e2e/src/web/specs/asset-viewer/detail-panel.e2e-spec.ts

@@ -0,0 +1,60 @@
+import { AssetFileUploadResponseDto, LoginResponseDto, SharedLinkType } from '@immich/sdk';
+import { expect, test } from '@playwright/test';
+import { utils } from 'src/utils';
+
+test.describe('Detail Panel', () => {
+  let admin: LoginResponseDto;
+  let asset: AssetFileUploadResponseDto;
+
+  test.beforeAll(async () => {
+    utils.initSdk();
+    await utils.resetDatabase();
+    admin = await utils.adminSetup();
+    asset = await utils.createAsset(admin.accessToken);
+  });
+
+  test('can be opened for shared links', async ({ page }) => {
+    const sharedLink = await utils.createSharedLink(admin.accessToken, {
+      type: SharedLinkType.Individual,
+      assetIds: [asset.id],
+    });
+    await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
+    await page.waitForSelector('#immich-asset-viewer');
+
+    await expect(page.getByRole('button', { name: 'Info' })).toBeVisible();
+    await page.keyboard.press('i');
+    await expect(page.locator('#detail-panel')).toBeVisible();
+    await page.keyboard.press('i');
+    await expect(page.locator('#detail-panel')).toHaveCount(0);
+  });
+
+  test('cannot be opened for shared links with hidden metadata', async ({ page }) => {
+    const sharedLink = await utils.createSharedLink(admin.accessToken, {
+      type: SharedLinkType.Individual,
+      assetIds: [asset.id],
+      showMetadata: false,
+    });
+    await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
+    await page.waitForSelector('#immich-asset-viewer');
+
+    await expect(page.getByRole('button', { name: 'Info' })).toHaveCount(0);
+    await page.keyboard.press('i');
+    await expect(page.locator('#detail-panel')).toHaveCount(0);
+    await page.keyboard.press('i');
+    await expect(page.locator('#detail-panel')).toHaveCount(0);
+  });
+
+  test('description is visible for owner on shared links', async ({ context, page }) => {
+    const sharedLink = await utils.createSharedLink(admin.accessToken, {
+      type: SharedLinkType.Individual,
+      assetIds: [asset.id],
+    });
+    await utils.setAuthCookies(context, admin.accessToken);
+    await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
+
+    const textarea = page.getByRole('textbox', { name: 'Add a description' });
+    await page.getByRole('button', { name: 'Info' }).click();
+    await expect(textarea).toBeVisible();
+    await expect(textarea).not.toBeDisabled();
+  });
+});

e2e/src/web/specs/asset-viewer/navbar.e2e-spec.ts

@@ -0,0 +1,52 @@
+import { AssetFileUploadResponseDto, LoginResponseDto, SharedLinkType } from '@immich/sdk';
+import { expect, test } from '@playwright/test';
+import { utils } from 'src/utils';
+
+test.describe('Asset Viewer Navbar', () => {
+  let admin: LoginResponseDto;
+  let asset: AssetFileUploadResponseDto;
+
+  test.beforeAll(async () => {
+    utils.initSdk();
+    await utils.resetDatabase();
+    admin = await utils.adminSetup();
+    asset = await utils.createAsset(admin.accessToken);
+  });
+
+  test.describe('shared link without metadata', () => {
+    test('visible guest actions', async ({ page }) => {
+      const sharedLink = await utils.createSharedLink(admin.accessToken, {
+        type: SharedLinkType.Individual,
+        assetIds: [asset.id],
+        showMetadata: false,
+      });
+      await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
+      await page.waitForSelector('#immich-asset-viewer');
+
+      const expected = ['Zoom Image', 'Copy Image', 'Download'];
+      const buttons = await page.getByTestId('asset-viewer-navbar-actions').getByRole('button').all();
+
+      for (const [i, button] of buttons.entries()) {
+        await expect(button).toHaveAccessibleName(expected[i]);
+      }
+    });
+
+    test('visible owner actions', async ({ context, page }) => {
+      const sharedLink = await utils.createSharedLink(admin.accessToken, {
+        type: SharedLinkType.Individual,
+        assetIds: [asset.id],
+        showMetadata: false,
+      });
+      await utils.setAuthCookies(context, admin.accessToken);
+      await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
+      await page.waitForSelector('#immich-asset-viewer');
+
+      const expected = ['Share', 'Zoom Image', 'Copy Image', 'Download'];
+      const buttons = await page.getByTestId('asset-viewer-navbar-actions').getByRole('button').all();
+
+      for (const [i, button] of buttons.entries()) {
+        await expect(button).toHaveAccessibleName(expected[i]);
+      }
+    });
+  });
+});

machine-learning/Dockerfile

@@ -95,3 +95,5 @@ COPY start.sh log_conf.json ./
 COPY app .
 ENTRYPOINT ["tini", "--"]
 CMD ["./start.sh"]
+
+HEALTHCHECK CMD python3 healthcheck.py

machine-learning/app/healthcheck.py

@@ -0,0 +1,14 @@
+import os
+import sys
+
+import requests
+
+port = os.getenv("IMMICH_PORT", 3003)
+
+try:
+    response = requests.get(f"http://localhost:{port}/ping", timeout=2)
+    if response.status_code == 200:
+        sys.exit(0)
+    sys.exit(1)
+except requests.RequestException:
+    sys.exit(1)

misc/release/pump-version.sh

@@ -62,6 +62,8 @@ fi
 if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
   echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER"
   npm --prefix server version "$SERVER_PUMP"
+  npm --prefix server ci
+  npm --prefix server run build
   make open-api
   npm --prefix open-api/typescript-sdk version "$SERVER_PUMP"
   npm --prefix web version "$SERVER_PUMP"

mobile/android/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.931.0)
+    aws-partitions (1.932.0)
     aws-sdk-core (3.196.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)

mobile/android/app/build.gradle

@@ -82,7 +82,7 @@ flutter {
 
 dependencies {
     def kotlin_version = '1.9.24'
-    def kotlin_coroutines_version = '1.8.0'
+    def kotlin_coroutines_version = '1.8.1'
     def work_version = '2.9.0'
     def concurrent_version = '1.1.0'
     def guava_version = '33.2.0-android'

mobile/ios/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.931.0)
+    aws-partitions (1.932.0)
     aws-sdk-core (3.196.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)

mobile/lib/entities/album.entity.dart

@@ -145,9 +145,10 @@ class Album {
           .remoteIdEqualTo(dto.albumThumbnailAssetId)
           .findFirst();
     }
-    if (dto.sharedUsers.isNotEmpty) {
-      final users = await db.users
-          .getAllById(dto.sharedUsers.map((e) => e.id).toList(growable: false));
+    if (dto.albumUsers.isNotEmpty) {
+      final users = await db.users.getAllById(
+        dto.albumUsers.map((e) => e.user.id).toList(growable: false),
+      );
       a.sharedUsers.addAll(users.cast());
     }
     if (dto.assets.isNotEmpty) {

mobile/lib/entities/user.entity.dart

@@ -27,7 +27,7 @@ class User {
 
   Id get isarId => fastHash(id);
 
-  User.fromUserDto(UserResponseDto dto)
+  User.fromUserDto(UserAdminResponseDto dto)
       : id = dto.id,
         updatedAt = dto.updatedAt,
         email = dto.email,
@@ -44,21 +44,21 @@ class User {
 
   User.fromPartnerDto(PartnerResponseDto dto)
       : id = dto.id,
-        updatedAt = dto.updatedAt,
+        updatedAt = DateTime.now(),
         email = dto.email,
         name = dto.name,
         isPartnerSharedBy = false,
         isPartnerSharedWith = false,
         profileImagePath = dto.profileImagePath,
-        isAdmin = dto.isAdmin,
-        memoryEnabled = dto.memoriesEnabled ?? false,
+        isAdmin = false,
+        memoryEnabled = false,
         avatarColor = dto.avatarColor.toAvatarColor(),
         inTimeline = dto.inTimeline ?? false,
-        quotaUsageInBytes = dto.quotaUsageInBytes ?? 0,
-        quotaSizeInBytes = dto.quotaSizeInBytes ?? 0;
+        quotaUsageInBytes = 0,
+        quotaSizeInBytes = 0;
 
   /// Base user dto used where the complete user object is not required
-  User.fromSimpleUserDto(UserDto dto)
+  User.fromSimpleUserDto(UserResponseDto dto)
       : id = dto.id,
         email = dto.email,
         name = dto.name,

mobile/lib/models/server_info/server_disk_info.model.dart

@@ -32,7 +32,7 @@ class ServerDiskInfo {
     return 'ServerDiskInfo(diskAvailable: $diskAvailable, diskSize: $diskSize, diskUse: $diskUse, diskUsagePercentage: $diskUsagePercentage)';
   }
 
-  ServerDiskInfo.fromDto(ServerInfoResponseDto dto)
+  ServerDiskInfo.fromDto(ServerStorageResponseDto dto)
       : diskAvailable = dto.diskAvailable,
         diskSize = dto.diskSize,
         diskUse = dto.diskUse,

mobile/lib/pages/common/album_viewer.page.dart

@@ -133,7 +133,7 @@ class AlbumViewerPage extends HookConsumerWidget {
 
     Widget buildTitle(Album album) {
       return Padding(
-        padding: const EdgeInsets.only(left: 8, right: 8, top: 24),
+        padding: const EdgeInsets.only(left: 8, right: 8),
         child: userId == album.ownerId && album.isRemote
             ? AlbumViewerEditableTitle(
                 album: album,
@@ -228,9 +228,30 @@ class AlbumViewerPage extends HookConsumerWidget {
     }
 
     return Scaffold(
-      appBar: ref.watch(multiselectProvider)
-          ? null
-          : album.when(
+      body: Stack(
+        children: [
+          album.widgetWhen(
+            onData: (data) => MultiselectGrid(
+              renderListProvider: albumRenderlistProvider(albumId),
+              topWidget: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  buildHeader(data),
+                  if (data.isRemote) buildControlButton(data),
+                ],
+              ),
+              onRemoveFromAlbum: onRemoveFromAlbumPressed,
+              editEnabled: data.ownerId == userId,
+            ),
+          ),
+          AnimatedPositioned(
+            duration: const Duration(milliseconds: 300),
+            top: ref.watch(multiselectProvider)
+                ? -(kToolbarHeight + MediaQuery.of(context).padding.top)
+                : 0,
+            left: 0,
+            right: 0,
+            child: album.when(
               data: (data) => AlbumViewerAppbar(
                 titleFocusNode: titleFocusNode,
                 album: data,
@@ -242,19 +263,8 @@ class AlbumViewerPage extends HookConsumerWidget {
               error: (error, stackTrace) => AppBar(title: const Text("Error")),
               loading: () => AppBar(),
             ),
-      body: album.widgetWhen(
-        onData: (data) => MultiselectGrid(
-          renderListProvider: albumRenderlistProvider(albumId),
-          topWidget: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              buildHeader(data),
-              if (data.isRemote) buildControlButton(data),
-            ],
           ),
-          onRemoveFromAlbum: onRemoveFromAlbumPressed,
-          editEnabled: data.ownerId == userId,
-        ),
+        ],
       ),
     );
   }

mobile/lib/providers/authentication.provider.dart

@@ -138,11 +138,9 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
 
   Future<bool> changePassword(String newPassword) async {
     try {
-      await _apiService.userApi.updateUser(
-        UpdateUserDto(
-          id: state.userId,
+      await _apiService.userApi.updateMyUser(
+        UserUpdateMeDto(
           password: newPassword,
-          shouldChangePassword: false,
         ),
       );
 
@@ -178,9 +176,9 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
       user = offlineUser;
       retResult = false;
     } else {
-      UserResponseDto? userResponseDto;
+      UserAdminResponseDto? userResponseDto;
       try {
-        userResponseDto = await _apiService.userApi.getMyUserInfo();
+        userResponseDto = await _apiService.userApi.getMyUser();
       } on ApiException catch (error, stackTrace) {
         _log.severe(
           "Error getting user information from the server [API EXCEPTION]",

mobile/lib/providers/backup/backup.provider.dart

@@ -374,7 +374,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
 
     if (state.backupProgress != BackUpProgressEnum.inBackground) {
       await _getBackupAlbumsInfo();
-      await updateServerInfo();
+      await updateDiskInfo();
       await _updateBackupAssetCount();
     } else {
       log.warning("cannot get backup info - background backup is in progress!");
@@ -542,7 +542,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       _updatePersistentAlbumsSelection();
     }
 
-    updateServerInfo();
+    updateDiskInfo();
   }
 
   void _onUploadProgress(int sent, int total) {
@@ -579,13 +579,13 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     );
   }
 
-  Future<void> updateServerInfo() async {
-    final serverInfo = await _serverInfoService.getServerInfo();
+  Future<void> updateDiskInfo() async {
+    final diskInfo = await _serverInfoService.getDiskInfo();
 
     // Update server info
-    if (serverInfo != null) {
+    if (diskInfo != null) {
       state = state.copyWith(
-        serverInfo: serverInfo,
+        serverInfo: diskInfo,
       );
     }
   }

mobile/lib/providers/backup/manual_upload.provider.dart

@@ -121,7 +121,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
     bool isDuplicated,
   ) {
     state = state.copyWith(successfulUploads: state.successfulUploads + 1);
-    _backupProvider.updateServerInfo();
+    _backupProvider.updateDiskInfo();
   }
 
   void _onAssetUploadError(ErrorUploadAsset errorAssetInfo) {

mobile/lib/providers/user.provider.dart

@@ -20,7 +20,7 @@ class CurrentUserProvider extends StateNotifier<User?> {
 
   refresh() async {
     try {
-      final user = await _apiService.userApi.getMyUserInfo();
+      final user = await _apiService.userApi.getMyUser();
       if (user != null) {
         Store.put(
           StoreKey.currentUser,

mobile/lib/routing/tab_navigation_observer.dart

@@ -57,7 +57,7 @@ class TabNavigationObserver extends AutoRouterObserver {
       // Update user info
       try {
         final userResponseDto =
-            await ref.read(apiServiceProvider).userApi.getMyUserInfo();
+            await ref.read(apiServiceProvider).userApi.getMyUser();
 
         if (userResponseDto == null) {
           return;

mobile/lib/services/album.service.dart

@@ -180,7 +180,14 @@ class AlbumService {
         CreateAlbumDto(
           albumName: albumName,
           assetIds: assets.map((asset) => asset.remoteId!).toList(),
-          sharedWithUserIds: sharedUsers.map((e) => e.id).toList(),
+          albumUsers: sharedUsers
+              .map(
+                (e) => AlbumUserCreateDto(
+                  userId: e.id,
+                  role: AlbumUserRole.editor,
+                ),
+              )
+              .toList(),
         ),
       );
       if (remote != null) {

mobile/lib/services/background.service.dart

@@ -20,6 +20,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/backup_progress.dart';
 import 'package:immich_mobile/utils/diff.dart';
+import 'package:immich_mobile/utils/http_ssl_cert_override.dart';
 import 'package:isar/isar.dart';
 import 'package:path_provider_ios/path_provider_ios.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -590,6 +591,7 @@ enum IosBackgroundTask { fetch, processing }
 /// entry point called by Kotlin/Java code; needs to be a top-level function
 @pragma('vm:entry-point')
 void _nativeEntry() {
+  HttpOverrides.global = HttpSSLCertOverride();
   WidgetsFlutterBinding.ensureInitialized();
   DartPluginRegistrant.ensureInitialized();
   BackgroundService backgroundService = BackgroundService();

mobile/lib/services/memory.service.dart

@@ -8,6 +8,8 @@ import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
+import '../utils/string_helper.dart';
+
 final memoryServiceProvider = StateProvider<MemoryService>((ref) {
   return MemoryService(
     ref.watch(apiServiceProvider),
@@ -36,13 +38,13 @@ class MemoryService {
       }
 
       List<Memory> memories = [];
-      for (final MemoryLaneResponseDto(:title, :assets) in data) {
+      for (final MemoryLaneResponseDto(:yearsAgo, :assets) in data) {
         final dbAssets =
             await _db.assets.getAllByRemoteId(assets.map((e) => e.id));
         if (dbAssets.isNotEmpty) {
           memories.add(
             Memory(
-              title: title,
+              title: '$yearsAgo year${s(yearsAgo)} ago',
               assets: dbAssets,
             ),
           );

mobile/lib/services/server_info.service.dart

@@ -18,14 +18,14 @@ class ServerInfoService {
 
   ServerInfoService(this._apiService);
 
-  Future<ServerDiskInfo?> getServerInfo() async {
+  Future<ServerDiskInfo?> getDiskInfo() async {
     try {
-      final dto = await _apiService.serverInfoApi.getServerInfo();
+      final dto = await _apiService.serverInfoApi.getStorage();
       if (dto != null) {
         return ServerDiskInfo.fromDto(dto);
       }
     } catch (e) {
-      debugPrint("Error [getServerInfo] ${e.toString()}");
+      debugPrint("Error [getDiskInfo] ${e.toString()}");
     }
     return null;
   }

mobile/lib/services/sync.service.dart

@@ -362,15 +362,15 @@ class SyncService {
     // update shared users
     final List<User> sharedUsers = album.sharedUsers.toList(growable: false);
     sharedUsers.sort((a, b) => a.id.compareTo(b.id));
-    dto.sharedUsers.sort((a, b) => a.id.compareTo(b.id));
+    dto.albumUsers.sort((a, b) => a.user.id.compareTo(b.user.id));
     final List<String> userIdsToAdd = [];
     final List<User> usersToUnlink = [];
     diffSortedListsSync(
-      dto.sharedUsers,
+      dto.albumUsers,
       sharedUsers,
-      compare: (UserResponseDto a, User b) => a.id.compareTo(b.id),
+      compare: (AlbumUserResponseDto a, User b) => a.user.id.compareTo(b.id),
       both: (a, b) => false,
-      onlyFirst: (UserResponseDto a) => userIdsToAdd.add(a.id),
+      onlyFirst: (AlbumUserResponseDto a) => userIdsToAdd.add(a.user.id),
       onlySecond: (User a) => usersToUnlink.add(a),
     );
 
@@ -905,7 +905,7 @@ bool _hasAlbumResponseDtoChanged(AlbumResponseDto dto, Album a) {
       dto.albumName != a.name ||
       dto.albumThumbnailAssetId != a.thumbnail.value?.remoteId ||
       dto.shared != a.shared ||
-      dto.sharedUsers.length != a.sharedUsers.length ||
+      dto.albumUsers.length != a.sharedUsers.length ||
       !dto.updatedAt.isAtSameMomentAs(a.modifiedAt) ||
       !isAtSameMomentAs(dto.startDate, a.startDate) ||
       !isAtSameMomentAs(dto.endDate, a.endDate) ||

mobile/lib/services/user.service.dart

@@ -37,10 +37,10 @@ class UserService {
     this._partnerService,
   );
 
-  Future<List<User>?> _getAllUsers({required bool isAll}) async {
+  Future<List<User>?> _getAllUsers() async {
     try {
-      final dto = await _apiService.userApi.getAllUsers(isAll);
-      return dto?.map(User.fromUserDto).toList();
+      final dto = await _apiService.userApi.searchUsers();
+      return dto?.map(User.fromSimpleUserDto).toList();
     } catch (e) {
       _log.warning("Failed get all users", e);
       return null;
@@ -71,7 +71,7 @@ class UserService {
   }
 
   Future<List<User>?> getUsersFromServer() async {
-    final List<User>? users = await _getAllUsers(isAll: true);
+    final List<User>? users = await _getAllUsers();
     final List<User>? sharedBy =
         await _partnerService.getPartners(PartnerDirection.sharedBy);
     final List<User>? sharedWith =

mobile/lib/utils/image_url_builder.dart

@@ -77,5 +77,5 @@ String getThumbnailUrlForRemoteId(
 }
 
 String getFaceThumbnailUrl(final String personId) {
-  return '${Store.get(StoreKey.serverEndpoint)}/person/$personId/thumbnail';
+  return '${Store.get(StoreKey.serverEndpoint)}/people/$personId/thumbnail';
 }

mobile/lib/utils/string_helper.dart

@@ -3,3 +3,5 @@ extension StringExtension on String {
     return "${this[0].toUpperCase()}${substring(1).toLowerCase()}";
   }
 }
+
+String s(num count) => (count == 1 ? '' : 's');

mobile/lib/widgets/album/album_viewer_editable_title.dart

@@ -36,58 +36,62 @@ class AlbumViewerEditableTitle extends HookConsumerWidget {
       [],
     );
 
-    return TextField(
-      onChanged: (value) {
-        if (value.isEmpty) {
-        } else {
-          ref.watch(albumViewerProvider.notifier).setEditTitleText(value);
-        }
-      },
-      focusNode: titleFocusNode,
-      style: context.textTheme.headlineMedium,
-      controller: titleTextEditController,
-      onTap: () {
-        FocusScope.of(context).requestFocus(titleFocusNode);
+    return Material(
+      color: Colors.transparent,
+      child: TextField(
+        onChanged: (value) {
+          if (value.isEmpty) {
+          } else {
+            ref.watch(albumViewerProvider.notifier).setEditTitleText(value);
+          }
+        },
+        focusNode: titleFocusNode,
+        style: context.textTheme.headlineMedium,
+        controller: titleTextEditController,
+        onTap: () {
+          FocusScope.of(context).requestFocus(titleFocusNode);
 
-        ref.watch(albumViewerProvider.notifier).setEditTitleText(album.name);
-        ref.watch(albumViewerProvider.notifier).enableEditAlbum();
+          ref.watch(albumViewerProvider.notifier).setEditTitleText(album.name);
+          ref.watch(albumViewerProvider.notifier).enableEditAlbum();
 
-        if (titleTextEditController.text == 'Untitled') {
-          titleTextEditController.clear();
-        }
-      },
-      decoration: InputDecoration(
-        contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
-        suffixIcon: titleFocusNode.hasFocus
-            ? IconButton(
-                onPressed: () {
-                  titleTextEditController.clear();
-                },
-                icon: Icon(
-                  Icons.cancel_rounded,
-                  color: context.primaryColor,
-                ),
-                splashRadius: 10,
-              )
-            : null,
-        enabledBorder: OutlineInputBorder(
-          borderSide: const BorderSide(color: Colors.transparent),
-          borderRadius: BorderRadius.circular(10),
-        ),
-        focusedBorder: OutlineInputBorder(
-          borderSide: const BorderSide(color: Colors.transparent),
-          borderRadius: BorderRadius.circular(10),
-        ),
-        focusColor: Colors.grey[300],
-        fillColor: context.isDarkTheme
-            ? const Color.fromARGB(255, 32, 33, 35)
-            : Colors.grey[200],
-        filled: titleFocusNode.hasFocus,
-        hintText: 'share_add_title'.tr(),
-        hintStyle: TextStyle(
-          fontSize: 28,
-          color: context.isDarkTheme ? Colors.grey[300] : Colors.grey[700],
-          fontWeight: FontWeight.bold,
+          if (titleTextEditController.text == 'Untitled') {
+            titleTextEditController.clear();
+          }
+        },
+        decoration: InputDecoration(
+          contentPadding:
+              const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+          suffixIcon: titleFocusNode.hasFocus
+              ? IconButton(
+                  onPressed: () {
+                    titleTextEditController.clear();
+                  },
+                  icon: Icon(
+                    Icons.cancel_rounded,
+                    color: context.primaryColor,
+                  ),
+                  splashRadius: 10,
+                )
+              : null,
+          enabledBorder: OutlineInputBorder(
+            borderSide: const BorderSide(color: Colors.transparent),
+            borderRadius: BorderRadius.circular(10),
+          ),
+          focusedBorder: OutlineInputBorder(
+            borderSide: const BorderSide(color: Colors.transparent),
+            borderRadius: BorderRadius.circular(10),
+          ),
+          focusColor: Colors.grey[300],
+          fillColor: context.isDarkTheme
+              ? const Color.fromARGB(255, 32, 33, 35)
+              : Colors.grey[200],
+          filled: titleFocusNode.hasFocus,
+          hintText: 'share_add_title'.tr(),
+          hintStyle: TextStyle(
+            fontSize: 28,
+            color: context.isDarkTheme ? Colors.grey[300] : Colors.grey[700],
+            fontWeight: FontWeight.bold,
+          ),
         ),
       ),
     );

mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart

@@ -238,8 +238,10 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
     }
 
     bool appBarOffset() {
-      return ref.watch(tabProvider).index == 0 &&
-          ModalRoute.of(context)?.settings.name == TabControllerRoute.name;
+      return (ref.watch(tabProvider).index == 0 &&
+              ModalRoute.of(context)?.settings.name ==
+                  TabControllerRoute.name) ||
+          (ModalRoute.of(context)?.settings.name == AlbumViewerRoute.name);
     }
 
     final listWidget = ScrollablePositionedList.builder(

mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart

@@ -31,7 +31,7 @@ class ImmichAppBarDialog extends HookConsumerWidget {
 
     useEffect(
       () {
-        ref.read(backupProvider.notifier).updateServerInfo();
+        ref.read(backupProvider.notifier).updateDiskInfo();
         ref.read(currentUserProvider.notifier).refresh();
         return null;
       },

mobile/lib/widgets/common/location_picker.dart

@@ -215,7 +215,7 @@ class _ManualPicker extends HookWidget {
           decorationText: "location_picker_longitude",
           hintText: "location_picker_longitude_hint",
           errorText: "location_picker_longitude_error",
-          focusNode: latitiudeFocusNode,
+          focusNode: longitudeFocusNode,
           validator: _validateLong,
           onUpdated: onLongitudeEditingCompleted,
         ),

mobile/lib/widgets/common/user_avatar.dart

@@ -6,7 +6,7 @@ import 'package:immich_mobile/entities/user.entity.dart';
 
 Widget userAvatar(BuildContext context, User u, {double? radius}) {
   final url =
-      "${Store.get(StoreKey.serverEndpoint)}/user/profile-image/${u.id}";
+      "${Store.get(StoreKey.serverEndpoint)}/users/${u.id}/profile-image";
   final nameFirstLetter = u.name.isNotEmpty ? u.name[0] : "";
   return CircleAvatar(
     radius: radius,

mobile/lib/widgets/common/user_circle_avatar.dart

@@ -24,7 +24,7 @@ class UserCircleAvatar extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     bool isDarkTheme = Theme.of(context).brightness == Brightness.dark;
     final profileImageUrl =
-        '${Store.get(StoreKey.serverEndpoint)}/user/profile-image/${user.id}?d=${Random().nextInt(1024)}';
+        '${Store.get(StoreKey.serverEndpoint)}/users/${user.id}/profile-image?d=${Random().nextInt(1024)}';
 
     final textIcon = Text(
       user.name[0].toUpperCase(),

mobile/openapi/.openapi-generator/FILES

@@ -1,655 +0,0 @@
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-analysis_options.yaml
-doc/APIKeyApi.md
-doc/APIKeyCreateDto.md
-doc/APIKeyCreateResponseDto.md
-doc/APIKeyResponseDto.md
-doc/APIKeyUpdateDto.md
-doc/ActivityApi.md
-doc/ActivityCreateDto.md
-doc/ActivityResponseDto.md
-doc/ActivityStatisticsResponseDto.md
-doc/AddUsersDto.md
-doc/AdminOnboardingUpdateDto.md
-doc/AlbumApi.md
-doc/AlbumCountResponseDto.md
-doc/AlbumResponseDto.md
-doc/AlbumUserAddDto.md
-doc/AlbumUserCreateDto.md
-doc/AlbumUserResponseDto.md
-doc/AlbumUserRole.md
-doc/AllJobStatusResponseDto.md
-doc/AssetApi.md
-doc/AssetBulkDeleteDto.md
-doc/AssetBulkUpdateDto.md
-doc/AssetBulkUploadCheckDto.md
-doc/AssetBulkUploadCheckItem.md
-doc/AssetBulkUploadCheckResponseDto.md
-doc/AssetBulkUploadCheckResult.md
-doc/AssetDeltaSyncDto.md
-doc/AssetDeltaSyncResponseDto.md
-doc/AssetFaceResponseDto.md
-doc/AssetFaceUpdateDto.md
-doc/AssetFaceUpdateItem.md
-doc/AssetFaceWithoutPersonResponseDto.md
-doc/AssetFileUploadResponseDto.md
-doc/AssetFullSyncDto.md
-doc/AssetIdsDto.md
-doc/AssetIdsResponseDto.md
-doc/AssetJobName.md
-doc/AssetJobsDto.md
-doc/AssetOrder.md
-doc/AssetResponseDto.md
-doc/AssetStatsResponseDto.md
-doc/AssetTypeEnum.md
-doc/AudioCodec.md
-doc/AuditApi.md
-doc/AuditDeletesResponseDto.md
-doc/AuthenticationApi.md
-doc/BulkIdResponseDto.md
-doc/BulkIdsDto.md
-doc/CLIPConfig.md
-doc/CLIPMode.md
-doc/CQMode.md
-doc/ChangePasswordDto.md
-doc/CheckExistingAssetsDto.md
-doc/CheckExistingAssetsResponseDto.md
-doc/Colorspace.md
-doc/CreateAlbumDto.md
-doc/CreateLibraryDto.md
-doc/CreateProfileImageResponseDto.md
-doc/CreateTagDto.md
-doc/CreateUserDto.md
-doc/DeleteUserDto.md
-doc/DownloadApi.md
-doc/DownloadArchiveInfo.md
-doc/DownloadInfoDto.md
-doc/DownloadResponseDto.md
-doc/DuplicateApi.md
-doc/DuplicateDetectionConfig.md
-doc/DuplicateResponseDto.md
-doc/EntityType.md
-doc/ExifResponseDto.md
-doc/FaceApi.md
-doc/FaceDto.md
-doc/FileChecksumDto.md
-doc/FileChecksumResponseDto.md
-doc/FileReportApi.md
-doc/FileReportDto.md
-doc/FileReportFixDto.md
-doc/FileReportItemDto.md
-doc/ImageFormat.md
-doc/JobApi.md
-doc/JobCommand.md
-doc/JobCommandDto.md
-doc/JobCountsDto.md
-doc/JobName.md
-doc/JobSettingsDto.md
-doc/JobStatusDto.md
-doc/LibraryApi.md
-doc/LibraryResponseDto.md
-doc/LibraryStatsResponseDto.md
-doc/LogLevel.md
-doc/LoginCredentialDto.md
-doc/LoginResponseDto.md
-doc/LogoutResponseDto.md
-doc/MapMarkerResponseDto.md
-doc/MapTheme.md
-doc/MemoryApi.md
-doc/MemoryCreateDto.md
-doc/MemoryLaneResponseDto.md
-doc/MemoryResponseDto.md
-doc/MemoryType.md
-doc/MemoryUpdateDto.md
-doc/MergePersonDto.md
-doc/MetadataSearchDto.md
-doc/ModelType.md
-doc/OAuthApi.md
-doc/OAuthAuthorizeResponseDto.md
-doc/OAuthCallbackDto.md
-doc/OAuthConfigDto.md
-doc/OnThisDayDto.md
-doc/PartnerApi.md
-doc/PartnerResponseDto.md
-doc/PathEntityType.md
-doc/PathType.md
-doc/PeopleResponseDto.md
-doc/PeopleUpdateDto.md
-doc/PeopleUpdateItem.md
-doc/PersonApi.md
-doc/PersonCreateDto.md
-doc/PersonResponseDto.md
-doc/PersonStatisticsResponseDto.md
-doc/PersonUpdateDto.md
-doc/PersonWithFacesResponseDto.md
-doc/PlacesResponseDto.md
-doc/QueueStatusDto.md
-doc/ReactionLevel.md
-doc/ReactionType.md
-doc/RecognitionConfig.md
-doc/ReverseGeocodingStateResponseDto.md
-doc/ScanLibraryDto.md
-doc/SearchAlbumResponseDto.md
-doc/SearchApi.md
-doc/SearchAssetResponseDto.md
-doc/SearchExploreItem.md
-doc/SearchExploreResponseDto.md
-doc/SearchFacetCountResponseDto.md
-doc/SearchFacetResponseDto.md
-doc/SearchResponseDto.md
-doc/SearchSuggestionType.md
-doc/ServerConfigDto.md
-doc/ServerFeaturesDto.md
-doc/ServerInfoApi.md
-doc/ServerInfoResponseDto.md
-doc/ServerMediaTypesResponseDto.md
-doc/ServerPingResponse.md
-doc/ServerStatsResponseDto.md
-doc/ServerThemeDto.md
-doc/ServerVersionResponseDto.md
-doc/SessionResponseDto.md
-doc/SessionsApi.md
-doc/SharedLinkApi.md
-doc/SharedLinkCreateDto.md
-doc/SharedLinkEditDto.md
-doc/SharedLinkResponseDto.md
-doc/SharedLinkType.md
-doc/SignUpDto.md
-doc/SmartInfoResponseDto.md
-doc/SmartSearchDto.md
-doc/SyncApi.md
-doc/SystemConfigApi.md
-doc/SystemConfigDto.md
-doc/SystemConfigFFmpegDto.md
-doc/SystemConfigImageDto.md
-doc/SystemConfigJobDto.md
-doc/SystemConfigLibraryDto.md
-doc/SystemConfigLibraryScanDto.md
-doc/SystemConfigLibraryWatchDto.md
-doc/SystemConfigLoggingDto.md
-doc/SystemConfigMachineLearningDto.md
-doc/SystemConfigMapDto.md
-doc/SystemConfigNewVersionCheckDto.md
-doc/SystemConfigNotificationsDto.md
-doc/SystemConfigOAuthDto.md
-doc/SystemConfigPasswordLoginDto.md
-doc/SystemConfigReverseGeocodingDto.md
-doc/SystemConfigServerDto.md
-doc/SystemConfigSmtpDto.md
-doc/SystemConfigSmtpTransportDto.md
-doc/SystemConfigStorageTemplateDto.md
-doc/SystemConfigTemplateStorageOptionDto.md
-doc/SystemConfigThemeDto.md
-doc/SystemConfigTrashDto.md
-doc/SystemConfigUserDto.md
-doc/SystemMetadataApi.md
-doc/TagApi.md
-doc/TagResponseDto.md
-doc/TagTypeEnum.md
-doc/ThumbnailFormat.md
-doc/TimeBucketResponseDto.md
-doc/TimeBucketSize.md
-doc/TimelineApi.md
-doc/ToneMapping.md
-doc/TranscodeHWAccel.md
-doc/TranscodePolicy.md
-doc/TrashApi.md
-doc/UpdateAlbumDto.md
-doc/UpdateAlbumUserDto.md
-doc/UpdateAssetDto.md
-doc/UpdateLibraryDto.md
-doc/UpdatePartnerDto.md
-doc/UpdateStackParentDto.md
-doc/UpdateTagDto.md
-doc/UpdateUserDto.md
-doc/UsageByUserDto.md
-doc/UserApi.md
-doc/UserAvatarColor.md
-doc/UserDto.md
-doc/UserResponseDto.md
-doc/UserStatus.md
-doc/ValidateAccessTokenResponseDto.md
-doc/ValidateLibraryDto.md
-doc/ValidateLibraryImportPathResponseDto.md
-doc/ValidateLibraryResponseDto.md
-doc/VideoCodec.md
-git_push.sh
-lib/api.dart
-lib/api/activity_api.dart
-lib/api/album_api.dart
-lib/api/api_key_api.dart
-lib/api/asset_api.dart
-lib/api/audit_api.dart
-lib/api/authentication_api.dart
-lib/api/download_api.dart
-lib/api/duplicate_api.dart
-lib/api/face_api.dart
-lib/api/file_report_api.dart
-lib/api/job_api.dart
-lib/api/library_api.dart
-lib/api/memory_api.dart
-lib/api/o_auth_api.dart
-lib/api/partner_api.dart
-lib/api/person_api.dart
-lib/api/search_api.dart
-lib/api/server_info_api.dart
-lib/api/sessions_api.dart
-lib/api/shared_link_api.dart
-lib/api/sync_api.dart
-lib/api/system_config_api.dart
-lib/api/system_metadata_api.dart
-lib/api/tag_api.dart
-lib/api/timeline_api.dart
-lib/api/trash_api.dart
-lib/api/user_api.dart
-lib/api_client.dart
-lib/api_exception.dart
-lib/api_helper.dart
-lib/auth/api_key_auth.dart
-lib/auth/authentication.dart
-lib/auth/http_basic_auth.dart
-lib/auth/http_bearer_auth.dart
-lib/auth/oauth.dart
-lib/model/activity_create_dto.dart
-lib/model/activity_response_dto.dart
-lib/model/activity_statistics_response_dto.dart
-lib/model/add_users_dto.dart
-lib/model/admin_onboarding_update_dto.dart
-lib/model/album_count_response_dto.dart
-lib/model/album_response_dto.dart
-lib/model/album_user_add_dto.dart
-lib/model/album_user_create_dto.dart
-lib/model/album_user_response_dto.dart
-lib/model/album_user_role.dart
-lib/model/all_job_status_response_dto.dart
-lib/model/api_key_create_dto.dart
-lib/model/api_key_create_response_dto.dart
-lib/model/api_key_response_dto.dart
-lib/model/api_key_update_dto.dart
-lib/model/asset_bulk_delete_dto.dart
-lib/model/asset_bulk_update_dto.dart
-lib/model/asset_bulk_upload_check_dto.dart
-lib/model/asset_bulk_upload_check_item.dart
-lib/model/asset_bulk_upload_check_response_dto.dart
-lib/model/asset_bulk_upload_check_result.dart
-lib/model/asset_delta_sync_dto.dart
-lib/model/asset_delta_sync_response_dto.dart
-lib/model/asset_face_response_dto.dart
-lib/model/asset_face_update_dto.dart
-lib/model/asset_face_update_item.dart
-lib/model/asset_face_without_person_response_dto.dart
-lib/model/asset_file_upload_response_dto.dart
-lib/model/asset_full_sync_dto.dart
-lib/model/asset_ids_dto.dart
-lib/model/asset_ids_response_dto.dart
-lib/model/asset_job_name.dart
-lib/model/asset_jobs_dto.dart
-lib/model/asset_order.dart
-lib/model/asset_response_dto.dart
-lib/model/asset_stats_response_dto.dart
-lib/model/asset_type_enum.dart
-lib/model/audio_codec.dart
-lib/model/audit_deletes_response_dto.dart
-lib/model/bulk_id_response_dto.dart
-lib/model/bulk_ids_dto.dart
-lib/model/change_password_dto.dart
-lib/model/check_existing_assets_dto.dart
-lib/model/check_existing_assets_response_dto.dart
-lib/model/clip_config.dart
-lib/model/clip_mode.dart
-lib/model/colorspace.dart
-lib/model/cq_mode.dart
-lib/model/create_album_dto.dart
-lib/model/create_library_dto.dart
-lib/model/create_profile_image_response_dto.dart
-lib/model/create_tag_dto.dart
-lib/model/create_user_dto.dart
-lib/model/delete_user_dto.dart
-lib/model/download_archive_info.dart
-lib/model/download_info_dto.dart
-lib/model/download_response_dto.dart
-lib/model/duplicate_detection_config.dart
-lib/model/duplicate_response_dto.dart
-lib/model/entity_type.dart
-lib/model/exif_response_dto.dart
-lib/model/face_dto.dart
-lib/model/file_checksum_dto.dart
-lib/model/file_checksum_response_dto.dart
-lib/model/file_report_dto.dart
-lib/model/file_report_fix_dto.dart
-lib/model/file_report_item_dto.dart
-lib/model/image_format.dart
-lib/model/job_command.dart
-lib/model/job_command_dto.dart
-lib/model/job_counts_dto.dart
-lib/model/job_name.dart
-lib/model/job_settings_dto.dart
-lib/model/job_status_dto.dart
-lib/model/library_response_dto.dart
-lib/model/library_stats_response_dto.dart
-lib/model/log_level.dart
-lib/model/login_credential_dto.dart
-lib/model/login_response_dto.dart
-lib/model/logout_response_dto.dart
-lib/model/map_marker_response_dto.dart
-lib/model/map_theme.dart
-lib/model/memory_create_dto.dart
-lib/model/memory_lane_response_dto.dart
-lib/model/memory_response_dto.dart
-lib/model/memory_type.dart
-lib/model/memory_update_dto.dart
-lib/model/merge_person_dto.dart
-lib/model/metadata_search_dto.dart
-lib/model/model_type.dart
-lib/model/o_auth_authorize_response_dto.dart
-lib/model/o_auth_callback_dto.dart
-lib/model/o_auth_config_dto.dart
-lib/model/on_this_day_dto.dart
-lib/model/partner_response_dto.dart
-lib/model/path_entity_type.dart
-lib/model/path_type.dart
-lib/model/people_response_dto.dart
-lib/model/people_update_dto.dart
-lib/model/people_update_item.dart
-lib/model/person_create_dto.dart
-lib/model/person_response_dto.dart
-lib/model/person_statistics_response_dto.dart
-lib/model/person_update_dto.dart
-lib/model/person_with_faces_response_dto.dart
-lib/model/places_response_dto.dart
-lib/model/queue_status_dto.dart
-lib/model/reaction_level.dart
-lib/model/reaction_type.dart
-lib/model/recognition_config.dart
-lib/model/reverse_geocoding_state_response_dto.dart
-lib/model/scan_library_dto.dart
-lib/model/search_album_response_dto.dart
-lib/model/search_asset_response_dto.dart
-lib/model/search_explore_item.dart
-lib/model/search_explore_response_dto.dart
-lib/model/search_facet_count_response_dto.dart
-lib/model/search_facet_response_dto.dart
-lib/model/search_response_dto.dart
-lib/model/search_suggestion_type.dart
-lib/model/server_config_dto.dart
-lib/model/server_features_dto.dart
-lib/model/server_info_response_dto.dart
-lib/model/server_media_types_response_dto.dart
-lib/model/server_ping_response.dart
-lib/model/server_stats_response_dto.dart
-lib/model/server_theme_dto.dart
-lib/model/server_version_response_dto.dart
-lib/model/session_response_dto.dart
-lib/model/shared_link_create_dto.dart
-lib/model/shared_link_edit_dto.dart
-lib/model/shared_link_response_dto.dart
-lib/model/shared_link_type.dart
-lib/model/sign_up_dto.dart
-lib/model/smart_info_response_dto.dart
-lib/model/smart_search_dto.dart
-lib/model/system_config_dto.dart
-lib/model/system_config_f_fmpeg_dto.dart
-lib/model/system_config_image_dto.dart
-lib/model/system_config_job_dto.dart
-lib/model/system_config_library_dto.dart
-lib/model/system_config_library_scan_dto.dart
-lib/model/system_config_library_watch_dto.dart
-lib/model/system_config_logging_dto.dart
-lib/model/system_config_machine_learning_dto.dart
-lib/model/system_config_map_dto.dart
-lib/model/system_config_new_version_check_dto.dart
-lib/model/system_config_notifications_dto.dart
-lib/model/system_config_o_auth_dto.dart
-lib/model/system_config_password_login_dto.dart
-lib/model/system_config_reverse_geocoding_dto.dart
-lib/model/system_config_server_dto.dart
-lib/model/system_config_smtp_dto.dart
-lib/model/system_config_smtp_transport_dto.dart
-lib/model/system_config_storage_template_dto.dart
-lib/model/system_config_template_storage_option_dto.dart
-lib/model/system_config_theme_dto.dart
-lib/model/system_config_trash_dto.dart
-lib/model/system_config_user_dto.dart
-lib/model/tag_response_dto.dart
-lib/model/tag_type_enum.dart
-lib/model/thumbnail_format.dart
-lib/model/time_bucket_response_dto.dart
-lib/model/time_bucket_size.dart
-lib/model/tone_mapping.dart
-lib/model/transcode_hw_accel.dart
-lib/model/transcode_policy.dart
-lib/model/update_album_dto.dart
-lib/model/update_album_user_dto.dart
-lib/model/update_asset_dto.dart
-lib/model/update_library_dto.dart
-lib/model/update_partner_dto.dart
-lib/model/update_stack_parent_dto.dart
-lib/model/update_tag_dto.dart
-lib/model/update_user_dto.dart
-lib/model/usage_by_user_dto.dart
-lib/model/user_avatar_color.dart
-lib/model/user_dto.dart
-lib/model/user_response_dto.dart
-lib/model/user_status.dart
-lib/model/validate_access_token_response_dto.dart
-lib/model/validate_library_dto.dart
-lib/model/validate_library_import_path_response_dto.dart
-lib/model/validate_library_response_dto.dart
-lib/model/video_codec.dart
-pubspec.yaml
-test/activity_api_test.dart
-test/activity_create_dto_test.dart
-test/activity_response_dto_test.dart
-test/activity_statistics_response_dto_test.dart
-test/add_users_dto_test.dart
-test/admin_onboarding_update_dto_test.dart
-test/album_api_test.dart
-test/album_count_response_dto_test.dart
-test/album_response_dto_test.dart
-test/album_user_add_dto_test.dart
-test/album_user_create_dto_test.dart
-test/album_user_response_dto_test.dart
-test/album_user_role_test.dart
-test/all_job_status_response_dto_test.dart
-test/api_key_api_test.dart
-test/api_key_create_dto_test.dart
-test/api_key_create_response_dto_test.dart
-test/api_key_response_dto_test.dart
-test/api_key_update_dto_test.dart
-test/asset_api_test.dart
-test/asset_bulk_delete_dto_test.dart
-test/asset_bulk_update_dto_test.dart
-test/asset_bulk_upload_check_dto_test.dart
-test/asset_bulk_upload_check_item_test.dart
-test/asset_bulk_upload_check_response_dto_test.dart
-test/asset_bulk_upload_check_result_test.dart
-test/asset_delta_sync_dto_test.dart
-test/asset_delta_sync_response_dto_test.dart
-test/asset_face_response_dto_test.dart
-test/asset_face_update_dto_test.dart
-test/asset_face_update_item_test.dart
-test/asset_face_without_person_response_dto_test.dart
-test/asset_file_upload_response_dto_test.dart
-test/asset_full_sync_dto_test.dart
-test/asset_ids_dto_test.dart
-test/asset_ids_response_dto_test.dart
-test/asset_job_name_test.dart
-test/asset_jobs_dto_test.dart
-test/asset_order_test.dart
-test/asset_response_dto_test.dart
-test/asset_stats_response_dto_test.dart
-test/asset_type_enum_test.dart
-test/audio_codec_test.dart
-test/audit_api_test.dart
-test/audit_deletes_response_dto_test.dart
-test/authentication_api_test.dart
-test/bulk_id_response_dto_test.dart
-test/bulk_ids_dto_test.dart
-test/change_password_dto_test.dart
-test/check_existing_assets_dto_test.dart
-test/check_existing_assets_response_dto_test.dart
-test/clip_config_test.dart
-test/clip_mode_test.dart
-test/colorspace_test.dart
-test/cq_mode_test.dart
-test/create_album_dto_test.dart
-test/create_library_dto_test.dart
-test/create_profile_image_response_dto_test.dart
-test/create_tag_dto_test.dart
-test/create_user_dto_test.dart
-test/delete_user_dto_test.dart
-test/download_api_test.dart
-test/download_archive_info_test.dart
-test/download_info_dto_test.dart
-test/download_response_dto_test.dart
-test/duplicate_api_test.dart
-test/duplicate_detection_config_test.dart
-test/duplicate_response_dto_test.dart
-test/entity_type_test.dart
-test/exif_response_dto_test.dart
-test/face_api_test.dart
-test/face_dto_test.dart
-test/file_checksum_dto_test.dart
-test/file_checksum_response_dto_test.dart
-test/file_report_api_test.dart
-test/file_report_dto_test.dart
-test/file_report_fix_dto_test.dart
-test/file_report_item_dto_test.dart
-test/image_format_test.dart
-test/job_api_test.dart
-test/job_command_dto_test.dart
-test/job_command_test.dart
-test/job_counts_dto_test.dart
-test/job_name_test.dart
-test/job_settings_dto_test.dart
-test/job_status_dto_test.dart
-test/library_api_test.dart
-test/library_response_dto_test.dart
-test/library_stats_response_dto_test.dart
-test/log_level_test.dart
-test/login_credential_dto_test.dart
-test/login_response_dto_test.dart
-test/logout_response_dto_test.dart
-test/map_marker_response_dto_test.dart
-test/map_theme_test.dart
-test/memory_api_test.dart
-test/memory_create_dto_test.dart
-test/memory_lane_response_dto_test.dart
-test/memory_response_dto_test.dart
-test/memory_type_test.dart
-test/memory_update_dto_test.dart
-test/merge_person_dto_test.dart
-test/metadata_search_dto_test.dart
-test/model_type_test.dart
-test/o_auth_api_test.dart
-test/o_auth_authorize_response_dto_test.dart
-test/o_auth_callback_dto_test.dart
-test/o_auth_config_dto_test.dart
-test/on_this_day_dto_test.dart
-test/partner_api_test.dart
-test/partner_response_dto_test.dart
-test/path_entity_type_test.dart
-test/path_type_test.dart
-test/people_response_dto_test.dart
-test/people_update_dto_test.dart
-test/people_update_item_test.dart
-test/person_api_test.dart
-test/person_create_dto_test.dart
-test/person_response_dto_test.dart
-test/person_statistics_response_dto_test.dart
-test/person_update_dto_test.dart
-test/person_with_faces_response_dto_test.dart
-test/places_response_dto_test.dart
-test/queue_status_dto_test.dart
-test/reaction_level_test.dart
-test/reaction_type_test.dart
-test/recognition_config_test.dart
-test/reverse_geocoding_state_response_dto_test.dart
-test/scan_library_dto_test.dart
-test/search_album_response_dto_test.dart
-test/search_api_test.dart
-test/search_asset_response_dto_test.dart
-test/search_explore_item_test.dart
-test/search_explore_response_dto_test.dart
-test/search_facet_count_response_dto_test.dart
-test/search_facet_response_dto_test.dart
-test/search_response_dto_test.dart
-test/search_suggestion_type_test.dart
-test/server_config_dto_test.dart
-test/server_features_dto_test.dart
-test/server_info_api_test.dart
-test/server_info_response_dto_test.dart
-test/server_media_types_response_dto_test.dart
-test/server_ping_response_test.dart
-test/server_stats_response_dto_test.dart
-test/server_theme_dto_test.dart
-test/server_version_response_dto_test.dart
-test/session_response_dto_test.dart
-test/sessions_api_test.dart
-test/shared_link_api_test.dart
-test/shared_link_create_dto_test.dart
-test/shared_link_edit_dto_test.dart
-test/shared_link_response_dto_test.dart
-test/shared_link_type_test.dart
-test/sign_up_dto_test.dart
-test/smart_info_response_dto_test.dart
-test/smart_search_dto_test.dart
-test/sync_api_test.dart
-test/system_config_api_test.dart
-test/system_config_dto_test.dart
-test/system_config_f_fmpeg_dto_test.dart
-test/system_config_image_dto_test.dart
-test/system_config_job_dto_test.dart
-test/system_config_library_dto_test.dart
-test/system_config_library_scan_dto_test.dart
-test/system_config_library_watch_dto_test.dart
-test/system_config_logging_dto_test.dart
-test/system_config_machine_learning_dto_test.dart
-test/system_config_map_dto_test.dart
-test/system_config_new_version_check_dto_test.dart
-test/system_config_notifications_dto_test.dart
-test/system_config_o_auth_dto_test.dart
-test/system_config_password_login_dto_test.dart
-test/system_config_reverse_geocoding_dto_test.dart
-test/system_config_server_dto_test.dart
-test/system_config_smtp_dto_test.dart
-test/system_config_smtp_transport_dto_test.dart
-test/system_config_storage_template_dto_test.dart
-test/system_config_template_storage_option_dto_test.dart
-test/system_config_theme_dto_test.dart
-test/system_config_trash_dto_test.dart
-test/system_config_user_dto_test.dart
-test/system_metadata_api_test.dart
-test/tag_api_test.dart
-test/tag_response_dto_test.dart
-test/tag_type_enum_test.dart
-test/thumbnail_format_test.dart
-test/time_bucket_response_dto_test.dart
-test/time_bucket_size_test.dart
-test/timeline_api_test.dart
-test/tone_mapping_test.dart
-test/transcode_hw_accel_test.dart
-test/transcode_policy_test.dart
-test/trash_api_test.dart
-test/update_album_dto_test.dart
-test/update_album_user_dto_test.dart
-test/update_asset_dto_test.dart
-test/update_library_dto_test.dart
-test/update_partner_dto_test.dart
-test/update_stack_parent_dto_test.dart
-test/update_tag_dto_test.dart
-test/update_user_dto_test.dart
-test/usage_by_user_dto_test.dart
-test/user_api_test.dart
-test/user_avatar_color_test.dart
-test/user_dto_test.dart
-test/user_response_dto_test.dart
-test/user_status_test.dart
-test/validate_access_token_response_dto_test.dart
-test/validate_library_dto_test.dart
-test/validate_library_import_path_response_dto_test.dart
-test/validate_library_response_dto_test.dart
-test/video_codec_test.dart

mobile/openapi/README.md

@@ -73,30 +73,29 @@ All URIs are relative to */api*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*APIKeyApi* | [**createApiKey**](doc//APIKeyApi.md#createapikey) | **POST** /api-key | 
-*APIKeyApi* | [**deleteApiKey**](doc//APIKeyApi.md#deleteapikey) | **DELETE** /api-key/{id} | 
-*APIKeyApi* | [**getApiKey**](doc//APIKeyApi.md#getapikey) | **GET** /api-key/{id} | 
-*APIKeyApi* | [**getApiKeys**](doc//APIKeyApi.md#getapikeys) | **GET** /api-key | 
-*APIKeyApi* | [**updateApiKey**](doc//APIKeyApi.md#updateapikey) | **PUT** /api-key/{id} | 
-*ActivityApi* | [**createActivity**](doc//ActivityApi.md#createactivity) | **POST** /activity | 
-*ActivityApi* | [**deleteActivity**](doc//ActivityApi.md#deleteactivity) | **DELETE** /activity/{id} | 
-*ActivityApi* | [**getActivities**](doc//ActivityApi.md#getactivities) | **GET** /activity | 
-*ActivityApi* | [**getActivityStatistics**](doc//ActivityApi.md#getactivitystatistics) | **GET** /activity/statistics | 
-*AlbumApi* | [**addAssetsToAlbum**](doc//AlbumApi.md#addassetstoalbum) | **PUT** /album/{id}/assets | 
-*AlbumApi* | [**addUsersToAlbum**](doc//AlbumApi.md#adduserstoalbum) | **PUT** /album/{id}/users | 
-*AlbumApi* | [**createAlbum**](doc//AlbumApi.md#createalbum) | **POST** /album | 
-*AlbumApi* | [**deleteAlbum**](doc//AlbumApi.md#deletealbum) | **DELETE** /album/{id} | 
-*AlbumApi* | [**getAlbumCount**](doc//AlbumApi.md#getalbumcount) | **GET** /album/count | 
-*AlbumApi* | [**getAlbumInfo**](doc//AlbumApi.md#getalbuminfo) | **GET** /album/{id} | 
-*AlbumApi* | [**getAllAlbums**](doc//AlbumApi.md#getallalbums) | **GET** /album | 
-*AlbumApi* | [**removeAssetFromAlbum**](doc//AlbumApi.md#removeassetfromalbum) | **DELETE** /album/{id}/assets | 
-*AlbumApi* | [**removeUserFromAlbum**](doc//AlbumApi.md#removeuserfromalbum) | **DELETE** /album/{id}/user/{userId} | 
-*AlbumApi* | [**updateAlbumInfo**](doc//AlbumApi.md#updatealbuminfo) | **PATCH** /album/{id} | 
-*AlbumApi* | [**updateAlbumUser**](doc//AlbumApi.md#updatealbumuser) | **PUT** /album/{id}/user/{userId} | 
+*APIKeyApi* | [**createApiKey**](doc//APIKeyApi.md#createapikey) | **POST** /api-keys | 
+*APIKeyApi* | [**deleteApiKey**](doc//APIKeyApi.md#deleteapikey) | **DELETE** /api-keys/{id} | 
+*APIKeyApi* | [**getApiKey**](doc//APIKeyApi.md#getapikey) | **GET** /api-keys/{id} | 
+*APIKeyApi* | [**getApiKeys**](doc//APIKeyApi.md#getapikeys) | **GET** /api-keys | 
+*APIKeyApi* | [**updateApiKey**](doc//APIKeyApi.md#updateapikey) | **PUT** /api-keys/{id} | 
+*ActivityApi* | [**createActivity**](doc//ActivityApi.md#createactivity) | **POST** /activities | 
+*ActivityApi* | [**deleteActivity**](doc//ActivityApi.md#deleteactivity) | **DELETE** /activities/{id} | 
+*ActivityApi* | [**getActivities**](doc//ActivityApi.md#getactivities) | **GET** /activities | 
+*ActivityApi* | [**getActivityStatistics**](doc//ActivityApi.md#getactivitystatistics) | **GET** /activities/statistics | 
+*AlbumApi* | [**addAssetsToAlbum**](doc//AlbumApi.md#addassetstoalbum) | **PUT** /albums/{id}/assets | 
+*AlbumApi* | [**addUsersToAlbum**](doc//AlbumApi.md#adduserstoalbum) | **PUT** /albums/{id}/users | 
+*AlbumApi* | [**createAlbum**](doc//AlbumApi.md#createalbum) | **POST** /albums | 
+*AlbumApi* | [**deleteAlbum**](doc//AlbumApi.md#deletealbum) | **DELETE** /albums/{id} | 
+*AlbumApi* | [**getAlbumCount**](doc//AlbumApi.md#getalbumcount) | **GET** /albums/count | 
+*AlbumApi* | [**getAlbumInfo**](doc//AlbumApi.md#getalbuminfo) | **GET** /albums/{id} | 
+*AlbumApi* | [**getAllAlbums**](doc//AlbumApi.md#getallalbums) | **GET** /albums | 
+*AlbumApi* | [**removeAssetFromAlbum**](doc//AlbumApi.md#removeassetfromalbum) | **DELETE** /albums/{id}/assets | 
+*AlbumApi* | [**removeUserFromAlbum**](doc//AlbumApi.md#removeuserfromalbum) | **DELETE** /albums/{id}/user/{userId} | 
+*AlbumApi* | [**updateAlbumInfo**](doc//AlbumApi.md#updatealbuminfo) | **PATCH** /albums/{id} | 
+*AlbumApi* | [**updateAlbumUser**](doc//AlbumApi.md#updatealbumuser) | **PUT** /albums/{id}/user/{userId} | 
 *AssetApi* | [**checkBulkUpload**](doc//AssetApi.md#checkbulkupload) | **POST** /asset/bulk-upload-check | 
 *AssetApi* | [**checkExistingAssets**](doc//AssetApi.md#checkexistingassets) | **POST** /asset/exist | 
 *AssetApi* | [**deleteAssets**](doc//AssetApi.md#deleteassets) | **DELETE** /asset | 
-*AssetApi* | [**getAllAssets**](doc//AssetApi.md#getallassets) | **GET** /asset | 
 *AssetApi* | [**getAllUserAssetsByDeviceId**](doc//AssetApi.md#getalluserassetsbydeviceid) | **GET** /asset/device/{deviceId} | 
 *AssetApi* | [**getAssetInfo**](doc//AssetApi.md#getassetinfo) | **GET** /asset/{id} | 
 *AssetApi* | [**getAssetStatistics**](doc//AssetApi.md#getassetstatistics) | **GET** /asset/statistics | 
@@ -104,6 +103,7 @@ Class | Method | HTTP request | Description
 *AssetApi* | [**getMapMarkers**](doc//AssetApi.md#getmapmarkers) | **GET** /asset/map-marker | 
 *AssetApi* | [**getMemoryLane**](doc//AssetApi.md#getmemorylane) | **GET** /asset/memory-lane | 
 *AssetApi* | [**getRandom**](doc//AssetApi.md#getrandom) | **GET** /asset/random | 
+*AssetApi* | [**replaceAsset**](doc//AssetApi.md#replaceasset) | **PUT** /asset/{id}/file | 
 *AssetApi* | [**runAssetJobs**](doc//AssetApi.md#runassetjobs) | **POST** /asset/jobs | 
 *AssetApi* | [**serveFile**](doc//AssetApi.md#servefile) | **GET** /asset/file/{id} | 
 *AssetApi* | [**updateAsset**](doc//AssetApi.md#updateasset) | **PUT** /asset/{id} | 
@@ -120,22 +120,22 @@ Class | Method | HTTP request | Description
 *DownloadApi* | [**downloadFile**](doc//DownloadApi.md#downloadfile) | **POST** /download/asset/{id} | 
 *DownloadApi* | [**getDownloadInfo**](doc//DownloadApi.md#getdownloadinfo) | **POST** /download/info | 
 *DuplicateApi* | [**getAssetDuplicates**](doc//DuplicateApi.md#getassetduplicates) | **GET** /duplicates | 
-*FaceApi* | [**getFaces**](doc//FaceApi.md#getfaces) | **GET** /face | 
-*FaceApi* | [**reassignFacesById**](doc//FaceApi.md#reassignfacesbyid) | **PUT** /face/{id} | 
-*FileReportApi* | [**fixAuditFiles**](doc//FileReportApi.md#fixauditfiles) | **POST** /report/fix | 
-*FileReportApi* | [**getAuditFiles**](doc//FileReportApi.md#getauditfiles) | **GET** /report | 
-*FileReportApi* | [**getFileChecksums**](doc//FileReportApi.md#getfilechecksums) | **POST** /report/checksum | 
+*FaceApi* | [**getFaces**](doc//FaceApi.md#getfaces) | **GET** /faces | 
+*FaceApi* | [**reassignFacesById**](doc//FaceApi.md#reassignfacesbyid) | **PUT** /faces/{id} | 
+*FileReportApi* | [**fixAuditFiles**](doc//FileReportApi.md#fixauditfiles) | **POST** /reports/fix | 
+*FileReportApi* | [**getAuditFiles**](doc//FileReportApi.md#getauditfiles) | **GET** /reports | 
+*FileReportApi* | [**getFileChecksums**](doc//FileReportApi.md#getfilechecksums) | **POST** /reports/checksum | 
 *JobApi* | [**getAllJobsStatus**](doc//JobApi.md#getalljobsstatus) | **GET** /jobs | 
 *JobApi* | [**sendJobCommand**](doc//JobApi.md#sendjobcommand) | **PUT** /jobs/{id} | 
-*LibraryApi* | [**createLibrary**](doc//LibraryApi.md#createlibrary) | **POST** /library | 
-*LibraryApi* | [**deleteLibrary**](doc//LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | 
-*LibraryApi* | [**getAllLibraries**](doc//LibraryApi.md#getalllibraries) | **GET** /library | 
-*LibraryApi* | [**getLibrary**](doc//LibraryApi.md#getlibrary) | **GET** /library/{id} | 
-*LibraryApi* | [**getLibraryStatistics**](doc//LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | 
-*LibraryApi* | [**removeOfflineFiles**](doc//LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
-*LibraryApi* | [**scanLibrary**](doc//LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | 
-*LibraryApi* | [**updateLibrary**](doc//LibraryApi.md#updatelibrary) | **PUT** /library/{id} | 
-*LibraryApi* | [**validate**](doc//LibraryApi.md#validate) | **POST** /library/{id}/validate | 
+*LibraryApi* | [**createLibrary**](doc//LibraryApi.md#createlibrary) | **POST** /libraries | 
+*LibraryApi* | [**deleteLibrary**](doc//LibraryApi.md#deletelibrary) | **DELETE** /libraries/{id} | 
+*LibraryApi* | [**getAllLibraries**](doc//LibraryApi.md#getalllibraries) | **GET** /libraries | 
+*LibraryApi* | [**getLibrary**](doc//LibraryApi.md#getlibrary) | **GET** /libraries/{id} | 
+*LibraryApi* | [**getLibraryStatistics**](doc//LibraryApi.md#getlibrarystatistics) | **GET** /libraries/{id}/statistics | 
+*LibraryApi* | [**removeOfflineFiles**](doc//LibraryApi.md#removeofflinefiles) | **POST** /libraries/{id}/removeOffline | 
+*LibraryApi* | [**scanLibrary**](doc//LibraryApi.md#scanlibrary) | **POST** /libraries/{id}/scan | 
+*LibraryApi* | [**updateLibrary**](doc//LibraryApi.md#updatelibrary) | **PUT** /libraries/{id} | 
+*LibraryApi* | [**validate**](doc//LibraryApi.md#validate) | **POST** /libraries/{id}/validate | 
 *MemoryApi* | [**addMemoryAssets**](doc//MemoryApi.md#addmemoryassets) | **PUT** /memories/{id}/assets | 
 *MemoryApi* | [**createMemory**](doc//MemoryApi.md#creatememory) | **POST** /memories | 
 *MemoryApi* | [**deleteMemory**](doc//MemoryApi.md#deletememory) | **DELETE** /memories/{id} | 
@@ -148,20 +148,20 @@ Class | Method | HTTP request | Description
 *OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | 
 *OAuthApi* | [**startOAuth**](doc//OAuthApi.md#startoauth) | **POST** /oauth/authorize | 
 *OAuthApi* | [**unlinkOAuthAccount**](doc//OAuthApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | 
-*PartnerApi* | [**createPartner**](doc//PartnerApi.md#createpartner) | **POST** /partner/{id} | 
-*PartnerApi* | [**getPartners**](doc//PartnerApi.md#getpartners) | **GET** /partner | 
-*PartnerApi* | [**removePartner**](doc//PartnerApi.md#removepartner) | **DELETE** /partner/{id} | 
-*PartnerApi* | [**updatePartner**](doc//PartnerApi.md#updatepartner) | **PUT** /partner/{id} | 
-*PersonApi* | [**createPerson**](doc//PersonApi.md#createperson) | **POST** /person | 
-*PersonApi* | [**getAllPeople**](doc//PersonApi.md#getallpeople) | **GET** /person | 
-*PersonApi* | [**getPerson**](doc//PersonApi.md#getperson) | **GET** /person/{id} | 
-*PersonApi* | [**getPersonAssets**](doc//PersonApi.md#getpersonassets) | **GET** /person/{id}/assets | 
-*PersonApi* | [**getPersonStatistics**](doc//PersonApi.md#getpersonstatistics) | **GET** /person/{id}/statistics | 
-*PersonApi* | [**getPersonThumbnail**](doc//PersonApi.md#getpersonthumbnail) | **GET** /person/{id}/thumbnail | 
-*PersonApi* | [**mergePerson**](doc//PersonApi.md#mergeperson) | **POST** /person/{id}/merge | 
-*PersonApi* | [**reassignFaces**](doc//PersonApi.md#reassignfaces) | **PUT** /person/{id}/reassign | 
-*PersonApi* | [**updatePeople**](doc//PersonApi.md#updatepeople) | **PUT** /person | 
-*PersonApi* | [**updatePerson**](doc//PersonApi.md#updateperson) | **PUT** /person/{id} | 
+*PartnerApi* | [**createPartner**](doc//PartnerApi.md#createpartner) | **POST** /partners/{id} | 
+*PartnerApi* | [**getPartners**](doc//PartnerApi.md#getpartners) | **GET** /partners | 
+*PartnerApi* | [**removePartner**](doc//PartnerApi.md#removepartner) | **DELETE** /partners/{id} | 
+*PartnerApi* | [**updatePartner**](doc//PartnerApi.md#updatepartner) | **PUT** /partners/{id} | 
+*PersonApi* | [**createPerson**](doc//PersonApi.md#createperson) | **POST** /people | 
+*PersonApi* | [**getAllPeople**](doc//PersonApi.md#getallpeople) | **GET** /people | 
+*PersonApi* | [**getPerson**](doc//PersonApi.md#getperson) | **GET** /people/{id} | 
+*PersonApi* | [**getPersonAssets**](doc//PersonApi.md#getpersonassets) | **GET** /people/{id}/assets | 
+*PersonApi* | [**getPersonStatistics**](doc//PersonApi.md#getpersonstatistics) | **GET** /people/{id}/statistics | 
+*PersonApi* | [**getPersonThumbnail**](doc//PersonApi.md#getpersonthumbnail) | **GET** /people/{id}/thumbnail | 
+*PersonApi* | [**mergePerson**](doc//PersonApi.md#mergeperson) | **POST** /people/{id}/merge | 
+*PersonApi* | [**reassignFaces**](doc//PersonApi.md#reassignfaces) | **PUT** /people/{id}/reassign | 
+*PersonApi* | [**updatePeople**](doc//PersonApi.md#updatepeople) | **PUT** /people | 
+*PersonApi* | [**updatePerson**](doc//PersonApi.md#updateperson) | **PUT** /people/{id} | 
 *SearchApi* | [**getAssetsByCity**](doc//SearchApi.md#getassetsbycity) | **GET** /search/cities | 
 *SearchApi* | [**getExploreData**](doc//SearchApi.md#getexploredata) | **GET** /search/explore | 
 *SearchApi* | [**getSearchSuggestions**](doc//SearchApi.md#getsearchsuggestions) | **GET** /search/suggestions | 
@@ -171,23 +171,23 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**searchSmart**](doc//SearchApi.md#searchsmart) | **POST** /search/smart | 
 *ServerInfoApi* | [**getServerConfig**](doc//ServerInfoApi.md#getserverconfig) | **GET** /server-info/config | 
 *ServerInfoApi* | [**getServerFeatures**](doc//ServerInfoApi.md#getserverfeatures) | **GET** /server-info/features | 
-*ServerInfoApi* | [**getServerInfo**](doc//ServerInfoApi.md#getserverinfo) | **GET** /server-info | 
 *ServerInfoApi* | [**getServerStatistics**](doc//ServerInfoApi.md#getserverstatistics) | **GET** /server-info/statistics | 
 *ServerInfoApi* | [**getServerVersion**](doc//ServerInfoApi.md#getserverversion) | **GET** /server-info/version | 
+*ServerInfoApi* | [**getStorage**](doc//ServerInfoApi.md#getstorage) | **GET** /server-info/storage | 
 *ServerInfoApi* | [**getSupportedMediaTypes**](doc//ServerInfoApi.md#getsupportedmediatypes) | **GET** /server-info/media-types | 
 *ServerInfoApi* | [**getTheme**](doc//ServerInfoApi.md#gettheme) | **GET** /server-info/theme | 
 *ServerInfoApi* | [**pingServer**](doc//ServerInfoApi.md#pingserver) | **GET** /server-info/ping | 
 *SessionsApi* | [**deleteAllSessions**](doc//SessionsApi.md#deleteallsessions) | **DELETE** /sessions | 
 *SessionsApi* | [**deleteSession**](doc//SessionsApi.md#deletesession) | **DELETE** /sessions/{id} | 
 *SessionsApi* | [**getSessions**](doc//SessionsApi.md#getsessions) | **GET** /sessions | 
-*SharedLinkApi* | [**addSharedLinkAssets**](doc//SharedLinkApi.md#addsharedlinkassets) | **PUT** /shared-link/{id}/assets | 
-*SharedLinkApi* | [**createSharedLink**](doc//SharedLinkApi.md#createsharedlink) | **POST** /shared-link | 
-*SharedLinkApi* | [**getAllSharedLinks**](doc//SharedLinkApi.md#getallsharedlinks) | **GET** /shared-link | 
-*SharedLinkApi* | [**getMySharedLink**](doc//SharedLinkApi.md#getmysharedlink) | **GET** /shared-link/me | 
-*SharedLinkApi* | [**getSharedLinkById**](doc//SharedLinkApi.md#getsharedlinkbyid) | **GET** /shared-link/{id} | 
-*SharedLinkApi* | [**removeSharedLink**](doc//SharedLinkApi.md#removesharedlink) | **DELETE** /shared-link/{id} | 
-*SharedLinkApi* | [**removeSharedLinkAssets**](doc//SharedLinkApi.md#removesharedlinkassets) | **DELETE** /shared-link/{id}/assets | 
-*SharedLinkApi* | [**updateSharedLink**](doc//SharedLinkApi.md#updatesharedlink) | **PATCH** /shared-link/{id} | 
+*SharedLinkApi* | [**addSharedLinkAssets**](doc//SharedLinkApi.md#addsharedlinkassets) | **PUT** /shared-links/{id}/assets | 
+*SharedLinkApi* | [**createSharedLink**](doc//SharedLinkApi.md#createsharedlink) | **POST** /shared-links | 
+*SharedLinkApi* | [**getAllSharedLinks**](doc//SharedLinkApi.md#getallsharedlinks) | **GET** /shared-links | 
+*SharedLinkApi* | [**getMySharedLink**](doc//SharedLinkApi.md#getmysharedlink) | **GET** /shared-links/me | 
+*SharedLinkApi* | [**getSharedLinkById**](doc//SharedLinkApi.md#getsharedlinkbyid) | **GET** /shared-links/{id} | 
+*SharedLinkApi* | [**removeSharedLink**](doc//SharedLinkApi.md#removesharedlink) | **DELETE** /shared-links/{id} | 
+*SharedLinkApi* | [**removeSharedLinkAssets**](doc//SharedLinkApi.md#removesharedlinkassets) | **DELETE** /shared-links/{id}/assets | 
+*SharedLinkApi* | [**updateSharedLink**](doc//SharedLinkApi.md#updatesharedlink) | **PATCH** /shared-links/{id} | 
 *SyncApi* | [**getDeltaSync**](doc//SyncApi.md#getdeltasync) | **POST** /sync/delta-sync | 
 *SyncApi* | [**getFullSyncForUser**](doc//SyncApi.md#getfullsyncforuser) | **POST** /sync/full-sync | 
 *SystemConfigApi* | [**getConfig**](doc//SystemConfigApi.md#getconfig) | **GET** /system-config | 
@@ -198,29 +198,32 @@ Class | Method | HTTP request | Description
 *SystemMetadataApi* | [**getAdminOnboarding**](doc//SystemMetadataApi.md#getadminonboarding) | **GET** /system-metadata/admin-onboarding | 
 *SystemMetadataApi* | [**getReverseGeocodingState**](doc//SystemMetadataApi.md#getreversegeocodingstate) | **GET** /system-metadata/reverse-geocoding-state | 
 *SystemMetadataApi* | [**updateAdminOnboarding**](doc//SystemMetadataApi.md#updateadminonboarding) | **POST** /system-metadata/admin-onboarding | 
-*TagApi* | [**createTag**](doc//TagApi.md#createtag) | **POST** /tag | 
-*TagApi* | [**deleteTag**](doc//TagApi.md#deletetag) | **DELETE** /tag/{id} | 
-*TagApi* | [**getAllTags**](doc//TagApi.md#getalltags) | **GET** /tag | 
-*TagApi* | [**getTagAssets**](doc//TagApi.md#gettagassets) | **GET** /tag/{id}/assets | 
-*TagApi* | [**getTagById**](doc//TagApi.md#gettagbyid) | **GET** /tag/{id} | 
-*TagApi* | [**tagAssets**](doc//TagApi.md#tagassets) | **PUT** /tag/{id}/assets | 
-*TagApi* | [**untagAssets**](doc//TagApi.md#untagassets) | **DELETE** /tag/{id}/assets | 
-*TagApi* | [**updateTag**](doc//TagApi.md#updatetag) | **PATCH** /tag/{id} | 
+*TagApi* | [**createTag**](doc//TagApi.md#createtag) | **POST** /tags | 
+*TagApi* | [**deleteTag**](doc//TagApi.md#deletetag) | **DELETE** /tags/{id} | 
+*TagApi* | [**getAllTags**](doc//TagApi.md#getalltags) | **GET** /tags | 
+*TagApi* | [**getTagAssets**](doc//TagApi.md#gettagassets) | **GET** /tags/{id}/assets | 
+*TagApi* | [**getTagById**](doc//TagApi.md#gettagbyid) | **GET** /tags/{id} | 
+*TagApi* | [**tagAssets**](doc//TagApi.md#tagassets) | **PUT** /tags/{id}/assets | 
+*TagApi* | [**untagAssets**](doc//TagApi.md#untagassets) | **DELETE** /tags/{id}/assets | 
+*TagApi* | [**updateTag**](doc//TagApi.md#updatetag) | **PATCH** /tags/{id} | 
 *TimelineApi* | [**getTimeBucket**](doc//TimelineApi.md#gettimebucket) | **GET** /timeline/bucket | 
 *TimelineApi* | [**getTimeBuckets**](doc//TimelineApi.md#gettimebuckets) | **GET** /timeline/buckets | 
 *TrashApi* | [**emptyTrash**](doc//TrashApi.md#emptytrash) | **POST** /trash/empty | 
 *TrashApi* | [**restoreAssets**](doc//TrashApi.md#restoreassets) | **POST** /trash/restore/assets | 
 *TrashApi* | [**restoreTrash**](doc//TrashApi.md#restoretrash) | **POST** /trash/restore | 
-*UserApi* | [**createProfileImage**](doc//UserApi.md#createprofileimage) | **POST** /user/profile-image | 
-*UserApi* | [**createUser**](doc//UserApi.md#createuser) | **POST** /user | 
-*UserApi* | [**deleteProfileImage**](doc//UserApi.md#deleteprofileimage) | **DELETE** /user/profile-image | 
-*UserApi* | [**deleteUser**](doc//UserApi.md#deleteuser) | **DELETE** /user/{id} | 
-*UserApi* | [**getAllUsers**](doc//UserApi.md#getallusers) | **GET** /user | 
-*UserApi* | [**getMyUserInfo**](doc//UserApi.md#getmyuserinfo) | **GET** /user/me | 
-*UserApi* | [**getProfileImage**](doc//UserApi.md#getprofileimage) | **GET** /user/profile-image/{id} | 
-*UserApi* | [**getUserById**](doc//UserApi.md#getuserbyid) | **GET** /user/info/{id} | 
-*UserApi* | [**restoreUser**](doc//UserApi.md#restoreuser) | **POST** /user/{id}/restore | 
-*UserApi* | [**updateUser**](doc//UserApi.md#updateuser) | **PUT** /user | 
+*UserApi* | [**createProfileImage**](doc//UserApi.md#createprofileimage) | **POST** /users/profile-image | 
+*UserApi* | [**createUserAdmin**](doc//UserApi.md#createuseradmin) | **POST** /admin/users | 
+*UserApi* | [**deleteProfileImage**](doc//UserApi.md#deleteprofileimage) | **DELETE** /users/profile-image | 
+*UserApi* | [**deleteUserAdmin**](doc//UserApi.md#deleteuseradmin) | **DELETE** /admin/users/{id} | 
+*UserApi* | [**getMyUser**](doc//UserApi.md#getmyuser) | **GET** /users/me | 
+*UserApi* | [**getProfileImage**](doc//UserApi.md#getprofileimage) | **GET** /users/{id}/profile-image | 
+*UserApi* | [**getUser**](doc//UserApi.md#getuser) | **GET** /users/{id} | 
+*UserApi* | [**getUserAdmin**](doc//UserApi.md#getuseradmin) | **GET** /admin/users/{id} | 
+*UserApi* | [**restoreUserAdmin**](doc//UserApi.md#restoreuseradmin) | **POST** /admin/users/{id}/restore | 
+*UserApi* | [**searchUsers**](doc//UserApi.md#searchusers) | **GET** /users | 
+*UserApi* | [**searchUsersAdmin**](doc//UserApi.md#searchusersadmin) | **GET** /admin/users | 
+*UserApi* | [**updateMyUser**](doc//UserApi.md#updatemyuser) | **PUT** /users/me | 
+*UserApi* | [**updateUserAdmin**](doc//UserApi.md#updateuseradmin) | **PUT** /admin/users/{id} | 
 
 
 ## Documentation For Models
@@ -259,6 +262,8 @@ Class | Method | HTTP request | Description
  - [AssetIdsResponseDto](doc//AssetIdsResponseDto.md)
  - [AssetJobName](doc//AssetJobName.md)
  - [AssetJobsDto](doc//AssetJobsDto.md)
+ - [AssetMediaResponseDto](doc//AssetMediaResponseDto.md)
+ - [AssetMediaStatus](doc//AssetMediaStatus.md)
  - [AssetOrder](doc//AssetOrder.md)
  - [AssetResponseDto](doc//AssetResponseDto.md)
  - [AssetStatsResponseDto](doc//AssetStatsResponseDto.md)
@@ -278,8 +283,6 @@ Class | Method | HTTP request | Description
  - [CreateLibraryDto](doc//CreateLibraryDto.md)
  - [CreateProfileImageResponseDto](doc//CreateProfileImageResponseDto.md)
  - [CreateTagDto](doc//CreateTagDto.md)
- - [CreateUserDto](doc//CreateUserDto.md)
- - [DeleteUserDto](doc//DeleteUserDto.md)
  - [DownloadArchiveInfo](doc//DownloadArchiveInfo.md)
  - [DownloadInfoDto](doc//DownloadInfoDto.md)
  - [DownloadResponseDto](doc//DownloadResponseDto.md)
@@ -348,10 +351,10 @@ Class | Method | HTTP request | Description
  - [SearchSuggestionType](doc//SearchSuggestionType.md)
  - [ServerConfigDto](doc//ServerConfigDto.md)
  - [ServerFeaturesDto](doc//ServerFeaturesDto.md)
- - [ServerInfoResponseDto](doc//ServerInfoResponseDto.md)
  - [ServerMediaTypesResponseDto](doc//ServerMediaTypesResponseDto.md)
  - [ServerPingResponse](doc//ServerPingResponse.md)
  - [ServerStatsResponseDto](doc//ServerStatsResponseDto.md)
+ - [ServerStorageResponseDto](doc//ServerStorageResponseDto.md)
  - [ServerThemeDto](doc//ServerThemeDto.md)
  - [ServerVersionResponseDto](doc//ServerVersionResponseDto.md)
  - [SessionResponseDto](doc//SessionResponseDto.md)
@@ -400,12 +403,15 @@ Class | Method | HTTP request | Description
  - [UpdatePartnerDto](doc//UpdatePartnerDto.md)
  - [UpdateStackParentDto](doc//UpdateStackParentDto.md)
  - [UpdateTagDto](doc//UpdateTagDto.md)
- - [UpdateUserDto](doc//UpdateUserDto.md)
  - [UsageByUserDto](doc//UsageByUserDto.md)
+ - [UserAdminCreateDto](doc//UserAdminCreateDto.md)
+ - [UserAdminDeleteDto](doc//UserAdminDeleteDto.md)
+ - [UserAdminResponseDto](doc//UserAdminResponseDto.md)
+ - [UserAdminUpdateDto](doc//UserAdminUpdateDto.md)
  - [UserAvatarColor](doc//UserAvatarColor.md)
- - [UserDto](doc//UserDto.md)
  - [UserResponseDto](doc//UserResponseDto.md)
  - [UserStatus](doc//UserStatus.md)
+ - [UserUpdateMeDto](doc//UserUpdateMeDto.md)
  - [ValidateAccessTokenResponseDto](doc//ValidateAccessTokenResponseDto.md)
  - [ValidateLibraryDto](doc//ValidateLibraryDto.md)
  - [ValidateLibraryImportPathResponseDto](doc//ValidateLibraryImportPathResponseDto.md)

mobile/openapi/doc/APIKeyApi.md

@@ -1,290 +0,0 @@
-# openapi.api.APIKeyApi
-
-## Load the API package
-```dart
-import 'package:openapi/api.dart';
-```
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**createApiKey**](APIKeyApi.md#createapikey) | **POST** /api-key | 
-[**deleteApiKey**](APIKeyApi.md#deleteapikey) | **DELETE** /api-key/{id} | 
-[**getApiKey**](APIKeyApi.md#getapikey) | **GET** /api-key/{id} | 
-[**getApiKeys**](APIKeyApi.md#getapikeys) | **GET** /api-key | 
-[**updateApiKey**](APIKeyApi.md#updateapikey) | **PUT** /api-key/{id} | 
-
-
-# **createApiKey**
-> APIKeyCreateResponseDto createApiKey(aPIKeyCreateDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = APIKeyApi();
-final aPIKeyCreateDto = APIKeyCreateDto(); // APIKeyCreateDto | 
-
-try {
-    final result = api_instance.createApiKey(aPIKeyCreateDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling APIKeyApi->createApiKey: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **aPIKeyCreateDto** | [**APIKeyCreateDto**](APIKeyCreateDto.md)|  | 
-
-### Return type
-
-[**APIKeyCreateResponseDto**](APIKeyCreateResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **deleteApiKey**
-> deleteApiKey(id)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = APIKeyApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-
-try {
-    api_instance.deleteApiKey(id);
-} catch (e) {
-    print('Exception when calling APIKeyApi->deleteApiKey: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-[[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)
-
-# **getApiKey**
-> APIKeyResponseDto getApiKey(id)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = APIKeyApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-
-try {
-    final result = api_instance.getApiKey(id);
-    print(result);
-} catch (e) {
-    print('Exception when calling APIKeyApi->getApiKey: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
-
-### Return type
-
-[**APIKeyResponseDto**](APIKeyResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
-# **getApiKeys**
-> List<APIKeyResponseDto> getApiKeys()
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = APIKeyApi();
-
-try {
-    final result = api_instance.getApiKeys();
-    print(result);
-} catch (e) {
-    print('Exception when calling APIKeyApi->getApiKeys: $e\n');
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**List<APIKeyResponseDto>**](APIKeyResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
-# **updateApiKey**
-> APIKeyResponseDto updateApiKey(id, aPIKeyUpdateDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = APIKeyApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final aPIKeyUpdateDto = APIKeyUpdateDto(); // APIKeyUpdateDto | 
-
-try {
-    final result = api_instance.updateApiKey(id, aPIKeyUpdateDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling APIKeyApi->updateApiKey: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **aPIKeyUpdateDto** | [**APIKeyUpdateDto**](APIKeyUpdateDto.md)|  | 
-
-### Return type
-
-[**APIKeyResponseDto**](APIKeyResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-

mobile/openapi/doc/APIKeyCreateDto.md

@@ -1,15 +0,0 @@
-# openapi.model.APIKeyCreateDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/APIKeyCreateResponseDto.md

@@ -1,16 +0,0 @@
-# openapi.model.APIKeyCreateResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**apiKey** | [**APIKeyResponseDto**](APIKeyResponseDto.md) |  | 
-**secret** | **String** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/APIKeyResponseDto.md

@@ -1,18 +0,0 @@
-# openapi.model.APIKeyResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**createdAt** | [**DateTime**](DateTime.md) |  | 
-**id** | **String** |  | 
-**name** | **String** |  | 
-**updatedAt** | [**DateTime**](DateTime.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/APIKeyUpdateDto.md

@@ -1,15 +0,0 @@
-# openapi.model.APIKeyUpdateDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/ActivityApi.md

@@ -1,246 +0,0 @@
-# openapi.api.ActivityApi
-
-## Load the API package
-```dart
-import 'package:openapi/api.dart';
-```
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**createActivity**](ActivityApi.md#createactivity) | **POST** /activity | 
-[**deleteActivity**](ActivityApi.md#deleteactivity) | **DELETE** /activity/{id} | 
-[**getActivities**](ActivityApi.md#getactivities) | **GET** /activity | 
-[**getActivityStatistics**](ActivityApi.md#getactivitystatistics) | **GET** /activity/statistics | 
-
-
-# **createActivity**
-> ActivityResponseDto createActivity(activityCreateDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = ActivityApi();
-final activityCreateDto = ActivityCreateDto(); // ActivityCreateDto | 
-
-try {
-    final result = api_instance.createActivity(activityCreateDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling ActivityApi->createActivity: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **activityCreateDto** | [**ActivityCreateDto**](ActivityCreateDto.md)|  | 
-
-### Return type
-
-[**ActivityResponseDto**](ActivityResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **deleteActivity**
-> deleteActivity(id)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = ActivityApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-
-try {
-    api_instance.deleteActivity(id);
-} catch (e) {
-    print('Exception when calling ActivityApi->deleteActivity: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-[[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)
-
-# **getActivities**
-> List<ActivityResponseDto> getActivities(albumId, assetId, level, type, userId)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = ActivityApi();
-final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final assetId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final level = ; // ReactionLevel | 
-final type = ; // ReactionType | 
-final userId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-
-try {
-    final result = api_instance.getActivities(albumId, assetId, level, type, userId);
-    print(result);
-} catch (e) {
-    print('Exception when calling ActivityApi->getActivities: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **albumId** | **String**|  | 
- **assetId** | **String**|  | [optional] 
- **level** | [**ReactionLevel**](.md)|  | [optional] 
- **type** | [**ReactionType**](.md)|  | [optional] 
- **userId** | **String**|  | [optional] 
-
-### Return type
-
-[**List<ActivityResponseDto>**](ActivityResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
-# **getActivityStatistics**
-> ActivityStatisticsResponseDto getActivityStatistics(albumId, assetId)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = ActivityApi();
-final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final assetId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-
-try {
-    final result = api_instance.getActivityStatistics(albumId, assetId);
-    print(result);
-} catch (e) {
-    print('Exception when calling ActivityApi->getActivityStatistics: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **albumId** | **String**|  | 
- **assetId** | **String**|  | [optional] 
-
-### Return type
-
-[**ActivityStatisticsResponseDto**](ActivityStatisticsResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-

mobile/openapi/doc/ActivityCreateDto.md

@@ -1,18 +0,0 @@
-# openapi.model.ActivityCreateDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**albumId** | **String** |  | 
-**assetId** | **String** |  | [optional] 
-**comment** | **String** |  | [optional] 
-**type** | [**ReactionType**](ReactionType.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/ActivityResponseDto.md

@@ -1,20 +0,0 @@
-# openapi.model.ActivityResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**assetId** | **String** |  | 
-**comment** | **String** |  | [optional] 
-**createdAt** | [**DateTime**](DateTime.md) |  | 
-**id** | **String** |  | 
-**type** | **String** |  | 
-**user** | [**UserDto**](UserDto.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/ActivityStatisticsResponseDto.md

@@ -1,15 +0,0 @@
-# openapi.model.ActivityStatisticsResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**comments** | **int** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AddUsersDto.md

@@ -1,16 +0,0 @@
-# openapi.model.AddUsersDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**albumUsers** | [**List<AlbumUserAddDto>**](AlbumUserAddDto.md) |  | [default to const []]
-**sharedUserIds** | **List<String>** | This property was deprecated in v1.102.0 | [optional] [default to const []]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AdminOnboardingUpdateDto.md

@@ -1,15 +0,0 @@
-# openapi.model.AdminOnboardingUpdateDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**isOnboarded** | **bool** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AlbumApi.md

@@ -1,644 +0,0 @@
-# openapi.api.AlbumApi
-
-## Load the API package
-```dart
-import 'package:openapi/api.dart';
-```
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**addAssetsToAlbum**](AlbumApi.md#addassetstoalbum) | **PUT** /album/{id}/assets | 
-[**addUsersToAlbum**](AlbumApi.md#adduserstoalbum) | **PUT** /album/{id}/users | 
-[**createAlbum**](AlbumApi.md#createalbum) | **POST** /album | 
-[**deleteAlbum**](AlbumApi.md#deletealbum) | **DELETE** /album/{id} | 
-[**getAlbumCount**](AlbumApi.md#getalbumcount) | **GET** /album/count | 
-[**getAlbumInfo**](AlbumApi.md#getalbuminfo) | **GET** /album/{id} | 
-[**getAllAlbums**](AlbumApi.md#getallalbums) | **GET** /album | 
-[**removeAssetFromAlbum**](AlbumApi.md#removeassetfromalbum) | **DELETE** /album/{id}/assets | 
-[**removeUserFromAlbum**](AlbumApi.md#removeuserfromalbum) | **DELETE** /album/{id}/user/{userId} | 
-[**updateAlbumInfo**](AlbumApi.md#updatealbuminfo) | **PATCH** /album/{id} | 
-[**updateAlbumUser**](AlbumApi.md#updatealbumuser) | **PUT** /album/{id}/user/{userId} | 
-
-
-# **addAssetsToAlbum**
-> List<BulkIdResponseDto> addAssetsToAlbum(id, bulkIdsDto, key)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final bulkIdsDto = BulkIdsDto(); // BulkIdsDto | 
-final key = key_example; // String | 
-
-try {
-    final result = api_instance.addAssetsToAlbum(id, bulkIdsDto, key);
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->addAssetsToAlbum: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **bulkIdsDto** | [**BulkIdsDto**](BulkIdsDto.md)|  | 
- **key** | **String**|  | [optional] 
-
-### Return type
-
-[**List<BulkIdResponseDto>**](BulkIdResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **addUsersToAlbum**
-> AlbumResponseDto addUsersToAlbum(id, addUsersDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final addUsersDto = AddUsersDto(); // AddUsersDto | 
-
-try {
-    final result = api_instance.addUsersToAlbum(id, addUsersDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->addUsersToAlbum: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **addUsersDto** | [**AddUsersDto**](AddUsersDto.md)|  | 
-
-### Return type
-
-[**AlbumResponseDto**](AlbumResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **createAlbum**
-> AlbumResponseDto createAlbum(createAlbumDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final createAlbumDto = CreateAlbumDto(); // CreateAlbumDto | 
-
-try {
-    final result = api_instance.createAlbum(createAlbumDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->createAlbum: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **createAlbumDto** | [**CreateAlbumDto**](CreateAlbumDto.md)|  | 
-
-### Return type
-
-[**AlbumResponseDto**](AlbumResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **deleteAlbum**
-> deleteAlbum(id)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-
-try {
-    api_instance.deleteAlbum(id);
-} catch (e) {
-    print('Exception when calling AlbumApi->deleteAlbum: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-[[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)
-
-# **getAlbumCount**
-> AlbumCountResponseDto getAlbumCount()
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-
-try {
-    final result = api_instance.getAlbumCount();
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->getAlbumCount: $e\n');
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**AlbumCountResponseDto**](AlbumCountResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
-# **getAlbumInfo**
-> AlbumResponseDto getAlbumInfo(id, key, withoutAssets)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final key = key_example; // String | 
-final withoutAssets = true; // bool | 
-
-try {
-    final result = api_instance.getAlbumInfo(id, key, withoutAssets);
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->getAlbumInfo: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **key** | **String**|  | [optional] 
- **withoutAssets** | **bool**|  | [optional] 
-
-### Return type
-
-[**AlbumResponseDto**](AlbumResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
-# **getAllAlbums**
-> List<AlbumResponseDto> getAllAlbums(assetId, shared)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final assetId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums
-final shared = true; // bool | 
-
-try {
-    final result = api_instance.getAllAlbums(assetId, shared);
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->getAllAlbums: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **assetId** | **String**| Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums | [optional] 
- **shared** | **bool**|  | [optional] 
-
-### Return type
-
-[**List<AlbumResponseDto>**](AlbumResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
-# **removeAssetFromAlbum**
-> List<BulkIdResponseDto> removeAssetFromAlbum(id, bulkIdsDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final bulkIdsDto = BulkIdsDto(); // BulkIdsDto | 
-
-try {
-    final result = api_instance.removeAssetFromAlbum(id, bulkIdsDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->removeAssetFromAlbum: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **bulkIdsDto** | [**BulkIdsDto**](BulkIdsDto.md)|  | 
-
-### Return type
-
-[**List<BulkIdResponseDto>**](BulkIdResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **removeUserFromAlbum**
-> removeUserFromAlbum(id, userId)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final userId = userId_example; // String | 
-
-try {
-    api_instance.removeUserFromAlbum(id, userId);
-} catch (e) {
-    print('Exception when calling AlbumApi->removeUserFromAlbum: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **userId** | **String**|  | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-[[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)
-
-# **updateAlbumInfo**
-> AlbumResponseDto updateAlbumInfo(id, updateAlbumDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final updateAlbumDto = UpdateAlbumDto(); // UpdateAlbumDto | 
-
-try {
-    final result = api_instance.updateAlbumInfo(id, updateAlbumDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling AlbumApi->updateAlbumInfo: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **updateAlbumDto** | [**UpdateAlbumDto**](UpdateAlbumDto.md)|  | 
-
-### Return type
-
-[**AlbumResponseDto**](AlbumResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **updateAlbumUser**
-> updateAlbumUser(id, userId, updateAlbumUserDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AlbumApi();
-final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final userId = userId_example; // String | 
-final updateAlbumUserDto = UpdateAlbumUserDto(); // UpdateAlbumUserDto | 
-
-try {
-    api_instance.updateAlbumUser(id, userId, updateAlbumUserDto);
-} catch (e) {
-    print('Exception when calling AlbumApi->updateAlbumUser: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **String**|  | 
- **userId** | **String**|  | 
- **updateAlbumUserDto** | [**UpdateAlbumUserDto**](UpdateAlbumUserDto.md)|  | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: Not defined
-
-[[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)
-

mobile/openapi/doc/AlbumCountResponseDto.md

@@ -1,17 +0,0 @@
-# openapi.model.AlbumCountResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**notShared** | **int** |  | 
-**owned** | **int** |  | 
-**shared** | **int** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AlbumResponseDto.md

@@ -1,33 +0,0 @@
-# openapi.model.AlbumResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**albumName** | **String** |  | 
-**albumThumbnailAssetId** | **String** |  | 
-**albumUsers** | [**List<AlbumUserResponseDto>**](AlbumUserResponseDto.md) |  | [default to const []]
-**assetCount** | **int** |  | 
-**assets** | [**List<AssetResponseDto>**](AssetResponseDto.md) |  | [default to const []]
-**createdAt** | [**DateTime**](DateTime.md) |  | 
-**description** | **String** |  | 
-**endDate** | [**DateTime**](DateTime.md) |  | [optional] 
-**hasSharedLink** | **bool** |  | 
-**id** | **String** |  | 
-**isActivityEnabled** | **bool** |  | 
-**lastModifiedAssetTimestamp** | [**DateTime**](DateTime.md) |  | [optional] 
-**order** | [**AssetOrder**](AssetOrder.md) |  | [optional] 
-**owner** | [**UserResponseDto**](UserResponseDto.md) |  | 
-**ownerId** | **String** |  | 
-**shared** | **bool** |  | 
-**sharedUsers** | [**List<UserResponseDto>**](UserResponseDto.md) | This property was deprecated in v1.102.0 | [default to const []]
-**startDate** | [**DateTime**](DateTime.md) |  | [optional] 
-**updatedAt** | [**DateTime**](DateTime.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AlbumUserAddDto.md

@@ -1,16 +0,0 @@
-# openapi.model.AlbumUserAddDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**role** | [**AlbumUserRole**](AlbumUserRole.md) |  | [optional] 
-**userId** | **String** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AlbumUserCreateDto.md

@@ -1,16 +0,0 @@
-# openapi.model.AlbumUserCreateDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**role** | [**AlbumUserRole**](AlbumUserRole.md) |  | 
-**userId** | **String** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AlbumUserResponseDto.md

@@ -1,16 +0,0 @@
-# openapi.model.AlbumUserResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**role** | [**AlbumUserRole**](AlbumUserRole.md) |  | 
-**user** | [**UserResponseDto**](UserResponseDto.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AlbumUserRole.md

@@ -1,14 +0,0 @@
-# openapi.model.AlbumUserRole
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AllJobStatusResponseDto.md

@@ -1,28 +0,0 @@
-# openapi.model.AllJobStatusResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**backgroundTask** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**duplicateDetection** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**faceDetection** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**facialRecognition** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**library_** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**metadataExtraction** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**migration** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**notifications** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**search** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**sidecar** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**smartSearch** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**storageTemplateMigration** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**thumbnailGeneration** | [**JobStatusDto**](JobStatusDto.md) |  | 
-**videoConversion** | [**JobStatusDto**](JobStatusDto.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetBulkDeleteDto.md

@@ -1,16 +0,0 @@
-# openapi.model.AssetBulkDeleteDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**force** | **bool** |  | [optional] 
-**ids** | **List<String>** |  | [default to const []]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetBulkUpdateDto.md

@@ -1,22 +0,0 @@
-# openapi.model.AssetBulkUpdateDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**dateTimeOriginal** | **String** |  | [optional] 
-**ids** | **List<String>** |  | [default to const []]
-**isArchived** | **bool** |  | [optional] 
-**isFavorite** | **bool** |  | [optional] 
-**latitude** | **num** |  | [optional] 
-**longitude** | **num** |  | [optional] 
-**removeParent** | **bool** |  | [optional] 
-**stackParentId** | **String** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetBulkUploadCheckDto.md

@@ -1,15 +0,0 @@
-# openapi.model.AssetBulkUploadCheckDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**assets** | [**List<AssetBulkUploadCheckItem>**](AssetBulkUploadCheckItem.md) |  | [default to const []]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetBulkUploadCheckItem.md

@@ -1,16 +0,0 @@
-# openapi.model.AssetBulkUploadCheckItem
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**checksum** | **String** | base64 or hex encoded sha1 hash | 
-**id** | **String** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetBulkUploadCheckResponseDto.md

@@ -1,15 +0,0 @@
-# openapi.model.AssetBulkUploadCheckResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**results** | [**List<AssetBulkUploadCheckResult>**](AssetBulkUploadCheckResult.md) |  | [default to const []]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetBulkUploadCheckResult.md

@@ -1,18 +0,0 @@
-# openapi.model.AssetBulkUploadCheckResult
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**action** | **String** |  | 
-**assetId** | **String** |  | [optional] 
-**id** | **String** |  | 
-**reason** | **String** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetDeltaSyncDto.md

@@ -1,16 +0,0 @@
-# openapi.model.AssetDeltaSyncDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**updatedAfter** | [**DateTime**](DateTime.md) |  | 
-**userIds** | **List<String>** |  | [default to const []]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetDeltaSyncResponseDto.md

@@ -1,17 +0,0 @@
-# openapi.model.AssetDeltaSyncResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**deleted** | **List<String>** |  | [default to const []]
-**needsFullSync** | **bool** |  | 
-**upserted** | [**List<AssetResponseDto>**](AssetResponseDto.md) |  | [default to const []]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetFaceResponseDto.md

@@ -1,22 +0,0 @@
-# openapi.model.AssetFaceResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**boundingBoxX1** | **int** |  | 
-**boundingBoxX2** | **int** |  | 
-**boundingBoxY1** | **int** |  | 
-**boundingBoxY2** | **int** |  | 
-**id** | **String** |  | 
-**imageHeight** | **int** |  | 
-**imageWidth** | **int** |  | 
-**person** | [**PersonResponseDto**](PersonResponseDto.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetFaceUpdateDto.md

@@ -1,15 +0,0 @@
-# openapi.model.AssetFaceUpdateDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**data** | [**List<AssetFaceUpdateItem>**](AssetFaceUpdateItem.md) |  | [default to const []]
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetFaceUpdateItem.md

@@ -1,16 +0,0 @@
-# openapi.model.AssetFaceUpdateItem
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**assetId** | **String** |  | 
-**personId** | **String** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetFaceWithoutPersonResponseDto.md

@@ -1,21 +0,0 @@
-# openapi.model.AssetFaceWithoutPersonResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**boundingBoxX1** | **int** |  | 
-**boundingBoxX2** | **int** |  | 
-**boundingBoxY1** | **int** |  | 
-**boundingBoxY2** | **int** |  | 
-**id** | **String** |  | 
-**imageHeight** | **int** |  | 
-**imageWidth** | **int** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetFileUploadResponseDto.md

@@ -1,16 +0,0 @@
-# openapi.model.AssetFileUploadResponseDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**duplicate** | **bool** |  | 
-**id** | **String** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

mobile/openapi/doc/AssetFullSyncDto.md

@@ -1,19 +0,0 @@
-# openapi.model.AssetFullSyncDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**lastCreationDate** | [**DateTime**](DateTime.md) |  | [optional] 
-**lastId** | **String** |  | [optional] 
-**limit** | **int** |  | 
-**updatedUntil** | [**DateTime**](DateTime.md) |  | 
-**userId** | **String** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-