Version v1.95.1

fix(server): don't return archived assets by default (#7278 )
* don't show archived results by default * fix e2e * generate sql * set default in dto --------- Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
2024-02-21 04:02:43 +00:00 · 2024-02-21 03:59:26 +00:00 · 2024-02-20 20:44:34 -06:00 · 2024-02-21 02:13:43 +00:00 · 2024-02-20 14:02:01 -06:00 · 2024-02-20 13:58:41 -06:00
416 changed files with 15339 additions and 8351 deletions
@@ -32,7 +32,11 @@ jobs:
      - name: Run dart analyze
        run: dart analyze --fatal-infos
        working-directory: ./mobile
-      
+
+      - name: Run dart format
+        run: dart format lib/ --set-exit-if-changed
+        working-directory: ./mobile
+
      # Enable after riverpod generator migration is completed
      # - name: Run dart custom lint
      #   run: dart run custom_lint
@@ -135,38 +135,6 @@ jobs:
        run: npm run test:cov
        if: ${{ !cancelled() }}

-  cli-e2e-tests:
-    name: CLI (e2e)
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./cli
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: "recursive"
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Run setup typescript-sdk
-        run: npm ci && npm run build
-        working-directory: ./open-api/typescript-sdk
-
-      - name: Run npm install (cli)
-        run: npm ci
-
-      - name: Run npm install (server)
-        run: npm ci && npm run build
-        working-directory: ./server
-
-      - name: Run e2e tests
-        run: npm run test:e2e
-
  web-unit-tests:
    name: Web
    runs-on: ubuntu-latest
@@ -205,8 +173,8 @@ jobs:
        run: npm run test:cov
        if: ${{ !cancelled() }}

-  web-e2e-tests:
-    name: Web (e2e)
+  e2e-tests:
+    name: End-to-End Tests
    runs-on: ubuntu-latest
    defaults:
      run:
@@ -215,11 +183,22 @@ jobs:
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20

      - name: Run setup typescript-sdk
        run: npm ci && npm run build
        working-directory: ./open-api/typescript-sdk

+      - name: Run setup cli
+        run: npm ci && npm run build
+        working-directory: ./cli
+
      - name: Install dependencies
        run: npm ci

@@ -227,10 +206,12 @@ jobs:
        run: npx playwright install --with-deps

      - name: Docker build
-        run: docker compose -f docker/docker-compose.e2e.yml build
-        working-directory: ./
+        run: docker compose build

-      - name: Run e2e tests
+      - name: Run e2e tests (api & cli)
+        run: npm run test
+
+      - name: Run e2e tests (web)
        run: npx playwright test

  mobile-unit-tests:
@@ -277,6 +258,19 @@ jobs:
        run: |
          poetry run pytest app --cov=app --cov-report term-missing

+  shellcheck:
+    name: ShellCheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run ShellCheck
+        uses: ludeeus/action-shellcheck@master
+        with:
+          ignore_paths: >-
+            **/open-api/**
+            **/openapi/**
+            **/node_modules/**
+
  generated-api-up-to-date:
    name: OpenAPI Clients
    runs-on: ubuntu-latest
@@ -285,7 +279,7 @@ jobs:
      - name: Run API generation
        run: make open-api
      - name: Find file changes
-        uses: tj-actions/verify-changed-files@v13.1
+        uses: tj-actions/verify-changed-files@v18
        id: verify-changed-files
        with:
          files: |
@@ -340,7 +334,7 @@ jobs:
        run: npm run typeorm:migrations:generate ./src/infra/migrations/TestMigration

      - name: Find file changes
-        uses: tj-actions/verify-changed-files@v13.1
+        uses: tj-actions/verify-changed-files@v18
        id: verify-changed-files
        with:
          files: |
@@ -358,7 +352,7 @@ jobs:
          DB_URL: postgres://postgres:postgres@localhost:5432/immich

      - name: Find file changes
-        uses: tj-actions/verify-changed-files@v13.1
+        uses: tj-actions/verify-changed-files@v18
        id: verify-changed-sql-files
        with:
          files: |
@@ -24,7 +24,7 @@ server-e2e-api:

 .PHONY: e2e
 e2e:
-	docker compose -f ./docker/docker-compose.e2e.yml up --build -V --remove-orphans
+	docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans

 prod:
 	docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
@@ -10,7 +10,6 @@ module.exports = {
  root: true,
  env: {
    node: true,
-    jest: true,
  },
  ignorePatterns: ['.eslintrc.js'],
  rules: {
@@ -22,11 +21,6 @@ module.exports = {
    'unicorn/prefer-module': 'off',
    curly: 2,
    'prettier/prettier': 0,
-    'unicorn/prevent-abbreviations': [
-      'error',
-      {
-        ignore: ['\\.e2e-spec$', /^ignore/i],
-      },
-    ],
+    'unicorn/prevent-abbreviations': 'error',
  },
 };
@@ -1,5 +1,4 @@
 **/*.spec.js
-test/**
 upload/**
 .editorconfig
 .eslintignore
@@ -2,5 +2,7 @@
  "singleQuote": true,
  "trailingComma": "all",
  "printWidth": 120,
-  "semi": true
+  "semi": true,
+  "plugins": ["prettier-plugin-organize-imports"],
+  "organizeImportsSkipDestructiveCodeActions": true
 }
@@ -1,4 +1,4 @@
-FROM node:20-alpine3.19 as core
+FROM node:20-alpine3.19@sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c as core

 WORKDIR /usr/src/open-api/typescript-sdk
 COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./
@@ -8,6 +8,9 @@
      "name": "@immich/cli",
      "version": "2.0.8",
      "license": "GNU Affero General Public License version 3",
+      "dependencies": {
+        "lodash-es": "^4.17.21"
+      },
      "bin": {
        "immich": "dist/index.js"
      },
@@ -16,10 +19,11 @@
        "@testcontainers/postgresql": "^10.7.1",
        "@types/byte-size": "^8.1.0",
        "@types/cli-progress": "^3.11.0",
+        "@types/lodash-es": "^4.17.12",
        "@types/mock-fs": "^4.13.1",
        "@types/node": "^20.3.1",
-        "@typescript-eslint/eslint-plugin": "^6.21.0",
-        "@typescript-eslint/parser": "^6.21.0",
+        "@typescript-eslint/eslint-plugin": "^7.0.0",
+        "@typescript-eslint/parser": "^7.0.0",
        "@vitest/coverage-v8": "^1.2.2",
        "byte-size": "^8.1.1",
        "cli-progress": "^3.12.0",
@@ -29,8 +33,9 @@
        "eslint-plugin-prettier": "^5.1.3",
        "eslint-plugin-unicorn": "^51.0.0",
        "glob": "^10.3.1",
-        "immich": "file:../server",
        "mock-fs": "^5.2.0",
+        "prettier": "^3.2.5",
+        "prettier-plugin-organize-imports": "^3.2.4",
        "typescript": "^5.3.3",
        "vite": "^5.0.12",
        "vitest": "^1.2.2",
@@ -46,8 +51,8 @@
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "devDependencies": {
+        "@oazapfts/runtime": "^1.0.0",
        "@types/node": "^20.11.0",
-        "oazapfts": "^5.1.4",
        "typescript": "^5.3.3"
      },
      "peerDependencies": {
@@ -62,7 +67,7 @@
    "../server": {
      "name": "immich",
      "version": "1.94.1",
-      "dev": true,
+      "extraneous": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@babel/runtime": "^7.22.11",
@@ -132,8 +137,8 @@
        "@types/sharp": "^0.31.1",
        "@types/supertest": "^6.0.0",
        "@types/ua-parser-js": "^0.7.36",
-        "@typescript-eslint/eslint-plugin": "^6.4.1",
-        "@typescript-eslint/parser": "^6.4.1",
+        "@typescript-eslint/eslint-plugin": "^7.0.0",
+        "@typescript-eslint/parser": "^7.0.0",
        "dotenv": "^16.3.1",
        "eslint": "^8.56.0",
        "eslint-config-prettier": "^9.1.0",
@@ -1295,6 +1300,21 @@
      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
      "dev": true
    },
+    "node_modules/@types/lodash": {
+      "version": "4.14.202",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
+      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
+      "dev": true
+    },
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
    "node_modules/@types/mock-fs": {
      "version": "4.13.4",
      "resolved": "https://registry.npmjs.org/@types/mock-fs/-/mock-fs-4.13.4.tgz",
@@ -1305,9 +1325,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "20.11.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
-      "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
+      "version": "20.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
+      "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
      "dev": true,
      "dependencies": {
        "undici-types": "~5.26.4"
@@ -1320,9 +1340,9 @@
      "dev": true
    },
    "node_modules/@types/semver": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
-      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",
+      "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==",
      "dev": true
    },
    "node_modules/@types/ssh2": {
@@ -1353,16 +1373,16 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
-      "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.1.tgz",
+      "integrity": "sha512-OLvgeBv3vXlnnJGIAgCLYKjgMEU+wBGj07MQ/nxAaON+3mLzX7mJbhRYrVGiVvFiXtwFlkcBa/TtmglHy0UbzQ==",
      "dev": true,
      "dependencies": {
        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.21.0",
-        "@typescript-eslint/type-utils": "6.21.0",
-        "@typescript-eslint/utils": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0",
+        "@typescript-eslint/scope-manager": "7.0.1",
+        "@typescript-eslint/type-utils": "7.0.1",
+        "@typescript-eslint/utils": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1",
        "debug": "^4.3.4",
        "graphemer": "^1.4.0",
        "ignore": "^5.2.4",
@@ -1378,8 +1398,8 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
-        "eslint": "^7.0.0 || ^8.0.0"
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
      },
      "peerDependenciesMeta": {
        "typescript": {
@@ -1388,15 +1408,15 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
-      "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.0.1.tgz",
+      "integrity": "sha512-8GcRRZNzaHxKzBPU3tKtFNing571/GwPBeCvmAUw0yBtfE2XVd0zFKJIMSWkHJcPQi0ekxjIts6L/rrZq5cxGQ==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/scope-manager": "6.21.0",
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/typescript-estree": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0",
+        "@typescript-eslint/scope-manager": "7.0.1",
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/typescript-estree": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -1407,7 +1427,7 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
      },
      "peerDependenciesMeta": {
        "typescript": {
@@ -1416,13 +1436,13 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
-      "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.0.1.tgz",
+      "integrity": "sha512-v7/T7As10g3bcWOOPAcbnMDuvctHzCFYCG/8R4bK4iYzdFqsZTbXGln0cZNVcwQcwewsYU2BJLay8j0/4zOk4w==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0"
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1"
      },
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@@ -1433,13 +1453,13 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
-      "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.0.1.tgz",
+      "integrity": "sha512-YtT9UcstTG5Yqy4xtLiClm1ZpM/pWVGFnkAa90UfdkkZsR1eP2mR/1jbHeYp8Ay1l1JHPyGvoUYR6o3On5Nhmw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.21.0",
-        "@typescript-eslint/utils": "6.21.0",
+        "@typescript-eslint/typescript-estree": "7.0.1",
+        "@typescript-eslint/utils": "7.0.1",
        "debug": "^4.3.4",
        "ts-api-utils": "^1.0.1"
      },
@@ -1451,7 +1471,7 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
      },
      "peerDependenciesMeta": {
        "typescript": {
@@ -1460,9 +1480,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
-      "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.0.1.tgz",
+      "integrity": "sha512-uJDfmirz4FHib6ENju/7cz9SdMSkeVvJDK3VcMFvf/hAShg8C74FW+06MaQPODHfDJp/z/zHfgawIJRjlu0RLg==",
      "dev": true,
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@@ -1473,13 +1493,13 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
-      "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.1.tgz",
+      "integrity": "sha512-SO9wHb6ph0/FN5OJxH4MiPscGah5wjOd0RRpaLvuBv9g8565Fgu0uMySFEPqwPHiQU90yzJ2FjRYKGrAhS1xig==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0",
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1",
        "debug": "^4.3.4",
        "globby": "^11.1.0",
        "is-glob": "^4.0.3",
@@ -1525,17 +1545,17 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
-      "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.0.1.tgz",
+      "integrity": "sha512-oe4his30JgPbnv+9Vef1h48jm0S6ft4mNwi9wj7bX10joGn07QRfqIqFHoMiajrtoU88cIhXf8ahwgrcbNLgPA==",
      "dev": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.4.0",
        "@types/json-schema": "^7.0.12",
        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.21.0",
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/typescript-estree": "6.21.0",
+        "@typescript-eslint/scope-manager": "7.0.1",
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/typescript-estree": "7.0.1",
        "semver": "^7.5.4"
      },
      "engines": {
@@ -1546,16 +1566,16 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
-      "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.1.tgz",
+      "integrity": "sha512-hwAgrOyk++RTXrP4KzCg7zB2U0xt7RUU0ZdMSCsqF3eKUwkdXUMyTb0qdCuji7VIbcpG62kKTU9M1J1c9UpFBw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/types": "7.0.1",
        "eslint-visitor-keys": "^3.4.1"
      },
      "engines": {
@@ -3166,10 +3186,6 @@
        "node": ">= 4"
      }
    },
-    "node_modules/immich": {
-      "resolved": "../server",
-      "link": true
-    },
    "node_modules/import-fresh": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -3542,6 +3558,11 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
    "node_modules/lodash.defaults": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -4068,11 +4089,10 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
      "dev": true,
-      "peer": true,
      "bin": {
        "prettier": "bin/prettier.cjs"
      },
@@ -4095,6 +4115,26 @@
        "node": ">=6.0.0"
      }
    },
+    "node_modules/prettier-plugin-organize-imports": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz",
+      "integrity": "sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==",
+      "dev": true,
+      "peerDependencies": {
+        "@volar/vue-language-plugin-pug": "^1.0.4",
+        "@volar/vue-typescript": "^1.0.4",
+        "prettier": ">=2.0",
+        "typescript": ">=2.9"
+      },
+      "peerDependenciesMeta": {
+        "@volar/vue-language-plugin-pug": {
+          "optional": true
+        },
+        "@volar/vue-typescript": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/pretty-format": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -5200,9 +5240,9 @@
      }
    },
    "node_modules/vite": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.0.tgz",
-      "integrity": "sha512-STmSFzhY4ljuhz14bg9LkMTk3d98IO6DIArnTY6MeBwiD1Za2StcQtz7fzOUnRCqrHSD5+OS2reg4HOz1eoLnw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.2.tgz",
+      "integrity": "sha512-uwiFebQbTWRIGbCaTEBVAfKqgqKNKMJ2uPXsXeLIZxM8MVMjoS3j0cG8NrPxdDIadaWnPSjrkLWffLSC+uiP3Q==",
      "dev": true,
      "dependencies": {
        "esbuild": "^0.19.3",
@@ -6111,8 +6151,8 @@
    "@immich/sdk": {
      "version": "file:../open-api/typescript-sdk",
      "requires": {
+        "@oazapfts/runtime": "^1.0.0",
        "@types/node": "^20.11.0",
-        "oazapfts": "^5.1.4",
        "typescript": "^5.3.3"
      }
    },
@@ -6416,6 +6456,21 @@
      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
      "dev": true
    },
+    "@types/lodash": {
+      "version": "4.14.202",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
+      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
+      "dev": true
+    },
+    "@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+      "dev": true,
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
    "@types/mock-fs": {
      "version": "4.13.4",
      "resolved": "https://registry.npmjs.org/@types/mock-fs/-/mock-fs-4.13.4.tgz",
@@ -6426,9 +6481,9 @@
      }
    },
    "@types/node": {
-      "version": "20.11.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
-      "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
+      "version": "20.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
+      "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
      "dev": true,
      "requires": {
        "undici-types": "~5.26.4"
@@ -6441,9 +6496,9 @@
      "dev": true
    },
    "@types/semver": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
-      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",
+      "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==",
      "dev": true
    },
    "@types/ssh2": {
@@ -6476,16 +6531,16 @@
      }
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
-      "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.1.tgz",
+      "integrity": "sha512-OLvgeBv3vXlnnJGIAgCLYKjgMEU+wBGj07MQ/nxAaON+3mLzX7mJbhRYrVGiVvFiXtwFlkcBa/TtmglHy0UbzQ==",
      "dev": true,
      "requires": {
        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.21.0",
-        "@typescript-eslint/type-utils": "6.21.0",
-        "@typescript-eslint/utils": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0",
+        "@typescript-eslint/scope-manager": "7.0.1",
+        "@typescript-eslint/type-utils": "7.0.1",
+        "@typescript-eslint/utils": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1",
        "debug": "^4.3.4",
        "graphemer": "^1.4.0",
        "ignore": "^5.2.4",
@@ -6495,54 +6550,54 @@
      }
    },
    "@typescript-eslint/parser": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
-      "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.0.1.tgz",
+      "integrity": "sha512-8GcRRZNzaHxKzBPU3tKtFNing571/GwPBeCvmAUw0yBtfE2XVd0zFKJIMSWkHJcPQi0ekxjIts6L/rrZq5cxGQ==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/scope-manager": "6.21.0",
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/typescript-estree": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0",
+        "@typescript-eslint/scope-manager": "7.0.1",
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/typescript-estree": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1",
        "debug": "^4.3.4"
      }
    },
    "@typescript-eslint/scope-manager": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
-      "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.0.1.tgz",
+      "integrity": "sha512-v7/T7As10g3bcWOOPAcbnMDuvctHzCFYCG/8R4bK4iYzdFqsZTbXGln0cZNVcwQcwewsYU2BJLay8j0/4zOk4w==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0"
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1"
      }
    },
    "@typescript-eslint/type-utils": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
-      "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.0.1.tgz",
+      "integrity": "sha512-YtT9UcstTG5Yqy4xtLiClm1ZpM/pWVGFnkAa90UfdkkZsR1eP2mR/1jbHeYp8Ay1l1JHPyGvoUYR6o3On5Nhmw==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/typescript-estree": "6.21.0",
-        "@typescript-eslint/utils": "6.21.0",
+        "@typescript-eslint/typescript-estree": "7.0.1",
+        "@typescript-eslint/utils": "7.0.1",
        "debug": "^4.3.4",
        "ts-api-utils": "^1.0.1"
      }
    },
    "@typescript-eslint/types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
-      "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.0.1.tgz",
+      "integrity": "sha512-uJDfmirz4FHib6ENju/7cz9SdMSkeVvJDK3VcMFvf/hAShg8C74FW+06MaQPODHfDJp/z/zHfgawIJRjlu0RLg==",
      "dev": true
    },
    "@typescript-eslint/typescript-estree": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
-      "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.1.tgz",
+      "integrity": "sha512-SO9wHb6ph0/FN5OJxH4MiPscGah5wjOd0RRpaLvuBv9g8565Fgu0uMySFEPqwPHiQU90yzJ2FjRYKGrAhS1xig==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/visitor-keys": "6.21.0",
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/visitor-keys": "7.0.1",
        "debug": "^4.3.4",
        "globby": "^11.1.0",
        "is-glob": "^4.0.3",
@@ -6572,27 +6627,27 @@
      }
    },
    "@typescript-eslint/utils": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
-      "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.0.1.tgz",
+      "integrity": "sha512-oe4his30JgPbnv+9Vef1h48jm0S6ft4mNwi9wj7bX10joGn07QRfqIqFHoMiajrtoU88cIhXf8ahwgrcbNLgPA==",
      "dev": true,
      "requires": {
        "@eslint-community/eslint-utils": "^4.4.0",
        "@types/json-schema": "^7.0.12",
        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.21.0",
-        "@typescript-eslint/types": "6.21.0",
-        "@typescript-eslint/typescript-estree": "6.21.0",
+        "@typescript-eslint/scope-manager": "7.0.1",
+        "@typescript-eslint/types": "7.0.1",
+        "@typescript-eslint/typescript-estree": "7.0.1",
        "semver": "^7.5.4"
      }
    },
    "@typescript-eslint/visitor-keys": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
-      "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.1.tgz",
+      "integrity": "sha512-hwAgrOyk++RTXrP4KzCg7zB2U0xt7RUU0ZdMSCsqF3eKUwkdXUMyTb0qdCuji7VIbcpG62kKTU9M1J1c9UpFBw==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "6.21.0",
+        "@typescript-eslint/types": "7.0.1",
        "eslint-visitor-keys": "^3.4.1"
      }
    },
@@ -7773,99 +7828,6 @@
      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
      "dev": true
    },
-    "immich": {
-      "version": "file:../server",
-      "requires": {
-        "@babel/runtime": "^7.22.11",
-        "@immich/cli": "^2.0.7",
-        "@nestjs/bullmq": "^10.0.1",
-        "@nestjs/cli": "^10.1.16",
-        "@nestjs/common": "^10.2.2",
-        "@nestjs/config": "^3.0.0",
-        "@nestjs/core": "^10.2.2",
-        "@nestjs/platform-express": "^10.2.2",
-        "@nestjs/platform-socket.io": "^10.2.2",
-        "@nestjs/schedule": "^4.0.0",
-        "@nestjs/schematics": "^10.0.2",
-        "@nestjs/swagger": "^7.1.8",
-        "@nestjs/testing": "^10.2.2",
-        "@nestjs/typeorm": "^10.0.0",
-        "@nestjs/websockets": "^10.2.2",
-        "@socket.io/postgres-adapter": "^0.3.1",
-        "@testcontainers/postgresql": "^10.2.1",
-        "@types/archiver": "^6.0.0",
-        "@types/async-lock": "^1.4.2",
-        "@types/bcrypt": "^5.0.0",
-        "@types/cookie-parser": "^1.4.3",
-        "@types/express": "^4.17.17",
-        "@types/fluent-ffmpeg": "^2.1.21",
-        "@types/imagemin": "^8.0.1",
-        "@types/jest": "29.5.12",
-        "@types/jest-when": "^3.5.2",
-        "@types/lodash": "^4.14.197",
-        "@types/mock-fs": "^4.13.1",
-        "@types/multer": "^1.4.7",
-        "@types/node": "^20.5.7",
-        "@types/picomatch": "^2.3.3",
-        "@types/sharp": "^0.31.1",
-        "@types/supertest": "^6.0.0",
-        "@types/ua-parser-js": "^0.7.36",
-        "@typescript-eslint/eslint-plugin": "^6.4.1",
-        "@typescript-eslint/parser": "^6.4.1",
-        "archiver": "^6.0.0",
-        "async-lock": "^1.4.0",
-        "bcrypt": "^5.1.1",
-        "bullmq": "^4.8.0",
-        "chokidar": "^3.5.3",
-        "class-transformer": "^0.5.1",
-        "class-validator": "^0.14.0",
-        "cookie-parser": "^1.4.6",
-        "dotenv": "^16.3.1",
-        "eslint": "^8.56.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.1.3",
-        "eslint-plugin-unicorn": "^51.0.0",
-        "exiftool-vendored": "~24.4.0",
-        "exiftool-vendored.pl": "12.73",
-        "fluent-ffmpeg": "^2.1.2",
-        "geo-tz": "^8.0.0",
-        "glob": "^10.3.3",
-        "handlebars": "^4.7.8",
-        "i18n-iso-countries": "^7.6.0",
-        "ioredis": "^5.3.2",
-        "jest": "^29.6.4",
-        "jest-when": "^3.6.0",
-        "joi": "^17.10.0",
-        "lodash": "^4.17.21",
-        "luxon": "^3.4.2",
-        "mock-fs": "^5.2.0",
-        "nest-commander": "^3.11.1",
-        "node-addon-api": "^7.0.0",
-        "openid-client": "^5.4.3",
-        "pg": "^8.11.3",
-        "picomatch": "^4.0.0",
-        "prettier": "^3.0.2",
-        "prettier-plugin-organize-imports": "^3.2.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^5.0.1",
-        "rxjs": "^7.8.1",
-        "sanitize-filename": "^1.6.3",
-        "sharp": "^0.33.0",
-        "source-map-support": "^0.5.21",
-        "sql-formatter": "^15.0.0",
-        "supertest": "^6.3.3",
-        "testcontainers": "^10.2.1",
-        "thumbhash": "^0.1.1",
-        "ts-jest": "^29.1.1",
-        "ts-loader": "^9.4.4",
-        "ts-node": "^10.9.1",
-        "tsconfig-paths": "^4.2.0",
-        "typeorm": "^0.3.17",
-        "typescript": "^5.3.3",
-        "ua-parser-js": "^1.0.35",
-        "utimes": "^5.2.1"
-      }
-    },
    "import-fresh": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -8157,6 +8119,11 @@
        "p-locate": "^5.0.0"
      }
    },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
    "lodash.defaults": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -8543,11 +8510,10 @@
      "dev": true
    },
    "prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
-      "dev": true,
-      "peer": true
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "dev": true
    },
    "prettier-linter-helpers": {
      "version": "1.0.0",
@@ -8558,6 +8524,13 @@
        "fast-diff": "^1.1.2"
      }
    },
+    "prettier-plugin-organize-imports": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz",
+      "integrity": "sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==",
+      "dev": true,
+      "requires": {}
+    },
    "pretty-format": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -9391,9 +9364,9 @@
      }
    },
    "vite": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.0.tgz",
-      "integrity": "sha512-STmSFzhY4ljuhz14bg9LkMTk3d98IO6DIArnTY6MeBwiD1Za2StcQtz7fzOUnRCqrHSD5+OS2reg4HOz1eoLnw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.2.tgz",
+      "integrity": "sha512-uwiFebQbTWRIGbCaTEBVAfKqgqKNKMJ2uPXsXeLIZxM8MVMjoS3j0cG8NrPxdDIadaWnPSjrkLWffLSC+uiP3Q==",
      "dev": true,
      "requires": {
        "esbuild": "^0.19.3",
@@ -17,10 +17,11 @@
    "@testcontainers/postgresql": "^10.7.1",
    "@types/byte-size": "^8.1.0",
    "@types/cli-progress": "^3.11.0",
+    "@types/lodash-es": "^4.17.12",
    "@types/mock-fs": "^4.13.1",
    "@types/node": "^20.3.1",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
    "@vitest/coverage-v8": "^1.2.2",
    "byte-size": "^8.1.1",
    "cli-progress": "^3.12.0",
@@ -30,8 +31,9 @@
    "eslint-plugin-prettier": "^5.1.3",
    "eslint-plugin-unicorn": "^51.0.0",
    "glob": "^10.3.1",
-    "immich": "file:../server",
    "mock-fs": "^5.2.0",
+    "prettier": "^3.2.5",
+    "prettier-plugin-organize-imports": "^3.2.4",
    "typescript": "^5.3.3",
    "vite": "^5.0.12",
    "vitest": "^1.2.2",
@@ -39,15 +41,14 @@
  },
  "scripts": {
    "build": "vite build",
-    "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\" --max-warnings 0",
+    "lint": "eslint \"src/**/*.ts\" --max-warnings 0",
    "lint:fix": "npm run lint -- --fix",
    "prepack": "npm run build",
    "test": "vitest",
    "test:cov": "vitest --coverage",
    "format": "prettier --check .",
    "format:fix": "prettier --write .",
-    "check": "tsc --noEmit",
-    "test:e2e": "vitest --config test/e2e/vitest.config.ts"
+    "check": "tsc --noEmit"
  },
  "repository": {
    "type": "git",
@@ -56,5 +57,8 @@
  },
  "engines": {
    "node": ">=20.0.0"
+  },
+  "dependencies": {
+    "lodash-es": "^4.17.21"
  }
 }
@@ -1,6 +1,6 @@
 import { ServerVersionResponseDto, UserResponseDto } from '@immich/sdk';
-import { SessionService } from '../services/session.service';
 import { ImmichApi } from 'src/services/api.service';
+import { SessionService } from '../services/session.service';

 export abstract class BaseCommand {
  protected sessionService!: SessionService;
@@ -1,23 +1,33 @@
+import { AssetBulkUploadCheckResult } from '@immich/sdk';
 import byteSize from 'byte-size';
 import cliProgress from 'cli-progress';
+import { chunk, zip } from 'lodash-es';
+import { createHash } from 'node:crypto';
 import fs, { createReadStream } from 'node:fs';
+import { access, constants, stat, unlink } from 'node:fs/promises';
+import os from 'node:os';
+import { basename } from 'node:path';
+import { ImmichApi } from 'src/services/api.service';
 import { CrawlService } from '../services/crawl.service';
 import { BaseCommand } from './base-command';
-import { basename } from 'node:path';
-import { access, constants, stat, unlink } from 'node:fs/promises';
-import { createHash } from 'node:crypto';
-import os from 'node:os';
-import { ImmichApi } from 'src/services/api.service';
+
+const zipDefined = zip as <T, U>(a: T[], b: U[]) => [T, U][];
+
+enum CheckResponseStatus {
+  ACCEPT = 'accept',
+  REJECT = 'reject',
+  DUPLICATE = 'duplicate',
+}

 class Asset {
  readonly path: string;
-  readonly deviceId!: string;

+  id?: string;
  deviceAssetId?: string;
  fileCreatedAt?: Date;
  fileModifiedAt?: Date;
  sidecarPath?: string;
-  fileSize!: number;
+  fileSize?: number;
  albumName?: string;

  constructor(path: string) {
@@ -105,17 +115,141 @@ export class UploadOptionsDto {
  album? = false;
  albumName? = '';
  includeHidden? = false;
+  concurrency? = 4;
 }

 export class UploadCommand extends BaseCommand {
-  uploadLength!: number;
+  api!: ImmichApi;

  public async run(paths: string[], options: UploadOptionsDto): Promise<void> {
-    const api = await this.connect();
+    this.api = await this.connect();

-    const formatResponse = await api.getSupportedMediaTypes();
-    const crawlService = new CrawlService(formatResponse.image, formatResponse.video);
+    console.log('Crawling for assets...');
+    const files = await this.getFiles(paths, options);

+    if (files.length === 0) {
+      console.log('No assets found, exiting');
+      return;
+    }
+
+    const assetsToCheck = files.map((path) => new Asset(path));
+
+    const { newAssets, duplicateAssets } = await this.checkAssets(assetsToCheck, options.concurrency ?? 4);
+
+    const totalSizeUploaded = await this.upload(newAssets, options);
+    const messageStart = options.dryRun ? 'Would have' : 'Successfully';
+    if (newAssets.length === 0) {
+      console.log('All assets were already uploaded, nothing to do.');
+    } else {
+      console.log(
+        `${messageStart} uploaded ${newAssets.length} asset${newAssets.length === 1 ? '' : 's'} (${byteSize(totalSizeUploaded)})`,
+      );
+    }
+
+    if (options.album || options.albumName) {
+      const { createdAlbumCount, updatedAssetCount } = await this.updateAlbums(
+        [...newAssets, ...duplicateAssets],
+        options,
+      );
+      console.log(`${messageStart} created ${createdAlbumCount} new album${createdAlbumCount === 1 ? '' : 's'}`);
+      console.log(`${messageStart} updated ${updatedAssetCount} asset${updatedAssetCount === 1 ? '' : 's'}`);
+    }
+
+    if (!options.delete) {
+      return;
+    }
+
+    if (options.dryRun) {
+      console.log(`Would now have deleted assets, but skipped due to dry run`);
+      return;
+    }
+
+    console.log('Deleting assets that have been uploaded...');
+
+    await this.deleteAssets(newAssets, options);
+  }
+
+  public async checkAssets(
+    assetsToCheck: Asset[],
+    concurrency: number,
+  ): Promise<{ newAssets: Asset[]; duplicateAssets: Asset[]; rejectedAssets: Asset[] }> {
+    for (const assets of chunk(assetsToCheck, concurrency)) {
+      await Promise.all(assets.map((asset: Asset) => asset.prepare()));
+    }
+
+    const checkProgress = new cliProgress.SingleBar(
+      { format: 'Checking assets | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets' },
+      cliProgress.Presets.shades_classic,
+    );
+    checkProgress.start(assetsToCheck.length, 0);
+
+    const newAssets = [];
+    const duplicateAssets = [];
+    const rejectedAssets = [];
+    try {
+      for (const assets of chunk(assetsToCheck, concurrency)) {
+        const checkedAssets = await this.getStatus(assets);
+        for (const checked of checkedAssets) {
+          if (checked.status === CheckResponseStatus.ACCEPT) {
+            newAssets.push(checked.asset);
+          } else if (checked.status === CheckResponseStatus.DUPLICATE) {
+            duplicateAssets.push(checked.asset);
+          } else {
+            rejectedAssets.push(checked.asset);
+          }
+          checkProgress.increment();
+        }
+      }
+    } finally {
+      checkProgress.stop();
+    }
+
+    return { newAssets, duplicateAssets, rejectedAssets };
+  }
+
+  public async upload(assetsToUpload: Asset[], options: UploadOptionsDto): Promise<number> {
+    let totalSize = 0;
+
+    // Compute total size first
+    for (const asset of assetsToUpload) {
+      totalSize += asset.fileSize ?? 0;
+    }
+
+    if (options.dryRun) {
+      return totalSize;
+    }
+
+    const uploadProgress = new cliProgress.SingleBar(
+      {
+        format: 'Uploading assets | {bar} | {percentage}% | ETA: {eta_formatted} | {value_formatted}/{total_formatted}',
+      },
+      cliProgress.Presets.shades_classic,
+    );
+    uploadProgress.start(totalSize, 0);
+    uploadProgress.update({ value_formatted: 0, total_formatted: byteSize(totalSize) });
+
+    let totalSizeUploaded = 0;
+    try {
+      for (const assets of chunk(assetsToUpload, options.concurrency)) {
+        const ids = await this.uploadAssets(assets);
+        for (const [asset, id] of zipDefined(assets, ids)) {
+          asset.id = id;
+          if (asset.fileSize) {
+            totalSizeUploaded += asset.fileSize ?? 0;
+          } else {
+            console.log(`Could not determine file size for ${asset.path}`);
+          }
+        }
+        uploadProgress.update(totalSizeUploaded, { value_formatted: byteSize(totalSizeUploaded) });
+      }
+    } finally {
+      uploadProgress.stop();
+    }
+
+    return totalSizeUploaded;
+  }
+
+  public async getFiles(paths: string[], options: UploadOptionsDto): Promise<string[]> {
    const inputFiles: string[] = [];
    for (const pathArgument of paths) {
      const fileStat = await fs.promises.lstat(pathArgument);
@@ -124,151 +258,187 @@ export class UploadCommand extends BaseCommand {
      }
    }

-    const files: string[] = await crawlService.crawl({
+    const files: string[] = await this.crawl(paths, options);
+    files.push(...inputFiles);
+    return files;
+  }
+
+  public async getAlbums(): Promise<Map<string, string>> {
+    const existingAlbums = await this.api.getAllAlbums();
+
+    const albumMapping = new Map<string, string>();
+    for (const album of existingAlbums) {
+      albumMapping.set(album.albumName, album.id);
+    }
+
+    return albumMapping;
+  }
+
+  public async updateAlbums(
+    assets: Asset[],
+    options: UploadOptionsDto,
+  ): Promise<{ createdAlbumCount: number; updatedAssetCount: number }> {
+    if (options.albumName) {
+      for (const asset of assets) {
+        asset.albumName = options.albumName;
+      }
+    }
+
+    const existingAlbums = await this.getAlbums();
+    const assetsToUpdate = assets.filter(
+      (asset): asset is Asset & { albumName: string; id: string } => !!(asset.albumName && asset.id),
+    );
+
+    const newAlbumsSet: Set<string> = new Set();
+    for (const asset of assetsToUpdate) {
+      if (!existingAlbums.has(asset.albumName)) {
+        newAlbumsSet.add(asset.albumName);
+      }
+    }
+
+    const newAlbums = [...newAlbumsSet];
+
+    if (options.dryRun) {
+      return { createdAlbumCount: newAlbums.length, updatedAssetCount: assetsToUpdate.length };
+    }
+
+    const albumCreationProgress = new cliProgress.SingleBar(
+      {
+        format: 'Creating albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} albums',
+      },
+      cliProgress.Presets.shades_classic,
+    );
+    albumCreationProgress.start(newAlbums.length, 0);
+
+    try {
+      for (const albumNames of chunk(newAlbums, options.concurrency)) {
+        const newAlbumIds = await Promise.all(
+          albumNames.map((albumName: string) => this.api.createAlbum({ albumName }).then((r) => r.id)),
+        );
+
+        for (const [albumName, albumId] of zipDefined(albumNames, newAlbumIds)) {
+          existingAlbums.set(albumName, albumId);
+        }
+
+        albumCreationProgress.increment(albumNames.length);
+      }
+    } finally {
+      albumCreationProgress.stop();
+    }
+
+    const albumToAssets = new Map<string, string[]>();
+    for (const asset of assetsToUpdate) {
+      const albumId = existingAlbums.get(asset.albumName);
+      if (albumId) {
+        if (!albumToAssets.has(albumId)) {
+          albumToAssets.set(albumId, []);
+        }
+        albumToAssets.get(albumId)?.push(asset.id);
+      }
+    }
+
+    const albumUpdateProgress = new cliProgress.SingleBar(
+      {
+        format: 'Adding assets to albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets',
+      },
+      cliProgress.Presets.shades_classic,
+    );
+    albumUpdateProgress.start(assetsToUpdate.length, 0);
+
+    try {
+      for (const [albumId, assets] of albumToAssets.entries()) {
+        for (const assetBatch of chunk(assets, Math.min(1000 * (options.concurrency ?? 4), 65_000))) {
+          await this.api.addAssetsToAlbum(albumId, { ids: assetBatch });
+          albumUpdateProgress.increment(assetBatch.length);
+        }
+      }
+    } finally {
+      albumUpdateProgress.stop();
+    }
+
+    return { createdAlbumCount: newAlbums.length, updatedAssetCount: assetsToUpdate.length };
+  }
+
+  public async deleteAssets(assets: Asset[], options: UploadOptionsDto): Promise<void> {
+    const deletionProgress = new cliProgress.SingleBar(
+      {
+        format: 'Deleting local assets | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets',
+      },
+      cliProgress.Presets.shades_classic,
+    );
+    deletionProgress.start(assets.length, 0);
+
+    try {
+      for (const assetBatch of chunk(assets, options.concurrency)) {
+        await Promise.all(assetBatch.map((asset: Asset) => asset.delete()));
+        deletionProgress.update(assetBatch.length);
+      }
+    } finally {
+      deletionProgress.stop();
+    }
+  }
+
+  private async getStatus(assets: Asset[]): Promise<{ asset: Asset; status: CheckResponseStatus }[]> {
+    const checkResponse = await this.checkHashes(assets);
+
+    const responses = [];
+    for (const [check, asset] of zipDefined(checkResponse, assets)) {
+      if (check.assetId) {
+        asset.id = check.assetId;
+      }
+
+      if (check.action === 'accept') {
+        responses.push({ asset, status: CheckResponseStatus.ACCEPT });
+      } else if (check.reason === 'duplicate') {
+        responses.push({ asset, status: CheckResponseStatus.DUPLICATE });
+      } else {
+        responses.push({ asset, status: CheckResponseStatus.REJECT });
+      }
+    }
+
+    return responses;
+  }
+
+  private async checkHashes(assetsToCheck: Asset[]): Promise<AssetBulkUploadCheckResult[]> {
+    const checksums = await Promise.all(assetsToCheck.map((asset) => asset.hash()));
+    const assetBulkUploadCheckDto = {
+      assets: zipDefined(assetsToCheck, checksums).map(([asset, checksum]) => ({ id: asset.path, checksum })),
+    };
+    const checkResponse = await this.api.checkBulkUpload(assetBulkUploadCheckDto);
+    return checkResponse.results;
+  }
+
+  private async uploadAssets(assets: Asset[]): Promise<string[]> {
+    const fileRequests = await Promise.all(assets.map((asset) => asset.getUploadFormData()));
+    return Promise.all(fileRequests.map((request) => this.uploadAsset(request).then((response) => response.id)));
+  }
+
+  private async crawl(paths: string[], options: UploadOptionsDto): Promise<string[]> {
+    const formatResponse = await this.api.getSupportedMediaTypes();
+    const crawlService = new CrawlService(formatResponse.image, formatResponse.video);
+
+    return crawlService.crawl({
      pathsToCrawl: paths,
      recursive: options.recursive,
      exclusionPatterns: options.exclusionPatterns,
      includeHidden: options.includeHidden,
    });
-
-    files.push(...inputFiles);
-
-    if (files.length === 0) {
-      console.log('No assets found, exiting');
-      return;
-    }
-
-    const assetsToUpload = files.map((path) => new Asset(path));
-
-    const uploadProgress = new cliProgress.SingleBar(
-      {
-        format: '{bar} | {percentage}% | ETA: {eta_formatted} | {value_formatted}/{total_formatted}: {filename}',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-
-    let totalSize = 0;
-    let sizeSoFar = 0;
-
-    let totalSizeUploaded = 0;
-    let uploadCounter = 0;
-
-    for (const asset of assetsToUpload) {
-      // Compute total size first
-      await asset.prepare();
-      totalSize += asset.fileSize;
-
-      if (options.albumName) {
-        asset.albumName = options.albumName;
-      }
-    }
-
-    const existingAlbums = await api.getAllAlbums();
-
-    uploadProgress.start(totalSize, 0);
-    uploadProgress.update({ value_formatted: 0, total_formatted: byteSize(totalSize) });
-
-    try {
-      for (const asset of assetsToUpload) {
-        uploadProgress.update({
-          filename: asset.path,
-        });
-
-        let skipUpload = false;
-
-        let skipAsset = false;
-        let existingAssetId: string | undefined = undefined;
-
-        if (!options.skipHash) {
-          const assetBulkUploadCheckDto = { assets: [{ id: asset.path, checksum: await asset.hash() }] };
-
-          const checkResponse = await api.checkBulkUpload(assetBulkUploadCheckDto);
-
-          skipUpload = checkResponse.results[0].action === 'reject';
-
-          const isDuplicate = checkResponse.results[0].reason === 'duplicate';
-          if (isDuplicate) {
-            existingAssetId = checkResponse.results[0].assetId;
-          }
-
-          skipAsset = skipUpload && !isDuplicate;
-        }
-
-        if (!skipAsset && !options.dryRun) {
-          if (!skipUpload) {
-            const formData = await asset.getUploadFormData();
-            const response = await this.uploadAsset(api, formData);
-            const json = await response.json();
-            existingAssetId = json.id;
-            uploadCounter++;
-            totalSizeUploaded += asset.fileSize;
-          }
-
-          if ((options.album || options.albumName) && asset.albumName !== undefined) {
-            let album = existingAlbums.find((album) => album.albumName === asset.albumName);
-            if (!album) {
-              const response = await api.createAlbum({ albumName: asset.albumName });
-              album = response;
-              existingAlbums.push(album);
-            }
-
-            if (existingAssetId) {
-              await api.addAssetsToAlbum(album.id, {
-                ids: [existingAssetId],
-              });
-            }
-          }
-        }
-
-        sizeSoFar += asset.fileSize;
-
-        uploadProgress.update(sizeSoFar, { value_formatted: byteSize(sizeSoFar) });
-      }
-    } finally {
-      uploadProgress.stop();
-    }
-
-    const messageStart = options.dryRun ? 'Would have' : 'Successfully';
-
-    if (uploadCounter === 0) {
-      console.log('All assets were already uploaded, nothing to do.');
-    } else {
-      console.log(`${messageStart} uploaded ${uploadCounter} assets (${byteSize(totalSizeUploaded)})`);
-    }
-    if (options.delete) {
-      if (options.dryRun) {
-        console.log(`Would now have deleted assets, but skipped due to dry run`);
-      } else {
-        console.log('Deleting assets that have been uploaded...');
-        const deletionProgress = new cliProgress.SingleBar(cliProgress.Presets.shades_classic);
-        deletionProgress.start(files.length, 0);
-
-        for (const asset of assetsToUpload) {
-          if (!options.dryRun) {
-            await asset.delete();
-          }
-          deletionProgress.increment();
-        }
-        deletionProgress.stop();
-        console.log('Deletion complete');
-      }
-    }
  }

-  private async uploadAsset(api: ImmichApi, data: FormData): Promise<Response> {
-    const url = api.instanceUrl + '/asset/upload';
+  private async uploadAsset(data: FormData): Promise<{ id: string }> {
+    const url = this.api.instanceUrl + '/asset/upload';

    const response = await fetch(url, {
      method: 'post',
      redirect: 'error',
      headers: {
-        'x-api-key': api.apiKey,
+        'x-api-key': this.api.apiKey,
      },
      body: data,
    });
    if (response.status !== 200 && response.status !== 201) {
      throw new Error(await response.text());
    }
-    return response;
+    return response.json();
  }
 }
@@ -1,7 +1,7 @@
 #! /usr/bin/env node
 import { Command, Option } from 'commander';
-import path from 'node:path';
 import os from 'node:os';
+import path from 'node:path';
 import { version } from '../package.json';
 import { LoginCommand } from './commands/login.command';
 import { LogoutCommand } from './commands/logout.command';
@@ -15,7 +15,7 @@ const program = new Command()
  .version(version)
  .description('Command line interface for Immich')
  .addOption(
-    new Option('-d, --config-directory', 'Configuration directory where auth.yml will be stored')
+    new Option('-d, --config-directory <directory>', 'Configuration directory where auth.yml will be stored')
      .env('IMMICH_CONFIG_DIR')
      .default(defaultConfigDirectory),
  );
@@ -43,6 +43,11 @@ program
      .env('IMMICH_DRY_RUN')
      .default(false),
  )
+  .addOption(
+    new Option('-c, --concurrency', 'Number of assets to upload at the same time')
+      .env('IMMICH_UPLOAD_CONCURRENCY')
+      .default(4),
+  )
  .addOption(new Option('--delete', 'Delete local assets after upload').env('IMMICH_DELETE_ASSETS'))
  .argument('[paths...]', 'One or more paths to assets to be uploaded')
  .action(async (paths, options) => {
@@ -60,10 +65,10 @@ program
 program
  .command('login-key')
  .description('Login using an API key')
-  .argument('[instanceUrl]')
-  .argument('[apiKey]')
-  .action(async (paths, options) => {
-    await new LoginCommand(program.opts()).run(paths, options);
+  .argument('url')
+  .argument('key')
+  .action(async (url, key) => {
+    await new LoginCommand(program.opts()).run(url, key);
  });

 program
@@ -1,4 +1,11 @@
 import {
+  ApiKeyCreateDto,
+  AssetBulkUploadCheckDto,
+  BulkIdsDto,
+  CreateAlbumDto,
+  CreateAssetDto,
+  LoginCredentialDto,
+  SignUpDto,
  addAssetsToAlbum,
  checkBulkUpload,
  createAlbum,
@@ -13,13 +20,6 @@ import {
  pingServer,
  signUpAdmin,
  uploadFile,
-  ApiKeyCreateDto,
-  AssetBulkUploadCheckDto,
-  BulkIdsDto,
-  CreateAlbumDto,
-  CreateAssetDto,
-  LoginCredentialDto,
-  SignUpDto,
 } from '@immich/sdk';

 /**
@@ -1,5 +1,5 @@
 import mockfs from 'mock-fs';
-import { CrawlService, CrawlOptions } from './crawl.service';
+import { CrawlOptions, CrawlService } from './crawl.service';

 interface Test {
  test: string;
@@ -1,16 +1,40 @@
-import { SessionService } from './session.service';
 import fs from 'node:fs';
+import path from 'node:path';
 import yaml from 'yaml';
-import {
-  TEST_AUTH_FILE,
-  TEST_CONFIG_DIR,
-  TEST_IMMICH_API_KEY,
-  TEST_IMMICH_INSTANCE_URL,
-  createTestAuthFile,
-  deleteAuthFile,
-  readTestAuthFile,
-  spyOnConsole,
-} from '../../test/cli-test-utils';
+import { SessionService } from './session.service';
+
+const TEST_CONFIG_DIR = '/tmp/immich/';
+const TEST_AUTH_FILE = path.join(TEST_CONFIG_DIR, 'auth.yml');
+const TEST_IMMICH_INSTANCE_URL = 'https://test/api';
+const TEST_IMMICH_API_KEY = 'pNussssKSYo5WasdgalvKJ1n9kdvaasdfbluPg';
+
+const spyOnConsole = () => vi.spyOn(console, 'log').mockImplementation(() => {});
+
+const createTestAuthFile = async (contents: string) => {
+  if (!fs.existsSync(TEST_CONFIG_DIR)) {
+    // Create config folder if it doesn't exist
+    const created = await fs.promises.mkdir(TEST_CONFIG_DIR, { recursive: true });
+    if (!created) {
+      throw new Error(`Failed to create config folder ${TEST_CONFIG_DIR}`);
+    }
+  }
+
+  fs.writeFileSync(TEST_AUTH_FILE, contents);
+};
+
+const readTestAuthFile = async (): Promise<string> => {
+  return await fs.promises.readFile(TEST_AUTH_FILE, 'utf8');
+};
+
+const deleteAuthFile = () => {
+  try {
+    fs.unlinkSync(TEST_AUTH_FILE);
+  } catch (error: any) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
+};

 const mocks = vi.hoisted(() => {
  return {
@@ -1,52 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { ImmichApi } from 'src/services/api.service';
-
-export const TEST_CONFIG_DIR = '/tmp/immich/';
-export const TEST_AUTH_FILE = path.join(TEST_CONFIG_DIR, 'auth.yml');
-export const TEST_IMMICH_INSTANCE_URL = 'https://test/api';
-export const TEST_IMMICH_API_KEY = 'pNussssKSYo5WasdgalvKJ1n9kdvaasdfbluPg';
-
-export const CLI_BASE_OPTIONS = { configDirectory: TEST_CONFIG_DIR };
-
-export const setup = async () => {
-  const api = new ImmichApi(process.env.IMMICH_INSTANCE_URL as string, '');
-  await api.signUpAdmin({ email: 'cli@immich.app', password: 'password', name: 'Administrator' });
-  const admin = await api.login({ email: 'cli@immich.app', password: 'password' });
-  const apiKey = await api.createApiKey(
-    { name: 'CLI Test' },
-    { headers: { Authorization: `Bearer ${admin.accessToken}` } },
-  );
-
-  api.setApiKey(apiKey.secret);
-
-  return api;
-};
-
-export const spyOnConsole = () => vi.spyOn(console, 'log').mockImplementation(() => {});
-
-export const createTestAuthFile = async (contents: string) => {
-  if (!fs.existsSync(TEST_CONFIG_DIR)) {
-    // Create config folder if it doesn't exist
-    const created = await fs.promises.mkdir(TEST_CONFIG_DIR, { recursive: true });
-    if (!created) {
-      throw new Error(`Failed to create config folder ${TEST_CONFIG_DIR}`);
-    }
-  }
-
-  fs.writeFileSync(TEST_AUTH_FILE, contents);
-};
-
-export const readTestAuthFile = async (): Promise<string> => {
-  return await fs.promises.readFile(TEST_AUTH_FILE, 'utf8');
-};
-
-export const deleteAuthFile = () => {
-  try {
-    fs.unlinkSync(TEST_AUTH_FILE);
-  } catch (error: any) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
-};
@@ -1,65 +0,0 @@
-import { restoreTempFolder, testApp } from '@test-utils';
-import { CLI_BASE_OPTIONS, TEST_AUTH_FILE, deleteAuthFile, setup, spyOnConsole } from 'test/cli-test-utils';
-import { readFile, stat } from 'node:fs/promises';
-import { LoginCommand } from '../../src/commands/login.command';
-import yaml from 'yaml';
-
-describe(`login-key (e2e)`, () => {
-  let apiKey: string;
-  let instanceUrl: string;
-
-  spyOnConsole();
-
-  beforeAll(async () => {
-    await testApp.create();
-    if (process.env.IMMICH_INSTANCE_URL) {
-      instanceUrl = process.env.IMMICH_INSTANCE_URL;
-    } else {
-      throw new Error('IMMICH_INSTANCE_URL environment variable not set');
-    }
-  });
-
-  afterAll(async () => {
-    await testApp.teardown();
-    await restoreTempFolder();
-    deleteAuthFile();
-  });
-
-  beforeEach(async () => {
-    await testApp.reset();
-    await restoreTempFolder();
-
-    const api = await setup();
-    apiKey = api.apiKey;
-
-    deleteAuthFile();
-  });
-
-  it('should error when providing an invalid API key', async () => {
-    await expect(new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, 'invalid')).rejects.toThrow(
-      `Failed to connect to server ${instanceUrl}: Error: 401`,
-    );
-  });
-
-  it('should log in when providing the correct API key', async () => {
-    await new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, apiKey);
-  });
-
-  it('should create an auth file when logging in', async () => {
-    await new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, apiKey);
-
-    const data: string = await readFile(TEST_AUTH_FILE, 'utf8');
-    const parsedConfig = yaml.parse(data);
-
-    expect(parsedConfig).toEqual(expect.objectContaining({ instanceUrl, apiKey }));
-  });
-
-  it('should create an auth file with chmod 600', async () => {
-    await new LoginCommand(CLI_BASE_OPTIONS).run(instanceUrl, apiKey);
-
-    const stats = await stat(TEST_AUTH_FILE);
-    const mode = (stats.mode & 0o777).toString(8);
-
-    expect(mode).toEqual('600');
-  });
-});
@@ -1,34 +0,0 @@
-import { restoreTempFolder, testApp } from '@test-utils';
-import { CLI_BASE_OPTIONS, setup, spyOnConsole } from 'test/cli-test-utils';
-import { ServerInfoCommand } from '../../src/commands/server-info.command';
-
-describe(`server-info (e2e)`, () => {
-  const consoleSpy = spyOnConsole();
-
-  beforeAll(async () => {
-    await testApp.create();
-  });
-
-  afterAll(async () => {
-    await testApp.teardown();
-    await restoreTempFolder();
-  });
-
-  beforeEach(async () => {
-    await testApp.reset();
-    await restoreTempFolder();
-    const api = await setup();
-    process.env.IMMICH_API_KEY = api.apiKey;
-  });
-
-  it('should show server version', async () => {
-    await new ServerInfoCommand(CLI_BASE_OPTIONS).run();
-
-    expect(consoleSpy.mock.calls).toEqual([
-      [expect.stringMatching(new RegExp('Server Version: \\d+.\\d+.\\d+'))],
-      [expect.stringMatching('Image Types: .*')],
-      [expect.stringMatching('Video Types: .*')],
-      ['Statistics:\n  Images: 0\n  Videos: 0\n  Total: 0'],
-    ]);
-  });
-});
@@ -1,42 +0,0 @@
-import path from 'node:path';
-import { PostgreSqlContainer } from '@testcontainers/postgresql';
-import { access } from 'node:fs/promises';
-
-export const directoryExists = (directory: string) =>
-  access(directory)
-    .then(() => true)
-    .catch(() => false);
-
-export default async () => {
-  let IMMICH_TEST_ASSET_PATH: string = '';
-
-  if (process.env.IMMICH_TEST_ASSET_PATH === undefined) {
-    IMMICH_TEST_ASSET_PATH = path.normalize(`${__dirname}/../../../server/test/assets/`);
-    process.env.IMMICH_TEST_ASSET_PATH = IMMICH_TEST_ASSET_PATH;
-  } else {
-    IMMICH_TEST_ASSET_PATH = process.env.IMMICH_TEST_ASSET_PATH;
-  }
-
-  if (!(await directoryExists(`${IMMICH_TEST_ASSET_PATH}/albums`))) {
-    throw new Error(
-      `Test assets not found. Please checkout https://github.com/immich-app/test-assets into ${IMMICH_TEST_ASSET_PATH} before testing`,
-    );
-  }
-
-  if (process.env.DB_HOSTNAME === undefined) {
-    // DB hostname not set which likely means we're not running e2e through docker compose. Start a local postgres container.
-    const pg = await new PostgreSqlContainer('tensorchord/pgvecto-rs:pg14-v0.2.0')
-      .withExposedPorts(5432)
-      .withDatabase('immich')
-      .withUsername('postgres')
-      .withPassword('postgres')
-      .withReuse()
-      .start();
-
-    process.env.DB_URL = pg.getConnectionUri();
-  }
-
-  process.env.NODE_ENV = 'development';
-  process.env.IMMICH_CONFIG_FILE = path.normalize(`${__dirname}/../../../server/e2e/jobs/immich-e2e-config.json`);
-  process.env.TZ = 'Z';
-};
@@ -1,79 +0,0 @@
-import { IMMICH_TEST_ASSET_PATH, restoreTempFolder, testApp } from '@test-utils';
-import { CLI_BASE_OPTIONS, setup, spyOnConsole } from 'test/cli-test-utils';
-import { UploadCommand } from '../../src/commands/upload.command';
-import { ImmichApi } from 'src/services/api.service';
-
-describe(`upload (e2e)`, () => {
-  let api: ImmichApi;
-
-  spyOnConsole();
-
-  beforeAll(async () => {
-    await testApp.create();
-  });
-
-  afterAll(async () => {
-    await testApp.teardown();
-    await restoreTempFolder();
-  });
-
-  beforeEach(async () => {
-    await testApp.reset();
-    await restoreTempFolder();
-    api = await setup();
-    process.env.IMMICH_API_KEY = api.apiKey;
-  });
-
-  it('should upload a folder recursively', async () => {
-    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], { recursive: true });
-    const assets = await api.getAllAssets();
-    expect(assets.length).toBeGreaterThan(4);
-  });
-
-  it('should not create a new album', async () => {
-    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], { recursive: true });
-    const albums = await api.getAllAlbums();
-    expect(albums.length).toEqual(0);
-  });
-
-  it('should create album from folder name', async () => {
-    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
-      recursive: true,
-      album: true,
-    });
-
-    const albums = await api.getAllAlbums();
-    expect(albums.length).toEqual(1);
-    const natureAlbum = albums[0];
-    expect(natureAlbum.albumName).toEqual('nature');
-  });
-
-  it('should add existing assets to album', async () => {
-    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
-      recursive: true,
-    });
-
-    // upload again, but this time add to album
-    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
-      recursive: true,
-      album: true,
-    });
-
-    const albums = await api.getAllAlbums();
-    expect(albums.length).toEqual(1);
-    const natureAlbum = albums[0];
-    expect(natureAlbum.albumName).toEqual('nature');
-  });
-
-  it('should upload to the specified album name', async () => {
-    await new UploadCommand(CLI_BASE_OPTIONS).run([`${IMMICH_TEST_ASSET_PATH}/albums/nature/`], {
-      recursive: true,
-      albumName: 'testAlbum',
-    });
-
-    const albums = await api.getAllAlbums();
-    expect(albums.length).toEqual(1);
-    const testAlbum = albums[0];
-    expect(testAlbum.albumName).toEqual('testAlbum');
-  });
-});
@@ -1,22 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  resolve: {
-    alias: {
-      '@test-utils': new URL('../../../server/dist/test-utils/utils.js', import.meta.url).pathname,
-    },
-  },
-  test: {
-    include: ['**/*.e2e-spec.ts'],
-    globals: true,
-    globalSetup: 'test/e2e/setup.ts',
-    pool: 'forks',
-    poolOptions: {
-      forks: {
-        maxForks: 1,
-        minForks: 1,
-      },
-    },
-    testTimeout: 10_000,
-  },
-});
@@ -1,3 +0,0 @@
-module.exports = async () => {
-  process.env.TZ = 'UTC';
-};
@@ -1,3 +0,0 @@
-// add all jest-extended matchers
-import * as matchers from 'jest-extended';
-expect.extend(matchers);
@@ -57,7 +57,7 @@ services:
    image: immich-web-dev:latest
    build:
      context: ../web
-    command: "/usr/src/app/bin/immich-web"
+    command: [ "/usr/src/app/bin/immich-web" ]
    env_file:
      - .env
    ports:
@@ -7,7 +7,7 @@ When contributing code through a pull request, please check the following:
 - [ ] `npm run lint` (linting via ESLint)
 - [ ] `npm run format` (formatting via Prettier)
 - [ ] `npm run check:svelte` (Type checking via SvelteKit)
- [ ] `npm test` (Tests via Jest)
+- [ ] `npm test` (unit tests)

 :::tip
 Run all web checks with `npm run check:all`
@@ -18,7 +18,7 @@ Run all web checks with `npm run check:all`
 - [ ] `npm run lint` (linting via ESLint)
 - [ ] `npm run format` (formatting via Prettier)
 - [ ] `npm run check` (Type checking via `tsc`)
- [ ] `npm test` (Tests via Jest)
+- [ ] `npm test` (unit tests)

 :::tip
 Run all server checks with `npm run check:all`
@@ -42,23 +42,24 @@ Finally, files can be deleted from Immich via the `Remove Offline Files` job. Th

 ### Import Paths

-External libraries use import paths to determine which files to scan. Each library can have multiple import paths so that files from different locations can be added to the same library. Import paths are scanned recursively, and if a file is in multiple import paths, it will only be added once. If the import paths are edited in a way that an external file is no longer in any import path, it will be removed from the library in the same way a deleted file would. If the file is moved back to an import path, it will be added again as if it was a new file.
+External libraries use import paths to determine which files to scan. Each library can have multiple import paths so that files from different locations can be added to the same library. Import paths are scanned recursively, and if a file is in multiple import paths, it will only be added once. Each import file must be a readable directory that exists on the filesystem; the import path dialog will alert you of any paths that are not accessible.
+
+If the import paths are edited in a way that an external file is no longer in any import path, it will be removed from the library in the same way a deleted file would. If the file is moved back to an import path, it will be added again as if it was a new file.

 ### Troubleshooting

-Sometimes, an external library will not scan correctly. This can happen if the immich_server or immich_microservices can't access the files. Here are some things to check:
+Sometimes, an external library will not scan correctly. This can happen if immich_server or immich_microservices can't access the files. Here are some things to check:

- Is the external path set correctly?
+- Is the external path set correctly? Each import path must be contained in the external path.
+- Make sure the external path does not contain spaces
 - In the docker-compose file, are the volumes mounted correctly?
 - Are the volumes identical between the `server` and `microservices` container?
 - Are the import paths set correctly, and do they match the path set in docker-compose file?
- Are you using symbolic link in your import library?
+- Make sure you don't use symlinks in your import libraries, and that you aren't linking across docker mounts.
 - Are the permissions set correctly?
- Are you using forward slashes everywhere? (`/`)
- Are you using symlink across docker mounts?
- Are you using [spaces in the internal path](/docs/features/libraries#:~:text=can%20be%20accessed.-,NOTE,-Spaces%20in%20the)?
+- Make sure you are using forward slashes (`/`) and not backward slashes.

-If all else fails, you can always start a shell inside the container and check if the path is accessible. For example, `docker exec -it immich_microservices /bin/bash` will start a bash shell. If your import path, for instance, is `/data/import/photos`, you can check if the files are accessible by running `ls /data/import/photos`. Also check the `immich_server` container in the same way.
+To validate that Immich can reach your external library, start a shell inside the container. Run `docker exec -it immich_microservices /bin/bash` to a bash shell. If your import path is `/data/import/photos`, check it with `ls /data/import/photos`. Do the same check for the `immich_server` container. If you cannot access this directory in both the `microservices` and `server` containers, Immich won't be able to import files.

 ### Security Considerations

@@ -60,14 +60,17 @@ These environment variables are used by the `docker-compose.yml` file and do **N

 ## Database

-| Variable      | Description       |   Default   | Services              |
-| :------------ | :---------------- | :---------: | :-------------------- |
-| `DB_URL`      | Database URL      |             | server, microservices |
-| `DB_HOSTNAME` | Database Host     | `localhost` | server, microservices |
-| `DB_PORT`     | Database Port     |   `5432`    | server, microservices |
-| `DB_USERNAME` | Database User     | `postgres`  | server, microservices |
-| `DB_PASSWORD` | Database Password | `postgres`  | server, microservices |
-| `DB_DATABASE` | Database Name     |  `immich`   | server, microservices |
+| Variable                            | Description                                                   |   Default    | Services              |
+| :---------------------------------- | :------------------------------------------------------------ | :----------: | :-------------------- |
+| `DB_URL`                            | Database URL                                                  |              | server, microservices |
+| `DB_HOSTNAME`                       | Database Host                                                 | `localhost`  | server, microservices |
+| `DB_PORT`                           | Database Port                                                 |    `5432`    | server, microservices |
+| `DB_USERNAME`                       | Database User                                                 |  `postgres`  | server, microservices |
+| `DB_PASSWORD`                       | Database Password                                             |  `postgres`  | server, microservices |
+| `DB_DATABASE`                       | Database Name                                                 |   `immich`   | server, microservices |
+| `DB_VECTOR_EXTENSION`<sup>\*1</sup> | Database Vector Extension (one of [`pgvector`, `pgvecto.rs`]) | `pgvecto.rs` | server, microservices |
+
+\*1: This setting cannot be changed after the server has successfully started up

 :::info

@@ -2964,9 +2964,9 @@
      }
    },
    "node_modules/@mdx-js/react": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.0.tgz",
-      "integrity": "sha512-nDctevR9KyYFyV+m+/+S4cpzCWHqj+iHDHq3QrsWezcC+B17uZdIWgCguESUkwFhM3n/56KxWVE3V6EokrmONQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.1.tgz",
+      "integrity": "sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A==",
      "dependencies": {
        "@types/mdx": "^2.0.0"
      },
@@ -13,6 +13,7 @@ x-server-build: &server-common
    - DB_PASSWORD=postgres
    - DB_DATABASE_NAME=immich
    - REDIS_HOSTNAME=redis
+    - IMMICH_MACHINE_LEARNING_ENABLED=false
  volumes:
    - upload:/usr/src/app/upload
  depends_on:
@@ -26,23 +27,22 @@ services:
    ports:
      - 2283:3001

-  immich-microservices:
-    command: [ "./start.sh", "microservices" ]
-    <<: *server-common
-
+  # immich-microservices:
+  #   command: [ "./start.sh", "microservices" ]
+  #   <<: *server-common

  redis:
    image: redis:6.2-alpine@sha256:51d6c56749a4243096327e3fb964a48ed92254357108449cb6e23999c37773c5
-    restart: always

  database:
    image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
+    command: -c fsync=off -c shared_preload_libraries=vectors.so
    environment:
      POSTGRES_PASSWORD: postgres
      POSTGRES_USER: postgres
      POSTGRES_DB: immich
    ports:
-      - 5432:5432
+      - 5433:5432

 volumes:
  model-cache:
@@ -5,18 +5,24 @@
  "main": "index.js",
  "type": "module",
  "scripts": {
-    "test": "npx playwright test",
-    "build": "tsc"
+    "test": "vitest --config vitest.config.ts",
+    "test:web": "npx playwright test",
+    "start:web": "npx playwright test --ui"
  },
  "keywords": [],
  "author": "",
  "license": "GNU Affero General Public License version 3",
  "devDependencies": {
+    "@immich/cli": "file:../cli",
    "@immich/sdk": "file:../open-api/typescript-sdk",
    "@playwright/test": "^1.41.2",
    "@types/node": "^20.11.17",
    "@types/pg": "^8.11.0",
+    "@types/supertest": "^6.0.2",
+    "@vitest/coverage-v8": "^1.3.0",
    "pg": "^8.11.3",
-    "typescript": "^5.3.3"
+    "supertest": "^6.3.4",
+    "typescript": "^5.3.3",
+    "vitest": "^1.3.0"
  }
 }
@@ -1,7 +1,7 @@
 import { defineConfig, devices } from '@playwright/test';

 export default defineConfig({
-  testDir: './specs/',
+  testDir: './src/web/specs',
  fullyParallel: false,
  forbidOnly: !!process.env.CI,
  retries: process.env.CI ? 2 : 0,
@@ -53,8 +53,7 @@ export default defineConfig({

  /* Run your local dev server before starting the tests */
  webServer: {
-    command:
-      'docker compose -f ../docker/docker-compose.e2e.yml up --build -V --remove-orphans',
+    command: 'docker compose up --build -V --remove-orphans',
    url: 'http://127.0.0.1:2283',
    reuseExistingServer: true,
  },
@@ -0,0 +1,291 @@
+import {
+  LoginResponseDto,
+  getAuthDevices,
+  login,
+  signUpAdmin,
+} from '@immich/sdk';
+import { loginDto, signupDto, uuidDto } from 'src/fixtures';
+import {
+  deviceDto,
+  errorDto,
+  loginResponseDto,
+  signupResponseDto,
+} from 'src/responses';
+import { apiUtils, app, asBearerAuth, dbUtils } from 'src/utils';
+import request from 'supertest';
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+
+const { name, email, password } = signupDto.admin;
+
+describe(`/auth/admin-sign-up`, () => {
+  beforeAll(() => {
+    apiUtils.setup();
+  });
+
+  beforeEach(async () => {
+    await dbUtils.reset();
+  });
+
+  describe('POST /auth/admin-sign-up', () => {
+    const invalid = [
+      {
+        should: 'require an email address',
+        data: { name, password },
+      },
+      {
+        should: 'require a password',
+        data: { name, email },
+      },
+      {
+        should: 'require a name',
+        data: { email, password },
+      },
+      {
+        should: 'require a valid email',
+        data: { name, email: 'immich', password },
+      },
+    ];
+
+    for (const { should, data } of invalid) {
+      it(`should ${should}`, async () => {
+        const { status, body } = await request(app)
+          .post('/auth/admin-sign-up')
+          .send(data);
+        expect(status).toEqual(400);
+        expect(body).toEqual(errorDto.badRequest());
+      });
+    }
+
+    it(`should sign up the admin`, async () => {
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send(signupDto.admin);
+      expect(status).toBe(201);
+      expect(body).toEqual(signupResponseDto.admin);
+    });
+
+    it('should sign up the admin with a local domain', async () => {
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send({ ...signupDto.admin, email: 'admin@local' });
+      expect(status).toEqual(201);
+      expect(body).toEqual({
+        ...signupResponseDto.admin,
+        email: 'admin@local',
+      });
+    });
+
+    it('should transform email to lower case', async () => {
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send({ ...signupDto.admin, email: 'aDmIn@IMMICH.cloud' });
+      expect(status).toEqual(201);
+      expect(body).toEqual(signupResponseDto.admin);
+    });
+
+    it('should not allow a second admin to sign up', async () => {
+      await signUpAdmin({ signUpDto: signupDto.admin });
+
+      const { status, body } = await request(app)
+        .post('/auth/admin-sign-up')
+        .send(signupDto.admin);
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.alreadyHasAdmin);
+    });
+  });
+});
+
+describe('/auth/*', () => {
+  let admin: LoginResponseDto;
+
+  beforeEach(async () => {
+    await dbUtils.reset();
+    await signUpAdmin({ signUpDto: signupDto.admin });
+    admin = await login({ loginCredentialDto: loginDto.admin });
+  });
+
+  describe(`POST /auth/login`, () => {
+    it('should reject an incorrect password', async () => {
+      const { status, body } = await request(app)
+        .post('/auth/login')
+        .send({ email, password: 'incorrect' });
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.incorrectLogin);
+    });
+
+    for (const key of Object.keys(loginDto.admin)) {
+      it(`should not allow null ${key}`, async () => {
+        const { status, body } = await request(app)
+          .post('/auth/login')
+          .send({ ...loginDto.admin, [key]: null });
+        expect(status).toBe(400);
+        expect(body).toEqual(errorDto.badRequest());
+      });
+    }
+
+    it('should accept a correct password', async () => {
+      const { status, body, headers } = await request(app)
+        .post('/auth/login')
+        .send({ email, password });
+      expect(status).toBe(201);
+      expect(body).toEqual(loginResponseDto.admin);
+
+      const token = body.accessToken;
+      expect(token).toBeDefined();
+
+      const cookies = headers['set-cookie'];
+      expect(cookies).toHaveLength(3);
+      expect(cookies[0]).toEqual(
+        `immich_access_token=${token}; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;`
+      );
+      expect(cookies[1]).toEqual(
+        'immich_auth_type=password; HttpOnly; Path=/; Max-Age=34560000; SameSite=Lax;'
+      );
+      expect(cookies[2]).toEqual(
+        'immich_is_authenticated=true; Path=/; Max-Age=34560000; SameSite=Lax;'
+      );
+    });
+  });
+
+  describe('GET /auth/devices', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get('/auth/devices');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should get a list of authorized devices', async () => {
+      const { status, body } = await request(app)
+        .get('/auth/devices')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual([deviceDto.current]);
+    });
+  });
+
+  describe('DELETE /auth/devices', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).delete(`/auth/devices`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should logout all devices (except the current one)', async () => {
+      for (let i = 0; i < 5; i++) {
+        await login({ loginCredentialDto: loginDto.admin });
+      }
+
+      await expect(
+        getAuthDevices({ headers: asBearerAuth(admin.accessToken) })
+      ).resolves.toHaveLength(6);
+
+      const { status } = await request(app)
+        .delete(`/auth/devices`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(204);
+
+      await expect(
+        getAuthDevices({ headers: asBearerAuth(admin.accessToken) })
+      ).resolves.toHaveLength(1);
+    });
+
+    it('should throw an error for a non-existent device id', async () => {
+      const { status, body } = await request(app)
+        .delete(`/auth/devices/${uuidDto.notFound}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        errorDto.badRequest('Not found or no authDevice.delete access')
+      );
+    });
+
+    it('should logout a device', async () => {
+      const [device] = await getAuthDevices({
+        headers: asBearerAuth(admin.accessToken),
+      });
+      const { status } = await request(app)
+        .delete(`/auth/devices/${device.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(204);
+
+      const response = await request(app)
+        .post('/auth/validateToken')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(response.body).toEqual(errorDto.invalidToken);
+      expect(response.status).toBe(401);
+    });
+  });
+
+  describe('POST /auth/validateToken', () => {
+    it('should reject an invalid token', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/validateToken`)
+        .set('Authorization', 'Bearer 123');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.invalidToken);
+    });
+
+    it('should accept a valid token', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/validateToken`)
+        .send({})
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual({ authStatus: true });
+    });
+  });
+
+  describe('POST /auth/change-password', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/change-password`)
+        .send({ password, newPassword: 'Password1234' });
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should require the current password', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/change-password`)
+        .send({ password: 'wrong-password', newPassword: 'Password1234' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.wrongPassword);
+    });
+
+    it('should change the password', async () => {
+      const { status } = await request(app)
+        .post(`/auth/change-password`)
+        .send({ password, newPassword: 'Password1234' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+
+      await login({
+        loginCredentialDto: {
+          email: 'admin@immich.cloud',
+          password: 'Password1234',
+        },
+      });
+    });
+  });
+
+  describe('POST /auth/logout', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).post(`/auth/logout`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should logout the user', async () => {
+      const { status, body } = await request(app)
+        .post(`/auth/logout`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toEqual({
+        successful: true,
+        redirectUri: '/auth/login?autoLaunch=0',
+      });
+    });
+  });
+});
@@ -0,0 +1,62 @@
+import { AssetResponseDto, LoginResponseDto } from '@immich/sdk';
+import { errorDto } from 'src/responses';
+import { apiUtils, app, dbUtils } from 'src/utils';
+import request from 'supertest';
+import { beforeAll, describe, expect, it } from 'vitest';
+
+describe('/download', () => {
+  let admin: LoginResponseDto;
+  let asset1: AssetResponseDto;
+
+  beforeAll(async () => {
+    apiUtils.setup();
+    await dbUtils.reset();
+    admin = await apiUtils.adminSetup();
+    asset1 = await apiUtils.createAsset(admin.accessToken);
+  });
+
+  describe('POST /download/info', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app)
+        .post(`/download/info`)
+        .send({ assetIds: [asset1.id] });
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should download info', async () => {
+      const { status, body } = await request(app)
+        .post('/download/info')
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ assetIds: [asset1.id] });
+
+      expect(status).toBe(201);
+      expect(body).toEqual(
+        expect.objectContaining({
+          archives: [expect.objectContaining({ assetIds: [asset1.id] })],
+        })
+      );
+    });
+  });
+
+  describe('POST /download/asset/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).post(
+        `/download/asset/${asset1.id}`
+      );
+
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should download file', async () => {
+      const response = await request(app)
+        .post(`/download/asset/${asset1.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(response.status).toBe(200);
+      expect(response.headers['content-type']).toEqual('image/jpeg');
+    });
+  });
+});
@@ -0,0 +1,30 @@
+import { errorDto } from 'src/responses';
+import { apiUtils, app, dbUtils } from 'src/utils';
+import request from 'supertest';
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+
+describe(`/oauth`, () => {
+  beforeAll(() => {
+    apiUtils.setup();
+  });
+
+  beforeEach(async () => {
+    await dbUtils.reset();
+    await apiUtils.adminSetup();
+  });
+
+  describe('POST /oauth/authorize', () => {
+    it(`should throw an error if a redirect uri is not provided`, async () => {
+      const { status, body } = await request(app)
+        .post('/oauth/authorize')
+        .send({});
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        errorDto.badRequest([
+          'redirectUri must be a string',
+          'redirectUri should not be empty',
+        ])
+      );
+    });
+  });
+});
@@ -1,68 +1,63 @@
-import { LoginResponseDto, PartnerDirection } from '@app/domain';
-import { PartnerController } from '@app/immich';
-import { errorStub, userDto } from '@test/fixtures';
+import { LoginResponseDto, createPartner } from '@immich/sdk';
+import { createUserDto } from 'src/fixtures';
+import { errorDto } from 'src/responses';
+import { apiUtils, app, asBearerAuth, dbUtils } from 'src/utils';
 import request from 'supertest';
-import { api } from '../../client';
-import { testApp } from '../utils';
+import { beforeAll, describe, expect, it } from 'vitest';

-describe(`${PartnerController.name} (e2e)`, () => {
-  let server: any;
+describe('/partner', () => {
+  let admin: LoginResponseDto;
  let user1: LoginResponseDto;
  let user2: LoginResponseDto;
  let user3: LoginResponseDto;

  beforeAll(async () => {
-    server = (await testApp.create()).getHttpServer();
+    apiUtils.setup();
+    await dbUtils.reset();

-    await testApp.reset();
-    await api.authApi.adminSignUp(server);
-    const admin = await api.authApi.adminLogin(server);
-
-    await Promise.all([
-      api.userApi.create(server, admin.accessToken, userDto.user1),
-      api.userApi.create(server, admin.accessToken, userDto.user2),
-      api.userApi.create(server, admin.accessToken, userDto.user3),
-    ]);
+    admin = await apiUtils.adminSetup();

    [user1, user2, user3] = await Promise.all([
-      api.authApi.login(server, userDto.user1),
-      api.authApi.login(server, userDto.user2),
-      api.authApi.login(server, userDto.user3),
+      apiUtils.userSetup(admin.accessToken, createUserDto.user1),
+      apiUtils.userSetup(admin.accessToken, createUserDto.user2),
+      apiUtils.userSetup(admin.accessToken, createUserDto.user3),
    ]);

    await Promise.all([
-      api.partnerApi.create(server, user1.accessToken, user2.userId),
-      api.partnerApi.create(server, user2.accessToken, user1.userId),
+      createPartner(
+        { id: user2.userId },
+        { headers: asBearerAuth(user1.accessToken) }
+      ),
+      createPartner(
+        { id: user1.userId },
+        { headers: asBearerAuth(user2.accessToken) }
+      ),
    ]);
  });

-  afterAll(async () => {
-    await testApp.teardown();
-  });
-
  describe('GET /partner', () => {
    it('should require authentication', async () => {
-      const { status, body } = await request(server).get('/partner');
+      const { status, body } = await request(app).get('/partner');

      expect(status).toBe(401);
-      expect(body).toEqual(errorStub.unauthorized);
+      expect(body).toEqual(errorDto.unauthorized);
    });

    it('should get all partners shared by user', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/partner')
        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .query({ direction: PartnerDirection.SharedBy });
+        .query({ direction: 'shared-by' });

      expect(status).toBe(200);
      expect(body).toEqual([expect.objectContaining({ id: user2.userId })]);
    });

    it('should get all partners that share with user', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/partner')
        .set('Authorization', `Bearer ${user1.accessToken}`)
-        .query({ direction: PartnerDirection.SharedWith });
+        .query({ direction: 'shared-with' });

      expect(status).toBe(200);
      expect(body).toEqual([expect.objectContaining({ id: user2.userId })]);
@@ -71,14 +66,16 @@ describe(`${PartnerController.name} (e2e)`, () => {

  describe('POST /partner/:id', () => {
    it('should require authentication', async () => {
-      const { status, body } = await request(server).post(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).post(
+        `/partner/${user3.userId}`
+      );

      expect(status).toBe(401);
-      expect(body).toEqual(errorStub.unauthorized);
+      expect(body).toEqual(errorDto.unauthorized);
    });

    it('should share with new partner', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .post(`/partner/${user3.userId}`)
        .set('Authorization', `Bearer ${user1.accessToken}`);

@@ -87,44 +84,52 @@ describe(`${PartnerController.name} (e2e)`, () => {
    });

    it('should not share with new partner if already sharing with this partner', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .post(`/partner/${user2.userId}`)
        .set('Authorization', `Bearer ${user1.accessToken}`);

      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Partner already exists' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Partner already exists' })
+      );
    });
  });

  describe('PUT /partner/:id', () => {
    it('should require authentication', async () => {
-      const { status, body } = await request(server).put(`/partner/${user2.userId}`);
+      const { status, body } = await request(app).put(
+        `/partner/${user2.userId}`
+      );

      expect(status).toBe(401);
-      expect(body).toEqual(errorStub.unauthorized);
+      expect(body).toEqual(errorDto.unauthorized);
    });

    it('should update partner', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .put(`/partner/${user2.userId}`)
        .set('Authorization', `Bearer ${user1.accessToken}`)
        .send({ inTimeline: false });

      expect(status).toBe(200);
-      expect(body).toEqual(expect.objectContaining({ id: user2.userId, inTimeline: false }));
+      expect(body).toEqual(
+        expect.objectContaining({ id: user2.userId, inTimeline: false })
+      );
    });
  });

  describe('DELETE /partner/:id', () => {
    it('should require authentication', async () => {
-      const { status, body } = await request(server).delete(`/partner/${user3.userId}`);
+      const { status, body } = await request(app).delete(
+        `/partner/${user3.userId}`
+      );

      expect(status).toBe(401);
-      expect(body).toEqual(errorStub.unauthorized);
+      expect(body).toEqual(errorDto.unauthorized);
    });

    it('should delete partner', async () => {
-      const { status } = await request(server)
+      const { status } = await request(app)
        .delete(`/partner/${user3.userId}`)
        .set('Authorization', `Bearer ${user1.accessToken}`);

@@ -132,12 +137,14 @@ describe(`${PartnerController.name} (e2e)`, () => {
    });

    it('should throw a bad request if partner not found', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .delete(`/partner/${user3.userId}`)
        .set('Authorization', `Bearer ${user1.accessToken}`);

      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Partner not found' }));
+      expect(body).toEqual(
+        expect.objectContaining({ message: 'Partner not found' })
+      );
    });
  });
 });
@@ -1,38 +1,30 @@
-import { LoginResponseDto } from '@app/domain';
-import { ServerInfoController } from '@app/immich';
-import { errorStub, userDto } from '@test/fixtures';
+import { LoginResponseDto, getServerConfig } from '@immich/sdk';
+import { createUserDto } from 'src/fixtures';
+import { errorDto } from 'src/responses';
+import { apiUtils, app, dbUtils } from 'src/utils';
 import request from 'supertest';
-import { api } from '../../client';
-import { testApp } from '../utils';
+import { beforeAll, describe, expect, it } from 'vitest';

-describe(`${ServerInfoController.name} (e2e)`, () => {
-  let server: any;
+describe('/server-info', () => {
  let admin: LoginResponseDto;
  let nonAdmin: LoginResponseDto;

  beforeAll(async () => {
-    server = (await testApp.create()).getHttpServer();
-
-    await testApp.reset();
-    await api.authApi.adminSignUp(server);
-    admin = await api.authApi.adminLogin(server);
-    await api.userApi.create(server, admin.accessToken, userDto.user1);
-    nonAdmin = await api.authApi.login(server, userDto.user1);
-  });
-
-  afterAll(async () => {
-    await testApp.teardown();
+    apiUtils.setup();
+    await dbUtils.reset();
+    admin = await apiUtils.adminSetup({ onboarding: false });
+    nonAdmin = await apiUtils.userSetup(admin.accessToken, createUserDto.user1);
  });

  describe('GET /server-info', () => {
    it('should require authentication', async () => {
-      const { status, body } = await request(server).get('/server-info');
+      const { status, body } = await request(app).get('/server-info');
      expect(status).toBe(401);
-      expect(body).toEqual(errorStub.unauthorized);
+      expect(body).toEqual(errorDto.unauthorized);
    });

    it('should return the disk information', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/server-info')
        .set('Authorization', `Bearer ${admin.accessToken}`);
      expect(status).toBe(200);
@@ -50,7 +42,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('GET /server-info/ping', () => {
    it('should respond with pong', async () => {
-      const { status, body } = await request(server).get('/server-info/ping');
+      const { status, body } = await request(app).get('/server-info/ping');
      expect(status).toBe(200);
      expect(body).toEqual({ res: 'pong' });
    });
@@ -58,7 +50,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('GET /server-info/version', () => {
    it('should respond with the server version', async () => {
-      const { status, body } = await request(server).get('/server-info/version');
+      const { status, body } = await request(app).get('/server-info/version');
      expect(status).toBe(200);
      expect(body).toEqual({
        major: expect.any(Number),
@@ -70,12 +62,12 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('GET /server-info/features', () => {
    it('should respond with the server features', async () => {
-      const { status, body } = await request(server).get('/server-info/features');
+      const { status, body } = await request(app).get('/server-info/features');
      expect(status).toBe(200);
      expect(body).toEqual({
-        smartSearch: true,
+        smartSearch: false,
        configFile: false,
-        facialRecognition: true,
+        facialRecognition: false,
        map: true,
        reverseGeocoding: true,
        oauth: false,
@@ -90,7 +82,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('GET /server-info/config', () => {
    it('should respond with the server configuration', async () => {
-      const { status, body } = await request(server).get('/server-info/config');
+      const { status, body } = await request(app).get('/server-info/config');
      expect(status).toBe(200);
      expect(body).toEqual({
        loginPageMessage: '',
@@ -105,21 +97,23 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('GET /server-info/statistics', () => {
    it('should require authentication', async () => {
-      const { status, body } = await request(server).get('/server-info/statistics');
+      const { status, body } = await request(app).get(
+        '/server-info/statistics'
+      );
      expect(status).toBe(401);
-      expect(body).toEqual(errorStub.unauthorized);
+      expect(body).toEqual(errorDto.unauthorized);
    });

    it('should only work for admins', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/server-info/statistics')
        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
      expect(status).toBe(403);
-      expect(body).toEqual(errorStub.forbidden);
+      expect(body).toEqual(errorDto.forbidden);
    });

    it('should return the server stats', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/server-info/statistics')
        .set('Authorization', `Bearer ${admin.accessToken}`);
      expect(status).toBe(200);
@@ -151,7 +145,9 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('GET /server-info/media-types', () => {
    it('should return accepted media types', async () => {
-      const { status, body } = await request(server).get('/server-info/media-types');
+      const { status, body } = await request(app).get(
+        '/server-info/media-types'
+      );
      expect(status).toBe(200);
      expect(body).toEqual({
        sidecar: ['.xmp'],
@@ -163,7 +159,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('GET /server-info/theme', () => {
    it('should respond with the server theme', async () => {
-      const { status, body } = await request(server).get('/server-info/theme');
+      const { status, body } = await request(app).get('/server-info/theme');
      expect(status).toBe(200);
      expect(body).toEqual({
        customCss: '',
@@ -173,15 +169,15 @@ describe(`${ServerInfoController.name} (e2e)`, () => {

  describe('POST /server-info/admin-onboarding', () => {
    it('should set admin onboarding', async () => {
-      const config = await api.serverInfoApi.getConfig(server);
+      const config = await getServerConfig({});
      expect(config.isOnboarded).toBe(false);

-      const { status } = await request(server)
+      const { status } = await request(app)
        .post('/server-info/admin-onboarding')
        .set('Authorization', `Bearer ${admin.accessToken}`);
      expect(status).toBe(204);

-      const newConfig = await api.serverInfoApi.getConfig(server);
+      const newConfig = await getServerConfig({});
      expect(newConfig.isOnboarded).toBe(true);
    });
  });
@@ -1,49 +1,47 @@
-import { LoginResponseDto } from '@app/domain';
-import { SystemConfigController } from '@app/immich';
-import { errorStub, userDto } from '@test/fixtures';
+import { LoginResponseDto } from '@immich/sdk';
+import { createUserDto } from 'src/fixtures';
+import { errorDto } from 'src/responses';
+import { apiUtils, app, dbUtils } from 'src/utils';
 import request from 'supertest';
-import { api } from '../../client';
-import { testApp } from '../utils';
+import { beforeAll, describe, expect, it } from 'vitest';

-describe(`${SystemConfigController.name} (e2e)`, () => {
-  let server: any;
+describe('/system-config', () => {
  let admin: LoginResponseDto;
  let nonAdmin: LoginResponseDto;

  beforeAll(async () => {
-    server = (await testApp.create()).getHttpServer();
-
-    await testApp.reset();
-    await api.authApi.adminSignUp(server);
-    admin = await api.authApi.adminLogin(server);
-    await api.userApi.create(server, admin.accessToken, userDto.user1);
-    nonAdmin = await api.authApi.login(server, userDto.user1);
-  });
-
-  afterAll(async () => {
-    await testApp.teardown();
+    apiUtils.setup();
+    await dbUtils.reset();
+    admin = await apiUtils.adminSetup();
+    nonAdmin = await apiUtils.userSetup(admin.accessToken, createUserDto.user1);
  });

  describe('GET /system-config/map/style.json', () => {
    it('should require authentication', async () => {
-      const { status, body } = await request(server).get('/system-config/map/style.json');
+      const { status, body } = await request(app).get(
+        '/system-config/map/style.json'
+      );
      expect(status).toBe(401);
-      expect(body).toEqual(errorStub.unauthorized);
+      expect(body).toEqual(errorDto.unauthorized);
    });

    it('should throw an error if a theme is not light or dark', async () => {
      for (const theme of ['dark1', true, 123, '', null, undefined]) {
-        const { status, body } = await request(server)
+        const { status, body } = await request(app)
          .get('/system-config/map/style.json')
          .query({ theme })
          .set('Authorization', `Bearer ${admin.accessToken}`);
        expect(status).toBe(400);
-        expect(body).toEqual(errorStub.badRequest(['theme must be one of the following values: light, dark']));
+        expect(body).toEqual(
+          errorDto.badRequest([
+            'theme must be one of the following values: light, dark',
+          ])
+        );
      }
    });

    it('should return the light style.json', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/system-config/map/style.json')
        .query({ theme: 'light' })
        .set('Authorization', `Bearer ${admin.accessToken}`);
@@ -52,7 +50,7 @@ describe(`${SystemConfigController.name} (e2e)`, () => {
    });

    it('should return the dark style.json', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/system-config/map/style.json')
        .query({ theme: 'dark' })
        .set('Authorization', `Bearer ${admin.accessToken}`);
@@ -61,7 +59,7 @@ describe(`${SystemConfigController.name} (e2e)`, () => {
    });

    it('should not require admin authentication', async () => {
-      const { status, body } = await request(server)
+      const { status, body } = await request(app)
        .get('/system-config/map/style.json')
        .query({ theme: 'dark' })
        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
@@ -0,0 +1,323 @@
+import {
+  LoginResponseDto,
+  UserResponseDto,
+  createUser,
+  deleteUser,
+  getUserById,
+} from '@immich/sdk';
+import { createUserDto, userDto } from 'src/fixtures';
+import { errorDto } from 'src/responses';
+import { apiUtils, app, asBearerAuth, dbUtils } from 'src/utils';
+import request from 'supertest';
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+
+describe('/server-info', () => {
+  let admin: LoginResponseDto;
+
+  beforeAll(async () => {
+    apiUtils.setup();
+  });
+
+  beforeEach(async () => {
+    await dbUtils.reset();
+    admin = await apiUtils.adminSetup({ onboarding: false });
+  });
+
+  describe('GET /user', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get('/user');
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should start with the admin', async () => {
+      const { status, body } = await request(app)
+        .get('/user')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toEqual(200);
+      expect(body).toHaveLength(1);
+      expect(body[0]).toMatchObject({ email: 'admin@immich.cloud' });
+    });
+
+    it('should hide deleted users', async () => {
+      const user1 = await apiUtils.userSetup(
+        admin.accessToken,
+        createUserDto.user1
+      );
+      await deleteUser(
+        { id: user1.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
+
+      const { status, body } = await request(app)
+        .get(`/user`)
+        .query({ isAll: true })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toHaveLength(1);
+      expect(body[0]).toMatchObject({ email: 'admin@immich.cloud' });
+    });
+
+    it('should include deleted users', async () => {
+      const user1 = await apiUtils.userSetup(
+        admin.accessToken,
+        createUserDto.user1
+      );
+      await deleteUser(
+        { id: user1.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
+
+      const { status, body } = await request(app)
+        .get(`/user`)
+        .query({ isAll: false })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(2);
+      expect(body[0]).toMatchObject({
+        id: user1.userId,
+        email: 'user1@immich.cloud',
+        deletedAt: expect.any(String),
+      });
+      expect(body[1]).toMatchObject({
+        id: admin.userId,
+        email: 'admin@immich.cloud',
+      });
+    });
+  });
+
+  describe('GET /user/info/:id', () => {
+    it('should require authentication', async () => {
+      const { status } = await request(app).get(`/user/info/${admin.userId}`);
+      expect(status).toEqual(401);
+    });
+
+    it('should get the user info', async () => {
+      const { status, body } = await request(app)
+        .get(`/user/info/${admin.userId}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        id: admin.userId,
+        email: 'admin@immich.cloud',
+      });
+    });
+  });
+
+  describe('GET /user/me', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).get(`/user/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)) {
+      it(`should not allow null ${key}`, async () => {
+        const { status, body } = await request(app)
+          .post(`/user`)
+          .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(`/user`)
+        .send({
+          isAdmin: true,
+          email: 'user1@immich.cloud',
+          password: 'Password123',
+          name: 'Immich',
+        })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(body).toMatchObject({
+        email: 'user1@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', () => {
+    let userToDelete: UserResponseDto;
+
+    beforeEach(async () => {
+      userToDelete = await createUser(
+        { createUserDto: createUserDto.user1 },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
+    });
+
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).delete(
+        `/user/${userToDelete.id}`
+      );
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should delete user', async () => {
+      const { status, body } = await request(app)
+        .delete(`/user/${userToDelete.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toEqual({
+        ...userToDelete,
+        updatedAt: expect.any(String),
+        deletedAt: expect.any(String),
+      });
+    });
+  });
+
+  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 user = await apiUtils.userSetup(
+        admin.accessToken,
+        createUserDto.user1
+      );
+
+      const { status, body } = await request(app)
+        .put(`/user`)
+        .send({ isAdmin: true, id: user.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 { status, body } = await request(app)
+        .put(`/user`)
+        .send({
+          id: admin.userId,
+          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 getUserById(
+        { id: admin.userId },
+        { headers: asBearerAuth(admin.accessToken) }
+      );
+      const { status, body } = await request(app)
+        .put(`/user`)
+        .send({
+          id: admin.userId,
+          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);
+    });
+  });
+});
@@ -0,0 +1,58 @@
+import { stat } from 'node:fs/promises';
+import { apiUtils, app, dbUtils, immichCli } from 'src/utils';
+import { beforeEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe(`immich login-key`, () => {
+  beforeAll(() => {
+    apiUtils.setup();
+  });
+
+  beforeEach(async () => {
+    await dbUtils.reset();
+  });
+
+  it('should require a url', async () => {
+    const { stderr, exitCode } = await immichCli(['login-key']);
+    expect(stderr).toBe("error: missing required argument 'url'");
+    expect(exitCode).toBe(1);
+  });
+
+  it('should require a key', async () => {
+    const { stderr, exitCode } = await immichCli(['login-key', app]);
+    expect(stderr).toBe("error: missing required argument 'key'");
+    expect(exitCode).toBe(1);
+  });
+
+  it('should require a valid key', async () => {
+    const { stderr, exitCode } = await immichCli([
+      'login-key',
+      app,
+      'immich-is-so-cool',
+    ]);
+    expect(stderr).toContain(
+      'Failed to connect to server http://127.0.0.1:2283/api: Error: 401'
+    );
+    expect(exitCode).toBe(1);
+  });
+
+  it('should login', async () => {
+    const admin = await apiUtils.adminSetup();
+    const key = await apiUtils.createApiKey(admin.accessToken);
+    const { stdout, stderr, exitCode } = await immichCli([
+      'login-key',
+      app,
+      `${key.secret}`,
+    ]);
+    expect(stdout.split('\n')).toEqual([
+      'Logging in...',
+      'Logged in as admin@immich.cloud',
+      'Wrote auth info to /tmp/immich/auth.yml',
+    ]);
+    expect(stderr).toBe('');
+    expect(exitCode).toBe(0);
+
+    const stats = await stat('/tmp/immich/auth.yml');
+    const mode = (stats.mode & 0o777).toString(8);
+    expect(mode).toEqual('600');
+  });
+});
@@ -0,0 +1,28 @@
+import { apiUtils, cliUtils, dbUtils, immichCli } from 'src/utils';
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+
+describe(`immich server-info`, () => {
+  beforeAll(() => {
+    apiUtils.setup();
+  });
+
+  beforeEach(async () => {
+    await dbUtils.reset();
+    await cliUtils.login();
+  });
+
+  it('should return the server info', async () => {
+    const { stderr, stdout, exitCode } = await immichCli(['server-info']);
+    expect(stdout.split('\n')).toEqual([
+      expect.stringContaining('Server Version:'),
+      expect.stringContaining('Image Types:'),
+      expect.stringContaining('Video Types:'),
+      'Statistics:',
+      '  Images: 0',
+      '  Videos: 0',
+      '  Total: 0',
+    ]);
+    expect(stderr).toBe('');
+    expect(exitCode).toBe(0);
+  });
+});
@@ -0,0 +1,178 @@
+import { getAllAlbums, getAllAssets } from '@immich/sdk';
+import {
+  apiUtils,
+  asKeyAuth,
+  cliUtils,
+  dbUtils,
+  immichCli,
+  testAssetDir,
+} from 'src/utils';
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { mkdir, readdir, rm, symlink } from 'fs/promises';
+
+describe(`immich upload`, () => {
+  let key: string;
+
+  beforeAll(() => {
+    apiUtils.setup();
+  });
+
+  beforeEach(async () => {
+    await dbUtils.reset();
+    key = await cliUtils.login();
+  });
+
+  describe('immich upload --recursive', () => {
+    it('should upload a folder recursively', async () => {
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+      ]);
+      expect(stderr).toBe('');
+      expect(stdout.split('\n')).toEqual(
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+        ])
+      );
+      expect(exitCode).toBe(0);
+
+      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets.length).toBe(9);
+    });
+  });
+
+  describe('immich upload --recursive --album', () => {
+    it('should create albums from folder names', async () => {
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+        '--album',
+      ]);
+      expect(stdout.split('\n')).toEqual(
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+          expect.stringContaining('Successfully created 1 new album'),
+          expect.stringContaining('Successfully updated 9 assets'),
+        ])
+      );
+      expect(stderr).toBe('');
+      expect(exitCode).toBe(0);
+
+      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets.length).toBe(9);
+
+      const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
+      expect(albums.length).toBe(1);
+      expect(albums[0].albumName).toBe('nature');
+    });
+
+    it('should add existing assets to albums', async () => {
+      const response1 = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+      ]);
+      expect(response1.stdout.split('\n')).toEqual(
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+        ])
+      );
+      expect(response1.stderr).toBe('');
+      expect(response1.exitCode).toBe(0);
+
+      const assets1 = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets1.length).toBe(9);
+
+      const albums1 = await getAllAlbums({}, { headers: asKeyAuth(key) });
+      expect(albums1.length).toBe(0);
+
+      const response2 = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+        '--album',
+      ]);
+      expect(response2.stdout.split('\n')).toEqual(
+        expect.arrayContaining([
+          expect.stringContaining(
+            'All assets were already uploaded, nothing to do.'
+          ),
+          expect.stringContaining('Successfully updated 9 assets'),
+        ])
+      );
+      expect(response2.stderr).toBe('');
+      expect(response2.exitCode).toBe(0);
+
+      const assets2 = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets2.length).toBe(9);
+
+      const albums2 = await getAllAlbums({}, { headers: asKeyAuth(key) });
+      expect(albums2.length).toBe(1);
+      expect(albums2[0].albumName).toBe('nature');
+    });
+  });
+
+  describe('immich upload --recursive --album-name=e2e', () => {
+    it('should create a named album', async () => {
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `${testAssetDir}/albums/nature/`,
+        '--recursive',
+        '--album-name=e2e',
+      ]);
+      expect(stdout.split('\n')).toEqual(
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+          expect.stringContaining('Successfully created 1 new album'),
+          expect.stringContaining('Successfully updated 9 assets'),
+        ])
+      );
+      expect(stderr).toBe('');
+      expect(exitCode).toBe(0);
+
+      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets.length).toBe(9);
+
+      const albums = await getAllAlbums({}, { headers: asKeyAuth(key) });
+      expect(albums.length).toBe(1);
+      expect(albums[0].albumName).toBe('e2e');
+    });
+  });
+
+  describe('immich upload --delete', () => {
+    it('should delete local files if specified', async () => {
+      await mkdir(`/tmp/albums/nature`, { recursive: true });
+      const filesToLink = await readdir(`${testAssetDir}/albums/nature`);
+      for (const file of filesToLink) {
+        await symlink(
+          `${testAssetDir}/albums/nature/${file}`,
+          `/tmp/albums/nature/${file}`
+        );
+      }
+
+      const { stderr, stdout, exitCode } = await immichCli([
+        'upload',
+        `/tmp/albums/nature`,
+        '--delete',
+      ]);
+
+      const files = await readdir(`/tmp/albums/nature`);
+      await rm(`/tmp/albums/nature`, { recursive: true });
+      expect(files).toEqual([]);
+
+      expect(stdout.split('\n')).toEqual(
+        expect.arrayContaining([
+          expect.stringContaining('Successfully uploaded 9 assets'),
+          expect.stringContaining('Deleting assets that have been uploaded'),
+        ])
+      );
+      expect(stderr).toBe('');
+      expect(exitCode).toBe(0);
+
+      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets.length).toBe(9);
+    });
+  });
+});
@@ -0,0 +1,29 @@
+import { readFileSync } from 'node:fs';
+import { apiUtils, immichCli } from 'src/utils';
+import { beforeAll, describe, expect, it } from 'vitest';
+
+const pkg = JSON.parse(readFileSync('../cli/package.json', 'utf8'));
+
+describe(`immich --version`, () => {
+  beforeAll(() => {
+    apiUtils.setup();
+  });
+
+  describe('immich --version', () => {
+    it('should print the cli version', async () => {
+      const { stdout, stderr, exitCode } = await immichCli(['--version']);
+      expect(stdout).toEqual(pkg.version);
+      expect(stderr).toEqual('');
+      expect(exitCode).toBe(0);
+    });
+  });
+
+  describe('immich -V', () => {
+    it('should print the cli version', async () => {
+      const { stdout, stderr, exitCode } = await immichCli(['-V']);
+      expect(stdout).toEqual(pkg.version);
+      expect(stderr).toEqual('');
+      expect(exitCode).toBe(0);
+    });
+  });
+});
@@ -0,0 +1,80 @@
+import { UserAvatarColor } from '@immich/sdk';
+
+export const uuidDto = {
+  invalid: 'invalid-uuid',
+  // valid uuid v4
+  notFound: '00000000-0000-4000-a000-000000000000',
+};
+
+const adminLoginDto = {
+  email: 'admin@immich.cloud',
+  password: 'password',
+};
+const adminSignupDto = { ...adminLoginDto, name: 'Immich Admin' };
+
+export const loginDto = {
+  admin: adminLoginDto,
+};
+
+export const signupDto = {
+  admin: adminSignupDto,
+};
+
+export const createUserDto = {
+  user1: {
+    email: 'user1@immich.cloud',
+    name: 'User 1',
+    password: 'password1',
+  },
+  user2: {
+    email: 'user2@immich.cloud',
+    name: 'User 2',
+    password: 'password12',
+  },
+  user3: {
+    email: 'user3@immich.cloud',
+    name: 'User 3',
+    password: 'password123',
+  },
+};
+
+export const userDto = {
+  admin: {
+    name: signupDto.admin.name,
+    email: signupDto.admin.email,
+    password: signupDto.admin.password,
+    storageLabel: 'admin',
+    externalPath: null,
+    oauthId: '',
+    shouldChangePassword: false,
+    profileImagePath: '',
+    createdAt: new Date('2021-01-01'),
+    deletedAt: null,
+    updatedAt: new Date('2021-01-01'),
+    tags: [],
+    assets: [],
+    memoriesEnabled: true,
+    avatarColor: UserAvatarColor.Primary,
+    quotaSizeInBytes: null,
+    quotaUsageInBytes: 0,
+  },
+  user1: {
+    name: createUserDto.user1.name,
+    email: createUserDto.user1.email,
+    password: createUserDto.user1.password,
+    storageLabel: null,
+    externalPath: null,
+    oauthId: '',
+    shouldChangePassword: false,
+    profileImagePath: '',
+    createdAt: new Date('2021-01-01'),
+    deletedAt: null,
+    updatedAt: new Date('2021-01-01'),
+    tags: [],
+    assets: [],
+    memoriesEnabled: true,
+    avatarColor: UserAvatarColor.Primary,
+    quotaSizeInBytes: null,
+    quotaUsageInBytes: 0,
+  },
+};
@@ -0,0 +1,103 @@
+import { expect } from 'vitest';
+
+export const errorDto = {
+  unauthorized: {
+    error: 'Unauthorized',
+    statusCode: 401,
+    message: 'Authentication required',
+  },
+  forbidden: {
+    error: 'Forbidden',
+    statusCode: 403,
+    message: expect.any(String),
+  },
+  wrongPassword: {
+    error: 'Bad Request',
+    statusCode: 400,
+    message: 'Wrong password',
+  },
+  invalidToken: {
+    error: 'Unauthorized',
+    statusCode: 401,
+    message: 'Invalid user token',
+  },
+  invalidShareKey: {
+    error: 'Unauthorized',
+    statusCode: 401,
+    message: 'Invalid share key',
+  },
+  invalidSharePassword: {
+    error: 'Unauthorized',
+    statusCode: 401,
+    message: 'Invalid password',
+  },
+  badRequest: (message: any = null) => ({
+    error: 'Bad Request',
+    statusCode: 400,
+    message: message ?? expect.anything(),
+  }),
+  noPermission: {
+    error: 'Bad Request',
+    statusCode: 400,
+    message: expect.stringContaining('Not found or no'),
+  },
+  incorrectLogin: {
+    error: 'Unauthorized',
+    statusCode: 401,
+    message: 'Incorrect email or password',
+  },
+  alreadyHasAdmin: {
+    error: 'Bad Request',
+    statusCode: 400,
+    message: 'The server already has an admin',
+  },
+  noDeleteUploadLibrary: {
+    error: 'Bad Request',
+    statusCode: 400,
+    message: 'Cannot delete the last upload library',
+  },
+};
+
+export const signupResponseDto = {
+  admin: {
+    avatarColor: expect.any(String),
+    id: expect.any(String),
+    name: 'Immich Admin',
+    email: 'admin@immich.cloud',
+    storageLabel: 'admin',
+    externalPath: null,
+    profileImagePath: '',
+    // why? lol
+    shouldChangePassword: true,
+    isAdmin: true,
+    createdAt: expect.any(String),
+    updatedAt: expect.any(String),
+    deletedAt: null,
+    oauthId: '',
+    memoriesEnabled: true,
+    quotaUsageInBytes: 0,
+    quotaSizeInBytes: null,
+  },
+};
+
+export const loginResponseDto = {
+  admin: {
+    accessToken: expect.any(String),
+    name: 'Immich Admin',
+    isAdmin: true,
+    profileImagePath: '',
+    shouldChangePassword: true,
+    userEmail: 'admin@immich.cloud',
+    userId: expect.any(String),
+  },
+};
+export const deviceDto = {
+  current: {
+    id: expect.any(String),
+    createdAt: expect.any(String),
+    updatedAt: expect.any(String),
+    current: true,
+    deviceOS: '',
+    deviceType: '',
+  },
+};
@@ -0,0 +1,26 @@
+import { spawn, exec } from 'child_process';
+
+export default async () => {
+  let _resolve: () => unknown;
+  const promise = new Promise<void>((resolve) => (_resolve = resolve));
+
+  const child = spawn('docker', ['compose', 'up'], { stdio: 'pipe' });
+
+  child.stdout.on('data', (data) => {
+    const input = data.toString();
+    console.log(input);
+    if (input.includes('Immich Server is listening')) {
+      _resolve();
+    }
+  });
+
+  child.stderr.on('data', (data) => console.log(data.toString()));
+
+  await promise;
+
+  return async () => {
+    await new Promise<void>((resolve) =>
+      exec('docker compose down', () => resolve())
+    );
+  };
+};
@@ -0,0 +1,213 @@
+import {
+  AssetResponseDto,
+  CreateAssetDto,
+  CreateUserDto,
+  LoginResponseDto,
+  createApiKey,
+  createUser,
+  defaults,
+  login,
+  setAdminOnboarding,
+  signUpAdmin,
+} from '@immich/sdk';
+import { BrowserContext } from '@playwright/test';
+import { spawn } from 'child_process';
+import { randomBytes } from 'node:crypto';
+import { access } from 'node:fs/promises';
+import path from 'node:path';
+import pg from 'pg';
+import { loginDto, signupDto } from 'src/fixtures';
+import request from 'supertest';
+
+export const app = 'http://127.0.0.1:2283/api';
+
+const directoryExists = (directory: string) =>
+  access(directory)
+    .then(() => true)
+    .catch(() => false);
+
+// TODO move test assets into e2e/assets
+export const testAssetDir = path.resolve(`./../server/test/assets/`);
+
+if (!(await directoryExists(`${testAssetDir}/albums`))) {
+  throw new Error(
+    `Test assets not found. Please checkout https://github.com/immich-app/test-assets into ${testAssetDir} before testing`
+  );
+}
+
+const setBaseUrl = () => (defaults.baseUrl = app);
+export const asBearerAuth = (accessToken: string) => ({
+  Authorization: `Bearer ${accessToken}`,
+});
+
+export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
+
+let client: pg.Client | null = null;
+
+export const dbUtils = {
+  reset: async () => {
+    try {
+      if (!client) {
+        client = new pg.Client(
+          'postgres://postgres:postgres@127.0.0.1:5433/immich'
+        );
+        await client.connect();
+      }
+
+      for (const table of [
+        'albums',
+        'assets',
+        'api_keys',
+        'user_token',
+        'users',
+        'system_metadata',
+      ]) {
+        await client.query(`DELETE FROM ${table} CASCADE;`);
+      }
+    } catch (error) {
+      console.error('Failed to reset database', error);
+      throw error;
+    }
+  },
+  teardown: async () => {
+    try {
+      if (client) {
+        await client.end();
+        client = null;
+      }
+    } catch (error) {
+      console.error('Failed to teardown database', error);
+      throw error;
+    }
+  },
+};
+export interface CliResponse {
+  stdout: string;
+  stderr: string;
+  exitCode: number | null;
+}
+
+export const immichCli = async (args: string[]) => {
+  let _resolve: (value: CliResponse) => void;
+  const deferred = new Promise<CliResponse>((resolve) => (_resolve = resolve));
+  const _args = ['node_modules/.bin/immich', '-d', '/tmp/immich/', ...args];
+  const child = spawn('node', _args, {
+    stdio: 'pipe',
+  });
+
+  let stdout = '';
+  let stderr = '';
+
+  child.stdout.on('data', (data) => (stdout += data.toString()));
+  child.stderr.on('data', (data) => (stderr += data.toString()));
+  child.on('exit', (exitCode) => {
+    _resolve({
+      stdout: stdout.trim(),
+      stderr: stderr.trim(),
+      exitCode,
+    });
+  });
+
+  return deferred;
+};
+
+export interface AdminSetupOptions {
+  onboarding?: boolean;
+}
+
+export const apiUtils = {
+  setup: () => {
+    setBaseUrl();
+  },
+  adminSetup: async (options?: AdminSetupOptions) => {
+    options = options || { onboarding: true };
+
+    await signUpAdmin({ signUpDto: signupDto.admin });
+    const response = await login({ loginCredentialDto: loginDto.admin });
+    if (options.onboarding) {
+      await setAdminOnboarding({ headers: asBearerAuth(response.accessToken) });
+    }
+    return response;
+  },
+  userSetup: async (accessToken: string, dto: CreateUserDto) => {
+    await createUser(
+      { createUserDto: dto },
+      { headers: asBearerAuth(accessToken) }
+    );
+    return login({
+      loginCredentialDto: { email: dto.email, password: dto.password },
+    });
+  },
+  createApiKey: (accessToken: string) => {
+    return createApiKey(
+      { apiKeyCreateDto: { name: 'e2e' } },
+      { headers: asBearerAuth(accessToken) }
+    );
+  },
+  createAsset: async (
+    accessToken: string,
+    dto?: Omit<CreateAssetDto, 'assetData'>
+  ) => {
+    dto = dto || {
+      deviceAssetId: 'test-1',
+      deviceId: 'test',
+      fileCreatedAt: new Date().toISOString(),
+      fileModifiedAt: new Date().toISOString(),
+    };
+    const { body } = await request(app)
+      .post(`/asset/upload`)
+      .field('deviceAssetId', dto.deviceAssetId)
+      .field('deviceId', dto.deviceId)
+      .field('fileCreatedAt', dto.fileCreatedAt)
+      .field('fileModifiedAt', dto.fileModifiedAt)
+      .attach('assetData', randomBytes(32), 'example.jpg')
+      .set('Authorization', `Bearer ${accessToken}`);
+
+    return body as AssetResponseDto;
+  },
+};
+
+export const cliUtils = {
+  login: async () => {
+    const admin = await apiUtils.adminSetup();
+    const key = await apiUtils.createApiKey(admin.accessToken);
+    await immichCli(['login-key', app, `${key.secret}`]);
+    return key.secret;
+  },
+};
+
+export const webUtils = {
+  setAuthCookies: async (context: BrowserContext, accessToken: string) =>
+    await context.addCookies([
+      {
+        name: 'immich_access_token',
+        value: accessToken,
+        domain: '127.0.0.1',
+        path: '/',
+        expires: 1742402728,
+        httpOnly: true,
+        secure: false,
+        sameSite: 'Lax',
+      },
+      {
+        name: 'immich_auth_type',
+        value: 'password',
+        domain: '127.0.0.1',
+        path: '/',
+        expires: 1742402728,
+        httpOnly: true,
+        secure: false,
+        sameSite: 'Lax',
+      },
+      {
+        name: 'immich_is_authenticated',
+        value: 'true',
+        domain: '127.0.0.1',
+        path: '/',
+        expires: 1742402728,
+        httpOnly: false,
+        secure: false,
+        sameSite: 'Lax',
+      },
+    ]),
+};
@@ -1,13 +1,17 @@
 import { test, expect } from '@playwright/test';
-import { app } from '../test-utils';
+import { apiUtils, dbUtils, webUtils } from 'src/utils';

 test.describe('Registration', () => {
-  test.beforeAll(async () => {
-    await app.reset();
+  test.beforeAll(() => {
+    apiUtils.setup();
+  });
+
+  test.beforeEach(async () => {
+    await dbUtils.reset();
  });

  test.afterAll(async () => {
-    await app.teardown();
+    await dbUtils.teardown();
  });

  test('admin registration', async ({ page }) => {
@@ -41,7 +45,8 @@ test.describe('Registration', () => {
  });

  test('user registration', async ({ context, page }) => {
-    await app.adminSetup(context);
+    const admin = await apiUtils.adminSetup();
+    await webUtils.setAuthCookies(context, admin.accessToken);

    // create user
    await page.goto('/admin/user-management');
@@ -0,0 +1,58 @@
+import {
+  AlbumResponseDto,
+  AssetResponseDto,
+  LoginResponseDto,
+  SharedLinkResponseDto,
+  SharedLinkType,
+  createAlbum,
+  createSharedLink,
+} from '@immich/sdk';
+import { test } from '@playwright/test';
+import { apiUtils, asBearerAuth, dbUtils } from 'src/utils';
+
+test.describe('Shared Links', () => {
+  let admin: LoginResponseDto;
+  let asset: AssetResponseDto;
+  let album: AlbumResponseDto;
+  let sharedLink: SharedLinkResponseDto;
+
+  test.beforeAll(async () => {
+    apiUtils.setup();
+    await dbUtils.reset();
+    admin = await apiUtils.adminSetup();
+    asset = await apiUtils.createAsset(admin.accessToken);
+    album = await createAlbum(
+      {
+        createAlbumDto: {
+          albumName: 'Test Album',
+          assetIds: [asset.id],
+        },
+      },
+      { headers: asBearerAuth(admin.accessToken) }
+      // { headers: asBearerAuth(admin.accessToken)},
+    );
+    sharedLink = await createSharedLink(
+      {
+        sharedLinkCreateDto: {
+          type: SharedLinkType.Album,
+          albumId: album.id,
+        },
+      },
+      { headers: asBearerAuth(admin.accessToken) }
+    );
+  });
+
+  test.afterAll(async () => {
+    await dbUtils.teardown();
+  });
+
+  test('download from a shared link', async ({ page }) => {
+    await page.goto(`/share/${sharedLink.key}`);
+    await page.getByRole('heading', { name: 'Test Album' }).waitFor();
+    await page.locator('.group > div').first().hover();
+    await page.waitForSelector('#asset-group-by-date svg');
+    await page.getByRole('checkbox').click();
+    await page.getByRole('button', { name: 'Download' }).click();
+    await page.getByText('DOWNLOADING').waitFor();
+  });
+});
@@ -1,79 +0,0 @@
-import pg from 'pg';
-import { defaults, login, setAdminOnboarding, signUpAdmin } from '@immich/sdk';
-import { BrowserContext } from '@playwright/test';
-
-const client = new pg.Client(
-  'postgres://postgres:postgres@localhost:5432/immich'
-);
-let connected = false;
-
-const loginCredentialDto = {
-  email: 'admin@immich.cloud',
-  password: 'password',
-};
-const signUpDto = { ...loginCredentialDto, name: 'Immich Admin' };
-
-const setBaseUrl = () => (defaults.baseUrl = 'http://127.0.0.1:2283/api');
-const asAuthHeader = (accessToken: string) => ({
-  Authorization: `Bearer ${accessToken}`,
-});
-
-export const app = {
-  adminSetup: async (context: BrowserContext) => {
-    setBaseUrl();
-    await signUpAdmin({ signUpDto });
-
-    const response = await login({ loginCredentialDto });
-
-    await context.addCookies([
-      {
-        name: 'immich_access_token',
-        value: response.accessToken,
-        domain: '127.0.0.1',
-        path: '/',
-        expires: 1742402728,
-        httpOnly: true,
-        secure: false,
-        sameSite: 'Lax',
-      },
-      {
-        name: 'immich_auth_type',
-        value: 'password',
-        domain: '127.0.0.1',
-        path: '/',
-        expires: 1742402728,
-        httpOnly: true,
-        secure: false,
-        sameSite: 'Lax',
-      },
-      {
-        name: 'immich_is_authenticated',
-        value: 'true',
-        domain: '127.0.0.1',
-        path: '/',
-        expires: 1742402728,
-        httpOnly: false,
-        secure: false,
-        sameSite: 'Lax',
-      },
-    ]);
-
-    await setAdminOnboarding({ headers: asAuthHeader(response.accessToken) });
-
-    return response;
-  },
-  reset: async () => {
-    if (!connected) {
-      await client.connect();
-    }
-
-    for (const table of ['users', 'system_metadata']) {
-      await client.query(`DELETE FROM ${table} CASCADE;`);
-    }
-  },
-  teardown: async () => {
-    if (connected) {
-      await client.end();
-    }
-  },
-};
@@ -16,8 +16,7 @@
    "skipLibCheck": true,
    "esModuleInterop": true,
    "rootDirs": ["src"],
-    "baseUrl": "./",
-    "types": ["vitest/globals"]
+    "baseUrl": "./"
  },
  "exclude": ["dist", "node_modules"]
 }
@@ -0,0 +1,13 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    include: ['src/{api,cli}/specs/*.e2e-spec.ts'],
+    globalSetup: ['src/setup.ts'],
+    poolOptions: {
+      threads: {
+        singleThread: true,
+      },
+    },
+  },
+});
@@ -1,15 +1,13 @@
+#!/usr/bin/env bash
+
 echo "Starting Immich installation..."

 ip_address=$(hostname -I | awk '{print $1}')

-RED='\033[0;31m'
-GREEN='\032[0;31m'
-NC='\033[0m' # No Color
-
 create_immich_directory() {
  echo "Creating Immich directory..."
  mkdir -p ./immich-app/immich-data
-  cd ./immich-app
+  cd ./immich-app || exit
 }

 download_docker_compose_file() {
@@ -34,18 +32,18 @@ replace_env_value() {
 populate_upload_location() {
  echo "Populating default UPLOAD_LOCATION value..."
  upload_location=$(pwd)/immich-data
-  replace_env_value "UPLOAD_LOCATION" $upload_location
+  replace_env_value "UPLOAD_LOCATION" "$upload_location"
 }

 start_docker_compose() {
  echo "Starting Immich's docker containers"

-  if docker compose > /dev/null 2>&1; then
+  if docker compose >/dev/null 2>&1; then
    docker_bin="docker compose"
-  elif docker-compose > /dev/null 2>&1; then
+  elif docker-compose >/dev/null 2>&1; then
    docker_bin="docker-compose"
  else
-    echo 'Cannot find `docker compose` or `docker-compose`.'
+    echo "Cannot find \`docker compose\` or \`docker-compose\`."
    exit 1
  fi

@@ -59,7 +57,7 @@ start_docker_compose() {
 }

 show_friendly_message() {
-  echo "Succesfully deployed Immich!"
+  echo "Successfully deployed Immich!"
  echo "You can access the website at http://$ip_address:2283 and the server URL for the mobile app is http://$ip_address:2283/api"
  echo "The library location is $upload_location"
  echo "---------------------------------------------------"
@@ -1 +1,3 @@
-g++ -shared -O3 -o libann.so -fuse-ld=gold -std=c++17 -I$ARMNN_PATH/include -larmnn -larmnnDeserializer -larmnnTfLiteParser -larmnnOnnxParser -L$ARMNN_PATH ann.cpp
+#!/usr/bin/env sh
+
+g++ -shared -O3 -o libann.so -fuse-ld=gold -std=c++17 -I"$ARMNN_PATH"/include -larmnn -larmnnDeserializer -larmnnTfLiteParser -larmnnOnnxParser -L"$ARMNN_PATH" ann.cpp
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh

-cd armnn-23.11/
+cd armnn-23.11/ || exit
 g++ -o ../armnnconverter -O1 -DARMNN_ONNX_PARSER -DARMNN_SERIALIZER -DARMNN_TF_LITE_PARSER -fuse-ld=gold -std=c++17 -Iinclude -Isrc/armnnUtils -Ithird-party -larmnn -larmnnDeserializer -larmnnTfLiteParser -larmnnOnnxParser -larmnnSerializer -L../armnn src/armnnConverter/ArmnnConverter.cpp
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.94.1"
+version = "1.95.1"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh

-export LD_PRELOAD="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
+lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
+export LD_PRELOAD="$lib_path"
 export LD_BIND_NOW=1

 : "${MACHINE_LEARNING_HOST:=0.0.0.0}"
@@ -10,8 +11,8 @@ export LD_BIND_NOW=1

 gunicorn app.main:app \
 	-k app.config.CustomUvicornWorker \
-	-w $MACHINE_LEARNING_WORKERS \
-	-b $MACHINE_LEARNING_HOST:$MACHINE_LEARNING_PORT \
-	-t $MACHINE_LEARNING_WORKER_TIMEOUT \
+	-w "$MACHINE_LEARNING_WORKERS" \
+	-b "$MACHINE_LEARNING_HOST":"$MACHINE_LEARNING_PORT" \
+	-t "$MACHINE_LEARNING_WORKER_TIMEOUT" \
 	--log-config-json log_conf.json \
 	--graceful-timeout 0
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/usr/bin/env bash

 #
 # Pump one or both of the server/mobile versions in appropriate files
@@ -25,10 +25,10 @@ while getopts 's:m:' flag; do
  esac
 done

-CURRENT_SERVER=$(cat server/package.json | jq -r '.version')
-MAJOR=$(echo $CURRENT_SERVER | cut -d '.' -f1)
-MINOR=$(echo $CURRENT_SERVER | cut -d '.' -f2)
-PATCH=$(echo $CURRENT_SERVER | cut -d '.' -f3)
+CURRENT_SERVER=$(jq -r '.version' server/package.json)
+MAJOR=$(echo "$CURRENT_SERVER" | cut -d '.' -f1)
+MINOR=$(echo "$CURRENT_SERVER" | cut -d '.' -f2)
+PATCH=$(echo "$CURRENT_SERVER" | cut -d '.' -f3)

 if [[ $SERVER_PUMP == "major" ]]; then
  MAJOR=$((MAJOR + 1))
@@ -48,7 +48,7 @@ fi

 NEXT_SERVER=$MAJOR.$MINOR.$PATCH

-CURRENT_MOBILE=$(cat mobile/pubspec.yaml | grep "^version: .*+[0-9]\+$" | cut -d "+" -f2)
+CURRENT_MOBILE=$(grep "^version: .*+[0-9]\+$" mobile/pubspec.yaml | cut -d "+" -f2)
 NEXT_MOBILE=$CURRENT_MOBILE
 if [[ $MOBILE_PUMP == "true" ]]; then
  set $((NEXT_MOBILE++))
@@ -61,9 +61,10 @@ fi

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

 if [ "$CURRENT_MOBILE" != "$NEXT_MOBILE" ]; then
@@ -75,4 +76,4 @@ sed -i "s/version_number: \"$CURRENT_SERVER\"$/version_number: \"$NEXT_SERVER\"/
 sed -i "s/\"android\.injected\.version\.code\" => $CURRENT_MOBILE,/\"android\.injected\.version\.code\" => $NEXT_MOBILE,/" mobile/android/fastlane/Fastfile
 sed -i "s/^version: $CURRENT_SERVER+$CURRENT_MOBILE$/version: $NEXT_SERVER+$NEXT_MOBILE/" mobile/pubspec.yaml

-echo "IMMICH_VERSION=v$NEXT_SERVER" >>$GITHUB_ENV
+echo "IMMICH_VERSION=v$NEXT_SERVER" >>"$GITHUB_ENV"
@@ -33,10 +33,10 @@ linter:
 # https://dart.dev/guides/language/analysis-options
 analyzer:
  exclude:
-    - openapi/
-    - openapi/test/
+    - openapi/**
+    - openapi/test/**
    - lib/generated_plugin_registrant.dart
-  
+
 plugins:
  - custom_lint

@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 121,
-        "android.injected.version.name" => "1.94.1",
+        "android.injected.version.code" => 123,
+        "android.injected.version.name" => "1.95.1",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
@@ -5,17 +5,17 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000276">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000232">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="22.651725">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="78.881681">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="31.263395">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="32.080999">
        
      </testcase>
    
@@ -180,4 +180,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 64c9b5291666c0ca3caabdfe9865c141ac40321d

-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
@@ -379,7 +379,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 137;
+				CURRENT_PROJECT_VERSION = 139;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -515,7 +515,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 137;
+				CURRENT_PROJECT_VERSION = 139;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -543,7 +543,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 137;
+				CURRENT_PROJECT_VERSION = 139;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -55,11 +55,11 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>1.94.1</string>
+    <string>1.95.0</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>137</string>
+    <string>139</string>
    <key>FLTEnableImpeller</key>
    <true />
    <key>ITSAppUsesNonExemptEncryption</key>
@@ -1,10 +1,10 @@
 #!/usr/bin/env sh

 # The default execution directory of this script is the ci_scripts directory.
-cd $CI_WORKSPACE/mobile
+cd "$CI_WORKSPACE"/mobile || exit

 # Install Flutter using git.
-git clone https://github.com/flutter/flutter.git --depth 1 -b stable $HOME/flutter
+git clone https://github.com/flutter/flutter.git --depth 1 -b stable "$HOME"/flutter
 export PATH="$PATH:$HOME/flutter/bin"

 # Install Flutter artifacts for iOS (--ios), or macOS (--macos) platforms.
@@ -14,7 +14,7 @@ flutter precache --ios
 flutter pub get

 # Install CocoaPods using Homebrew.
-HOMEBREW_NO_AUTO_UPDATE=1 # disable homebrew's automatic updates.
+export HOMEBREW_NO_AUTO_UPDATE=1 # disable homebrew's automatic updates.
 brew install cocoapods

 # Install CocoaPods dependencies.
@@ -19,7 +19,7 @@ platform :ios do
  desc "iOS Beta"
  lane :beta do
    increment_version_number(
-      version_number: "1.94.1"
+      version_number: "1.95.1"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
@@ -5,32 +5,32 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000247">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000255">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.238661">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.157832">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="2.965603">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.825919">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.228067">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.18815">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="4: build_app" time="108.628243">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="110.912709">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="71.752027">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="78.396901">
        
      </testcase>
    
@@ -3,8 +3,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/datetime_extensions.dart';
 import 'package:immich_mobile/modules/activities/models/activity.model.dart';
+import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_image_provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/current_asset.provider.dart';
-import 'package:immich_mobile/shared/ui/immich_image.dart';
 import 'package:immich_mobile/shared/ui/user_circle_avatar.dart';

 class ActivityTile extends HookConsumerWidget {
@@ -106,7 +106,10 @@ class _ActivityAssetThumbnail extends StatelessWidget {
      decoration: BoxDecoration(
        borderRadius: const BorderRadius.all(Radius.circular(4)),
        image: DecorationImage(
-          image: ImmichImage.remoteThumbnailProviderForId(assetId),
+          image: ImmichRemoteImageProvider(
+            assetId: assetId,
+            isThumbnail: true,
+          ),
          fit: BoxFit.cover,
        ),
      ),
@@ -45,7 +45,7 @@ class AlbumThumbnailCard extends StatelessWidget {
          );
        }

-        buildAlbumThumbnail() => ImmichImage(
+        buildAlbumThumbnail() => ImmichImage.thumbnail(
              album.thumbnail.value,
              width: cardSize,
              height: cardSize,
@@ -16,7 +16,11 @@ class SharedAlbumThumbnailImage extends HookConsumerWidget {
      },
      child: Stack(
        children: [
-          ImmichImage(asset, width: 500, height: 500),
+          ImmichImage.thumbnail(
+            asset,
+            width: 500,
+            height: 500,
+          ),
        ],
      ),
    );
@@ -72,7 +72,7 @@ class SharingPage extends HookConsumerWidget {
              contentPadding: const EdgeInsets.symmetric(horizontal: 12),
              leading: ClipRRect(
                borderRadius: const BorderRadius.all(Radius.circular(8)),
-                child: ImmichImage(
+                child: ImmichImage.thumbnail(
                  album.thumbnail.value,
                  width: 60,
                  height: 60,
@@ -0,0 +1,106 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:ui' as ui;
+
+import 'package:cached_network_image/cached_network_image.dart';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/painting.dart';
+import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+/// The local image provider for an asset
+/// Only viable
+class ImmichLocalImageProvider extends ImageProvider<Asset> {
+  final Asset asset;
+
+  ImmichLocalImageProvider({
+    required this.asset,
+  }) : assert(asset.local != null, 'Only usable when asset.local is set');
+
+  /// Converts an [ImageProvider]'s settings plus an [ImageConfiguration] to a key
+  /// that describes the precise image to load.
+  @override
+  Future<Asset> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(asset);
+  }
+
+  @override
+  ImageStreamCompleter loadImage(Asset key, ImageDecoderCallback decode) {
+    final chunkEvents = StreamController<ImageChunkEvent>();
+    return MultiImageStreamCompleter(
+      codec: _codec(key, decode, chunkEvents),
+      scale: 1.0,
+      chunkEvents: chunkEvents.stream,
+      informationCollector: () sync* {
+        yield ErrorDescription(asset.fileName);
+      },
+    );
+  }
+
+  // Streams in each stage of the image as we ask for it
+  Stream<ui.Codec> _codec(
+    Asset key,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkEvents,
+  ) async* {
+    // Load a small thumbnail
+    final thumbBytes = await asset.local?.thumbnailDataWithSize(
+      const ThumbnailSize.square(256),
+      quality: 80,
+    );
+    if (thumbBytes != null) {
+      final buffer = await ui.ImmutableBuffer.fromUint8List(thumbBytes);
+      final codec = await decode(buffer);
+      yield codec;
+    } else {
+      debugPrint("Loading thumb for ${asset.fileName} failed");
+    }
+
+    if (asset.isImage) {
+      /// Using 2K thumbnail for local iOS image to avoid double swiping issue
+      if (Platform.isIOS) {
+        final largeImageBytes = await asset.local
+            ?.thumbnailDataWithSize(const ThumbnailSize(3840, 2160));
+        if (largeImageBytes == null) {
+          throw StateError(
+            "Loading thumb for local photo ${asset.fileName} failed",
+          );
+        }
+        final buffer = await ui.ImmutableBuffer.fromUint8List(largeImageBytes);
+        final codec = await decode(buffer);
+        yield codec;
+      } else {
+        // Use the original file for Android
+        final File? file = await asset.local?.originFile;
+        if (file == null) {
+          throw StateError("Opening file for asset ${asset.fileName} failed");
+        }
+        try {
+          final buffer = await ui.ImmutableBuffer.fromFilePath(file.path);
+          final codec = await decode(buffer);
+          yield codec;
+        } catch (error) {
+          throw StateError("Loading asset ${asset.fileName} failed");
+        } finally {
+          if (Platform.isIOS) {
+            // Clean up this file
+            await file.delete();
+          }
+        }
+      }
+    }
+
+    chunkEvents.close();
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! ImmichLocalImageProvider) return false;
+    if (identical(this, other)) return true;
+    return asset == other.asset;
+  }
+
+  @override
+  int get hashCode => asset.hashCode;
+}
@@ -0,0 +1,145 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:ui' as ui;
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:openapi/api.dart' as api;
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/painting.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/models/store.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+
+/// Our Image Provider HTTP client to make the request
+final _httpClient = HttpClient()..autoUncompress = false;
+
+/// The remote image provider
+class ImmichRemoteImageProvider extends ImageProvider<String> {
+  /// The [Asset.remoteId] of the asset to fetch
+  final String assetId;
+
+  // If this is a thumbnail, we stop at loading the
+  // smallest version of the remote image
+  final bool isThumbnail;
+
+  ImmichRemoteImageProvider({
+    required this.assetId,
+    this.isThumbnail = false,
+  });
+
+  /// Converts an [ImageProvider]'s settings plus an [ImageConfiguration] to a key
+  /// that describes the precise image to load.
+  @override
+  Future<String> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture('$assetId,$isThumbnail');
+  }
+
+  @override
+  ImageStreamCompleter loadImage(String key, ImageDecoderCallback decode) {
+    final id = key.split(',').first;
+    final chunkEvents = StreamController<ImageChunkEvent>();
+    return MultiImageStreamCompleter(
+      codec: _codec(id, decode, chunkEvents),
+      scale: 1.0,
+      chunkEvents: chunkEvents.stream,
+    );
+  }
+
+  /// Whether to show the original file or load a compressed version
+  bool get _useOriginal => Store.get(
+        AppSettingsEnum.loadOriginal.storeKey,
+        AppSettingsEnum.loadOriginal.defaultValue,
+      );
+
+  /// Whether to load the preview thumbnail first or not
+  bool get _loadPreview => Store.get(
+        AppSettingsEnum.loadPreview.storeKey,
+        AppSettingsEnum.loadPreview.defaultValue,
+      );
+
+  // Streams in each stage of the image as we ask for it
+  Stream<ui.Codec> _codec(
+    String key,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkEvents,
+  ) async* {
+    // Load a preview to the chunk events
+    if (_loadPreview || isThumbnail) {
+      final preview = getThumbnailUrlForRemoteId(
+        assetId,
+        type: api.ThumbnailFormat.WEBP,
+      );
+
+      yield await _loadFromUri(
+        Uri.parse(preview),
+        decode,
+        chunkEvents,
+      );
+    }
+
+    // Guard thumnbail rendering
+    if (isThumbnail) {
+      await chunkEvents.close();
+      return;
+    }
+
+    // Load the higher resolution version of the image
+    final url = getThumbnailUrlForRemoteId(
+      assetId,
+      type: api.ThumbnailFormat.JPEG,
+    );
+    final codec = await _loadFromUri(Uri.parse(url), decode, chunkEvents);
+    yield codec;
+
+    // Load the final remote image
+    if (_useOriginal) {
+      // Load the original image
+      final url = getImageUrlFromId(assetId);
+      final codec = await _loadFromUri(Uri.parse(url), decode, chunkEvents);
+      yield codec;
+    }
+    await chunkEvents.close();
+  }
+
+  // Loads the codec from the URI and sends the events to the [chunkEvents] stream
+  Future<ui.Codec> _loadFromUri(
+    Uri uri,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkEvents,
+  ) async {
+    final request = await _httpClient.getUrl(uri);
+    request.headers.add(
+      'x-immich-user-token',
+      Store.get(StoreKey.accessToken),
+    );
+    final response = await request.close();
+    // Chunks of the completed image can be shown
+    final data = await consolidateHttpClientResponseBytes(
+      response,
+      onBytesReceived: (cumulative, total) {
+        chunkEvents.add(
+          ImageChunkEvent(
+            cumulativeBytesLoaded: cumulative,
+            expectedTotalBytes: total,
+          ),
+        );
+      },
+    );
+
+    // Decode the response
+    final buffer = await ui.ImmutableBuffer.fromUint8List(data);
+    return decode(buffer);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! ImmichRemoteImageProvider) return false;
+    if (identical(this, other)) return true;
+    return assetId == other.assetId;
+  }
+
+  @override
+  int get hashCode => assetId.hashCode;
+}
@@ -0,0 +1,104 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:ui' as ui;
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_image_provider.dart';
+import 'package:openapi/api.dart' as api;
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/painting.dart';
+import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/models/store.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+
+/// The remote image provider
+class ImmichRemoteThumbnailProvider extends ImageProvider<String> {
+  /// The [Asset.remoteId] of the asset to fetch
+  final String assetId;
+
+  /// Our HTTP client to make the request
+  final _httpClient = HttpClient()..autoUncompress = false;
+
+  ImmichRemoteThumbnailProvider({
+    required this.assetId,
+  });
+
+  /// Converts an [ImageProvider]'s settings plus an [ImageConfiguration] to a key
+  /// that describes the precise image to load.
+  @override
+  Future<String> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(assetId);
+  }
+
+  @override
+  ImageStreamCompleter loadImage(String key, ImageDecoderCallback decode) {
+    final chunkEvents = StreamController<ImageChunkEvent>();
+    return MultiImageStreamCompleter(
+      codec: _codec(key, decode, chunkEvents),
+      scale: 1.0,
+      chunkEvents: chunkEvents.stream,
+    );
+  }
+
+  // Streams in each stage of the image as we ask for it
+  Stream<ui.Codec> _codec(
+    String key,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkEvents,
+  ) async* {
+    // Load a preview to the chunk events
+    final preview = getThumbnailUrlForRemoteId(
+      assetId,
+      type: api.ThumbnailFormat.WEBP,
+    );
+
+    yield await _loadFromUri(
+      Uri.parse(preview),
+      decode,
+      chunkEvents,
+    );
+
+    await chunkEvents.close();
+  }
+
+  // Loads the codec from the URI and sends the events to the [chunkEvents] stream
+  Future<ui.Codec> _loadFromUri(
+    Uri uri,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkEvents,
+  ) async {
+    final request = await _httpClient.getUrl(uri);
+    request.headers.add(
+      'x-immich-user-token',
+      Store.get(StoreKey.accessToken),
+    );
+    final response = await request.close();
+    // Chunks of the completed image can be shown
+    final data = await consolidateHttpClientResponseBytes(
+      response,
+      onBytesReceived: (cumulative, total) {
+        chunkEvents.add(
+          ImageChunkEvent(
+            cumulativeBytesLoaded: cumulative,
+            expectedTotalBytes: total,
+          ),
+        );
+      },
+    );
+
+    // Decode the response
+    final buffer = await ui.ImmutableBuffer.fromUint8List(data);
+    return decode(buffer);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! ImmichRemoteImageProvider) return false;
+    if (identical(this, other)) return true;
+    return assetId == other.assetId;
+  }
+
+  @override
+  int get hashCode => assetId.hashCode;
+}
@@ -12,92 +12,85 @@ class AdvancedBottomSheet extends HookConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return SingleChildScrollView(
-      child: Card(
-        shape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(15),
-            topRight: Radius.circular(15),
-          ),
-        ),
-        margin: const EdgeInsets.all(0),
-        child: Container(
-          margin: const EdgeInsets.symmetric(horizontal: 8.0),
-          child: LayoutBuilder(
-            builder: (context, constraints) {
-              // One column
-              return Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  const SizedBox(height: 32.0),
-                  const Align(
-                    child: Text(
-                      "ADVANCED INFO",
-                      style: TextStyle(fontSize: 12.0),
-                    ),
+      child: Container(
+        margin: const EdgeInsets.symmetric(horizontal: 8.0),
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            // One column
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                const Align(
+                  child: Text(
+                    "ADVANCED INFO",
+                    style: TextStyle(fontSize: 12.0),
                  ),
-                  const SizedBox(height: 32.0),
-                  Container(
-                    decoration: BoxDecoration(
-                      color: context.isDarkTheme
-                          ? Colors.grey[900]
-                          : Colors.grey[200],
-                      borderRadius: BorderRadius.circular(15.0),
+                ),
+                const SizedBox(height: 32.0),
+                Container(
+                  decoration: BoxDecoration(
+                    color: context.isDarkTheme
+                        ? Colors.grey[900]
+                        : Colors.grey[200],
+                    borderRadius: BorderRadius.circular(15.0),
+                  ),
+                  child: Padding(
+                    padding: const EdgeInsets.only(
+                      right: 16.0,
+                      left: 16,
+                      top: 8,
+                      bottom: 16,
                    ),
-                    child: Padding(
-                      padding: const EdgeInsets.only(
-                        right: 16.0,
-                        left: 16,
-                        top: 8,
-                        bottom: 16,
-                      ),
-                      child: ListView(
-                        shrinkWrap: true,
-                        children: [
-                          Align(
-                            alignment: Alignment.centerRight,
-                            child: IconButton(
-                              onPressed: () {
-                                Clipboard.setData(
-                                  ClipboardData(text: assetDetail.toString()),
-                                ).then((_) {
-                                  ScaffoldMessenger.of(context).showSnackBar(
-                                    SnackBar(
-                                      content: Text(
-                                        "Copied to clipboard",
-                                        style: context.textTheme.bodyLarge
-                                            ?.copyWith(
-                                          color: context.primaryColor,
-                                        ),
+                    child: ListView(
+                      shrinkWrap: true,
+                      physics: const NeverScrollableScrollPhysics(),
+                      children: [
+                        Align(
+                          alignment: Alignment.centerRight,
+                          child: IconButton(
+                            onPressed: () {
+                              Clipboard.setData(
+                                ClipboardData(
+                                  text: assetDetail.toString(),
+                                ),
+                              ).then((_) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    content: Text(
+                                      "Copied to clipboard",
+                                      style:
+                                          context.textTheme.bodyLarge?.copyWith(
+                                        color: context.primaryColor,
                                      ),
                                    ),
-                                  );
-                                });
-                              },
-                              icon: Icon(
-                                Icons.copy,
-                                size: 16.0,
-                                color: context.primaryColor,
-                              ),
+                                  ),
+                                );
+                              });
+                            },
+                            icon: Icon(
+                              Icons.copy,
+                              size: 16.0,
+                              color: context.primaryColor,
                            ),
                          ),
-                          SelectableText(
-                            assetDetail.toString(),
-                            style: const TextStyle(
-                              fontSize: 12.0,
-                              fontWeight: FontWeight.bold,
-                              fontFamily: "Inconsolata",
-                            ),
-                            showCursor: true,
+                        ),
+                        SelectableText(
+                          assetDetail.toString(),
+                          style: const TextStyle(
+                            fontSize: 12.0,
+                            fontWeight: FontWeight.bold,
+                            fontFamily: "Inconsolata",
                          ),
-                        ],
-                      ),
+                          showCursor: true,
+                        ),
+                      ],
                    ),
                  ),
-                  const SizedBox(height: 32.0),
-                ],
-              );
-            },
-          ),
+                ),
+                const SizedBox(height: 32.0),
+              ],
+            );
+          },
        ),
      ),
    );
@@ -10,7 +10,6 @@ import 'package:immich_mobile/modules/asset_viewer/ui/description_input.dart';
 import 'package:immich_mobile/modules/map/widgets/map_thumbnail.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
-import 'package:immich_mobile/shared/ui/drag_sheet.dart';
 import 'package:immich_mobile/utils/selection_handlers.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
@@ -126,20 +125,6 @@ class ExifBottomSheet extends HookConsumerWidget {
      return text.isNotEmpty ? text : null;
    }

-    buildDragHeader() {
-      return const Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          SizedBox(height: 12),
-          Align(
-            alignment: Alignment.center,
-            child: CustomDraggingHandle(),
-          ),
-          SizedBox(height: 12),
-        ],
-      );
-    }
-
    buildLocation() {
      // Guard no lat/lng
      if (!hasCoordinates()) {
@@ -341,86 +326,69 @@ class ExifBottomSheet extends HookConsumerWidget {
      );
    }

-    return GestureDetector(
-      onTap: () {
-        // FocusScope.of(context).unfocus();
-      },
-      child: SingleChildScrollView(
-        child: Card(
-          shape: const RoundedRectangleBorder(
-            borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(15),
-              topRight: Radius.circular(15),
-            ),
-          ),
-          margin: const EdgeInsets.all(0),
-          child: Container(
-            margin: const EdgeInsets.symmetric(horizontal: 16.0),
-            child: LayoutBuilder(
-              builder: (context, constraints) {
-                if (constraints.maxWidth > 600) {
-                  // Two column
-                  return Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 12.0),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        buildDragHeader(),
-                        buildDate(),
-                        if (asset.isRemote) DescriptionInput(asset: asset),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Flexible(
-                              flex: hasCoordinates() ? 5 : 0,
-                              child: Padding(
-                                padding: const EdgeInsets.only(right: 8.0),
-                                child: buildLocation(),
-                              ),
-                            ),
-                            Flexible(
-                              flex: 5,
-                              child: Padding(
-                                padding: const EdgeInsets.only(left: 8.0),
-                                child: buildDetail(),
-                              ),
-                            ),
-                          ],
+    return SingleChildScrollView(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Container(
+        margin: const EdgeInsets.symmetric(horizontal: 16.0),
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            if (constraints.maxWidth > 600) {
+              // Two column
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  buildDate(),
+                  if (asset.isRemote) DescriptionInput(asset: asset),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        child: Padding(
+                          padding: const EdgeInsets.only(right: 8.0),
+                          child: buildLocation(),
                        ),
-                        const SizedBox(height: 50),
-                      ],
-                    ),
-                  );
-                }
+                      ),
+                      ConstrainedBox(
+                        constraints: const BoxConstraints(maxWidth: 300),
+                        child: Padding(
+                          padding: const EdgeInsets.only(left: 8.0),
+                          child: buildDetail(),
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 50),
+                ],
+              );
+            }

-                // One column
-                return Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [
-                    buildDragHeader(),
-                    buildDate(),
-                    assetWithExif.when(
-                      data: (data) => DescriptionInput(asset: data),
-                      error: (error, stackTrace) => Icon(
-                        Icons.image_not_supported_outlined,
-                        color: context.primaryColor,
-                      ),
-                      loading: () => const SizedBox(
-                        width: 75,
-                        height: 75,
-                        child: CircularProgressIndicator.adaptive(),
-                      ),
-                    ),
-                    buildLocation(),
-                    SizedBox(height: hasCoordinates() ? 16.0 : 6.0),
-                    buildDetail(),
-                    const SizedBox(height: 50),
-                  ],
-                );
-              },
-            ),
-          ),
+            // One column
+            return Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                buildDate(),
+                assetWithExif.when(
+                  data: (data) => DescriptionInput(asset: data),
+                  error: (error, stackTrace) => Icon(
+                    Icons.image_not_supported_outlined,
+                    color: context.primaryColor,
+                  ),
+                  loading: () => const SizedBox(
+                    width: 75,
+                    height: 75,
+                    child: CircularProgressIndicator.adaptive(),
+                  ),
+                ),
+                buildLocation(),
+                SizedBox(height: hasCoordinates() ? 16.0 : 6.0),
+                buildDetail(),
+                const SizedBox(height: 50),
+              ],
+            );
+          },
        ),
      ),
    );
@@ -25,7 +25,6 @@ import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart'
 import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart';
 import 'package:immich_mobile/modules/home/ui/upload_dialog.dart';
 import 'package:immich_mobile/modules/partner/providers/partner.provider.dart';
-import 'package:immich_mobile/shared/cache/original_image_provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/modules/home/ui/delete_dialog.dart';
@@ -41,8 +40,6 @@ import 'package:immich_mobile/shared/ui/photo_view/src/photo_view_scale_state.da
 import 'package:immich_mobile/shared/ui/photo_view/src/utils/photo_view_hero_attributes.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
-import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:isar/isar.dart';
 import 'package:openapi/api.dart' show ThumbnailFormat;

@@ -78,7 +75,6 @@ class GalleryViewerPage extends HookConsumerWidget {
    final isPlayingMotionVideo = useState(false);
    final isPlayingVideo = useState(false);
    Offset? localPosition;
-    final header = {"x-immich-user-token": Store.get(StoreKey.accessToken)};
    final currentIndex = useState(initialIndex);
    final currentAsset = loadAsset(currentIndex.value);
    final isTrashEnabled =
@@ -135,53 +131,19 @@ class GalleryViewerPage extends HookConsumerWidget {
    void toggleFavorite(Asset asset) =>
        ref.read(assetProvider.notifier).toggleFavorite([asset]);

-    /// Original (large) image of a remote asset. Required asset.isRemote
-    ImageProvider remoteOriginalProvider(Asset asset) =>
-        CachedNetworkImageProvider(
-          getImageUrl(asset),
-          cacheKey: getImageCacheKey(asset),
-          headers: header,
-        );
-
-    /// Original (large) image of a local asset. Required asset.isLocal
-    ImageProvider localOriginalProvider(Asset asset) =>
-        OriginalImageProvider(asset);
-
-    ImageProvider finalImageProvider(Asset asset) {
-      if (ImmichImage.useLocal(asset)) {
-        return localOriginalProvider(asset);
-      } else if (isLoadOriginal.value) {
-        return remoteOriginalProvider(asset);
-      } else if (isLoadPreview.value) {
-        return ImmichImage.remoteThumbnailProvider(asset, jpeg, header);
-      }
-      return ImmichImage.remoteThumbnailProvider(asset, webp, header);
-    }
-
-    Iterable<ImageProvider> allImageProviders(Asset asset) sync* {
-      if (ImmichImage.useLocal(asset)) {
-        yield ImmichImage.localImageProvider(asset);
-        yield localOriginalProvider(asset);
-      } else {
-        yield ImmichImage.remoteThumbnailProvider(asset, webp, header);
-        if (isLoadPreview.value) {
-          yield ImmichImage.remoteThumbnailProvider(asset, jpeg, header);
-        }
-        if (isLoadOriginal.value) {
-          yield remoteOriginalProvider(asset);
-        }
-      }
-    }
-
    void precacheNextImage(int index) {
      void onError(Object exception, StackTrace? stackTrace) {
        // swallow error silently
+        debugPrint('Error precaching next image: $exception, $stackTrace');
      }
+
      if (index < totalAssets && index >= 0) {
        final asset = loadAsset(index);
-        for (final imageProvider in allImageProviders(asset)) {
-          precacheImage(imageProvider, context, onError: onError);
-        }
+        precacheImage(
+          ImmichImage.imageProvider(asset: asset),
+          context,
+          onError: onError,
+        );
      }
    }

@@ -191,10 +153,11 @@ class GalleryViewerPage extends HookConsumerWidget {
          borderRadius: BorderRadius.all(Radius.circular(15.0)),
        ),
        barrierColor: Colors.transparent,
-        backgroundColor: Colors.transparent,
        isScrollControlled: true,
-        useSafeArea: true,
+        showDragHandle: true,
+        enableDrag: true,
        context: context,
+        useSafeArea: true,
        builder: (context) {
          return Padding(
            padding: EdgeInsets.only(
@@ -765,6 +728,10 @@ class GalleryViewerPage extends HookConsumerWidget {
                isZoomed.value = state != PhotoViewScaleState.initial;
                ref.read(showControlsProvider.notifier).show = !isZoomed.value;
              },
+              loadingBuilder: (context, event, index) => ImmichImage.thumbnail(
+                asset(),
+                fit: BoxFit.contain,
+              ),
              pageController: controller,
              scrollPhysics: isZoomed.value
                  ? const NeverScrollableScrollPhysics() // Don't allow paging while scrolled in
@@ -781,47 +748,11 @@ class GalleryViewerPage extends HookConsumerWidget {
                stackIndex.value = -1;
                HapticFeedback.selectionClick();
              },
-              loadingBuilder: (context, event, index) {
-                final a = loadAsset(index);
-                if (ImmichImage.useLocal(a)) {
-                  return Image(
-                    image: ImmichImage.localImageProvider(a),
-                    fit: BoxFit.contain,
-                  );
-                }
-                // Use the WEBP Thumbnail as a placeholder for the JPEG thumbnail to achieve
-                // Three-Stage Loading (WEBP -> JPEG -> Original)
-                final webPThumbnail = CachedNetworkImage(
-                  imageUrl: getThumbnailUrl(a, type: webp),
-                  cacheKey: getThumbnailCacheKey(a, type: webp),
-                  httpHeaders: header,
-                  progressIndicatorBuilder: (_, __, ___) => const Center(
-                    child: ImmichLoadingIndicator(),
-                  ),
-                  fadeInDuration: const Duration(milliseconds: 0),
-                  fit: BoxFit.contain,
-                  errorWidget: (context, url, error) =>
-                      const Icon(Icons.image_not_supported_outlined),
-                );
-
-                // loading the preview in the loadingBuilder only
-                // makes sense if the original is loaded in the builder
-                return isLoadPreview.value && isLoadOriginal.value
-                    ? CachedNetworkImage(
-                        imageUrl: getThumbnailUrl(a, type: jpeg),
-                        cacheKey: getThumbnailCacheKey(a, type: jpeg),
-                        httpHeaders: header,
-                        fit: BoxFit.contain,
-                        fadeInDuration: const Duration(milliseconds: 0),
-                        placeholder: (_, __) => webPThumbnail,
-                        errorWidget: (_, __, ___) => webPThumbnail,
-                      )
-                    : webPThumbnail;
-              },
              builder: (context, index) {
                final a =
                    index == currentIndex.value ? asset() : loadAsset(index);
-                final ImageProvider provider = finalImageProvider(a);
+                final ImageProvider provider =
+                    ImmichImage.imageProvider(asset: a);

                if (a.isImage && !isPlayingMotionVideo.value) {
                  return PhotoViewGalleryPageOptions(
@@ -88,7 +88,7 @@ class UploadProfileImageNotifier
    var res = await _userSErvice.uploadProfileImage(file);

    if (res != null) {
-      debugPrint("Succesfully upload profile image");
+      debugPrint("Successfully upload profile image");
      state = state.copyWith(
        status: UploadProfileStatus.success,
        profileImagePath: res.profileImagePath,
@@ -10,6 +10,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/collection_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/scroll_notifier.provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/thumbnail_image.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/thumbnail_placeholder.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';

@@ -127,184 +128,6 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
        assets.firstWhereOrNull((e) => !_selectedAssets.contains(e)) == null;
  }

-  Widget _buildThumbnailOrPlaceholder(Asset asset, int index) {
-    return ThumbnailImage(
-      asset: asset,
-      index: index,
-      loadAsset: widget.renderList.loadAsset,
-      totalAssets: widget.renderList.totalAssets,
-      multiselectEnabled: widget.selectionActive,
-      isSelected: widget.selectionActive && _selectedAssets.contains(asset),
-      onSelect: () => _selectAssets([asset]),
-      onDeselect: widget.canDeselect ||
-              widget.preselectedAssets == null ||
-              !widget.preselectedAssets!.contains(asset)
-          ? () => _deselectAssets([asset])
-          : null,
-      useGrayBoxPlaceholder: true,
-      showStorageIndicator: widget.showStorageIndicator,
-      heroOffset: widget.heroOffset,
-      showStack: widget.showStack,
-    );
-  }
-
-  Widget _buildAssetRow(
-    Key key,
-    BuildContext context,
-    List<Asset> assets,
-    int absoluteOffset,
-    double width,
-  ) {
-    // Default: All assets have the same width
-    final widthDistribution = List.filled(assets.length, 1.0);
-
-    if (widget.dynamicLayout) {
-      final aspectRatios =
-          assets.map((e) => (e.width ?? 1) / (e.height ?? 1)).toList();
-      final meanAspectRatio = aspectRatios.sum / assets.length;
-
-      // 1: mean width
-      // 0.5: width < mean - threshold
-      // 1.5: width > mean + threshold
-      final arConfiguration = aspectRatios.map((e) {
-        if (e - meanAspectRatio > 0.3) return 1.5;
-        if (e - meanAspectRatio < -0.3) return 0.5;
-        return 1.0;
-      });
-
-      // Normalize:
-      final sum = arConfiguration.sum;
-      widthDistribution.setRange(
-        0,
-        widthDistribution.length,
-        arConfiguration.map((e) => (e * assets.length) / sum),
-      );
-    }
-    return Row(
-      key: key,
-      children: assets.mapIndexed((int index, Asset asset) {
-        final bool last = index + 1 == widget.assetsPerRow;
-        return Container(
-          key: ValueKey(index),
-          width: width * widthDistribution[index],
-          height: width,
-          margin: EdgeInsets.only(
-            bottom: widget.margin,
-            right: last ? 0.0 : widget.margin,
-          ),
-          child: _buildThumbnailOrPlaceholder(asset, absoluteOffset + index),
-        );
-      }).toList(),
-    );
-  }
-
-  Widget _buildTitle(
-    BuildContext context,
-    String title,
-    List<Asset> assets,
-  ) {
-    return GroupDividerTitle(
-      text: title,
-      multiselectEnabled: widget.selectionActive,
-      onSelect: () => _selectAssets(assets),
-      onDeselect: () => _deselectAssets(assets),
-      selected: _allAssetsSelected(assets),
-    );
-  }
-
-  Widget _buildMonthTitle(BuildContext context, DateTime date) {
-    final monthFormat = DateTime.now().year == date.year
-        ? DateFormat.MMMM()
-        : DateFormat.yMMMM();
-    final String title = monthFormat.format(date);
-    return Padding(
-      key: Key("month-$title"),
-      padding: const EdgeInsets.only(left: 12.0, top: 24.0),
-      child: Text(
-        title,
-        style: const TextStyle(
-          fontSize: 26,
-          fontWeight: FontWeight.w500,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildPlaceHolderRow(Key key, int num, double width, double height) {
-    return Row(
-      key: key,
-      children: [
-        for (int i = 0; i < num; i++)
-          Container(
-            key: ValueKey(i),
-            width: width,
-            height: height,
-            margin: EdgeInsets.only(
-              bottom: widget.margin,
-              right: i + 1 == num ? 0.0 : widget.margin,
-            ),
-            color: Colors.grey,
-          ),
-      ],
-    );
-  }
-
-  Widget _buildSection(
-    BuildContext context,
-    RenderAssetGridElement section,
-    bool scrolling,
-  ) {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final width = constraints.maxWidth / widget.assetsPerRow -
-            widget.margin * (widget.assetsPerRow - 1) / widget.assetsPerRow;
-        final rows =
-            (section.count + widget.assetsPerRow - 1) ~/ widget.assetsPerRow;
-        final List<Asset> assetsToRender = scrolling
-            ? []
-            : widget.renderList.loadAssets(section.offset, section.count);
-        return Column(
-          key: ValueKey(section.offset),
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (section.type == RenderAssetGridElementType.monthTitle)
-              _buildMonthTitle(context, section.date),
-            if (section.type == RenderAssetGridElementType.groupDividerTitle ||
-                section.type == RenderAssetGridElementType.monthTitle)
-              _buildTitle(
-                context,
-                section.title!,
-                scrolling
-                    ? []
-                    : widget.renderList
-                        .loadAssets(section.offset, section.totalCount),
-              ),
-            for (int i = 0; i < rows; i++)
-              scrolling
-                  ? _buildPlaceHolderRow(
-                      ValueKey(i),
-                      i + 1 == rows
-                          ? section.count - i * widget.assetsPerRow
-                          : widget.assetsPerRow,
-                      width,
-                      width,
-                    )
-                  : _buildAssetRow(
-                      ValueKey(i),
-                      context,
-                      assetsToRender.nestedSlice(
-                        i * widget.assetsPerRow,
-                        min((i + 1) * widget.assetsPerRow, section.count),
-                      ),
-                      section.offset + i * widget.assetsPerRow,
-                      width,
-                    ),
-          ],
-        );
-      },
-    );
-  }
-
  Widget _itemBuilder(BuildContext c, int position) {
    int index = position;
    if (widget.topWidget != null) {
@@ -314,8 +137,23 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
      index--;
    }

-    final item = widget.renderList.elements[index];
-    return _buildSection(c, item, _scrolling);
+    final section = widget.renderList.elements[index];
+    return _Section(
+      showStorageIndicator: widget.showStorageIndicator,
+      selectedAssets: _selectedAssets,
+      selectionActive: widget.selectionActive,
+      section: section,
+      margin: widget.margin,
+      renderList: widget.renderList,
+      assetsPerRow: widget.assetsPerRow,
+      scrolling: _scrolling,
+      dynamicLayout: widget.dynamicLayout,
+      selectAssets: _selectAssets,
+      deselectAssets: _deselectAssets,
+      allAssetsSelected: _allAssetsSelected,
+      showStack: widget.showStack,
+      heroOffset: widget.heroOffset,
+    );
  }

  Text _labelBuilder(int pos) {
@@ -452,7 +290,7 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
        final now = Timeline.now;
        if (now > (_hapticFeedbackTS + feedbackInterval)) {
          _hapticFeedbackTS = now;
-          HapticFeedback.heavyImpact();
+          HapticFeedback.mediumImpact();
        }
      }
    }
@@ -485,3 +323,292 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
    );
  }
 }
+
+/// A single row of all placeholder widgets
+class _PlaceholderRow extends StatelessWidget {
+  final int number;
+  final double width;
+  final double height;
+  final double margin;
+
+  const _PlaceholderRow({
+    super.key,
+    required this.number,
+    required this.width,
+    required this.height,
+    required this.margin,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        for (int i = 0; i < number; i++)
+          ThumbnailPlaceholder(
+            key: ValueKey(i),
+            width: width,
+            height: height,
+            margin: EdgeInsets.only(
+              bottom: margin,
+              right: i + 1 == number ? 0.0 : margin,
+            ),
+          ),
+      ],
+    );
+  }
+}
+
+/// A section for the render grid
+class _Section extends StatelessWidget {
+  final RenderAssetGridElement section;
+  final Set<Asset> selectedAssets;
+  final bool scrolling;
+  final double margin;
+  final int assetsPerRow;
+  final RenderList renderList;
+  final bool selectionActive;
+  final bool dynamicLayout;
+  final Function(List<Asset>) selectAssets;
+  final Function(List<Asset>) deselectAssets;
+  final bool Function(List<Asset>) allAssetsSelected;
+  final bool showStack;
+  final int heroOffset;
+  final bool showStorageIndicator;
+
+  const _Section({
+    required this.section,
+    required this.scrolling,
+    required this.margin,
+    required this.assetsPerRow,
+    required this.renderList,
+    required this.selectionActive,
+    required this.dynamicLayout,
+    required this.selectAssets,
+    required this.deselectAssets,
+    required this.allAssetsSelected,
+    required this.selectedAssets,
+    required this.showStack,
+    required this.heroOffset,
+    required this.showStorageIndicator,
+  });
+
+  @override
+  Widget build(
+    BuildContext context,
+  ) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final width = constraints.maxWidth / assetsPerRow -
+            margin * (assetsPerRow - 1) / assetsPerRow;
+        final rows = (section.count + assetsPerRow - 1) ~/ assetsPerRow;
+        final List<Asset> assetsToRender = scrolling
+            ? []
+            : renderList.loadAssets(section.offset, section.count);
+        return Column(
+          key: ValueKey(section.offset),
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (section.type == RenderAssetGridElementType.monthTitle)
+              _MonthTitle(date: section.date),
+            if (section.type == RenderAssetGridElementType.groupDividerTitle ||
+                section.type == RenderAssetGridElementType.monthTitle)
+              _Title(
+                selectionActive: selectionActive,
+                title: section.title!,
+                assets: scrolling
+                    ? []
+                    : renderList.loadAssets(section.offset, section.totalCount),
+                allAssetsSelected: allAssetsSelected,
+                selectAssets: selectAssets,
+                deselectAssets: deselectAssets,
+              ),
+            for (int i = 0; i < rows; i++)
+              scrolling
+                  ? _PlaceholderRow(
+                      key: ValueKey(i),
+                      number: i + 1 == rows
+                          ? section.count - i * assetsPerRow
+                          : assetsPerRow,
+                      width: width,
+                      height: width,
+                      margin: margin,
+                    )
+                  : _AssetRow(
+                      key: ValueKey(i),
+                      assets: assetsToRender.nestedSlice(
+                        i * assetsPerRow,
+                        min((i + 1) * assetsPerRow, section.count),
+                      ),
+                      absoluteOffset: section.offset + i * assetsPerRow,
+                      width: width,
+                      assetsPerRow: assetsPerRow,
+                      margin: margin,
+                      dynamicLayout: dynamicLayout,
+                      renderList: renderList,
+                      selectedAssets: selectedAssets,
+                      isSelectionActive: selectionActive,
+                      showStack: showStack,
+                      heroOffset: heroOffset,
+                      showStorageIndicator: showStorageIndicator,
+                      selectionActive: selectionActive,
+                      onSelect: (asset) => selectAssets([asset]),
+                      onDeselect: (asset) => deselectAssets([asset]),
+                    ),
+          ],
+        );
+      },
+    );
+  }
+}
+
+/// The month title row for a section
+class _MonthTitle extends StatelessWidget {
+  final DateTime date;
+
+  const _MonthTitle({
+    required this.date,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final monthFormat = DateTime.now().year == date.year
+        ? DateFormat.MMMM()
+        : DateFormat.yMMMM();
+    final String title = monthFormat.format(date);
+    return Padding(
+      key: Key("month-$title"),
+      padding: const EdgeInsets.only(left: 12.0, top: 24.0),
+      child: Text(
+        title,
+        style: const TextStyle(
+          fontSize: 26,
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+    );
+  }
+}
+
+/// A title row
+class _Title extends StatelessWidget {
+  final String title;
+  final List<Asset> assets;
+  final bool selectionActive;
+  final Function(List<Asset>) selectAssets;
+  final Function(List<Asset>) deselectAssets;
+  final Function(List<Asset>) allAssetsSelected;
+
+  const _Title({
+    required this.title,
+    required this.assets,
+    required this.selectionActive,
+    required this.selectAssets,
+    required this.deselectAssets,
+    required this.allAssetsSelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GroupDividerTitle(
+      text: title,
+      multiselectEnabled: selectionActive,
+      onSelect: () => selectAssets(assets),
+      onDeselect: () => deselectAssets(assets),
+      selected: allAssetsSelected(assets),
+    );
+  }
+}
+
+/// The row of assets
+class _AssetRow extends StatelessWidget {
+  final List<Asset> assets;
+  final Set<Asset> selectedAssets;
+  final int absoluteOffset;
+  final double width;
+  final bool dynamicLayout;
+  final double margin;
+  final int assetsPerRow;
+  final RenderList renderList;
+  final bool selectionActive;
+  final bool showStorageIndicator;
+  final int heroOffset;
+  final bool showStack;
+  final Function(Asset)? onSelect;
+  final Function(Asset)? onDeselect;
+  final bool isSelectionActive;
+
+  const _AssetRow({
+    super.key,
+    required this.assets,
+    required this.absoluteOffset,
+    required this.width,
+    required this.dynamicLayout,
+    required this.margin,
+    required this.assetsPerRow,
+    required this.renderList,
+    required this.selectionActive,
+    required this.showStorageIndicator,
+    required this.heroOffset,
+    required this.showStack,
+    required this.isSelectionActive,
+    required this.selectedAssets,
+    this.onSelect,
+    this.onDeselect,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // Default: All assets have the same width
+    final widthDistribution = List.filled(assets.length, 1.0);
+
+    if (dynamicLayout) {
+      final aspectRatios =
+          assets.map((e) => (e.width ?? 1) / (e.height ?? 1)).toList();
+      final meanAspectRatio = aspectRatios.sum / assets.length;
+
+      // 1: mean width
+      // 0.5: width < mean - threshold
+      // 1.5: width > mean + threshold
+      final arConfiguration = aspectRatios.map((e) {
+        if (e - meanAspectRatio > 0.3) return 1.5;
+        if (e - meanAspectRatio < -0.3) return 0.5;
+        return 1.0;
+      });
+
+      // Normalize:
+      final sum = arConfiguration.sum;
+      widthDistribution.setRange(
+        0,
+        widthDistribution.length,
+        arConfiguration.map((e) => (e * assets.length) / sum),
+      );
+    }
+    return Row(
+      key: key,
+      children: assets.mapIndexed((int index, Asset asset) {
+        final bool last = index + 1 == assetsPerRow;
+        return Container(
+          width: width * widthDistribution[index],
+          height: width,
+          margin: EdgeInsets.only(
+            bottom: margin,
+            right: last ? 0.0 : margin,
+          ),
+          child: ThumbnailImage(
+            asset: asset,
+            index: absoluteOffset + index,
+            loadAsset: renderList.loadAsset,
+            totalAssets: renderList.totalAssets,
+            multiselectEnabled: selectionActive,
+            isSelected: isSelectionActive && selectedAssets.contains(asset),
+            onSelect: () => onSelect?.call(asset),
+            onDeselect: () => onDeselect?.call(asset),
+            showStorageIndicator: showStorageIndicator,
+            heroOffset: heroOffset,
+            showStack: showStack,
+          ),
+        );
+      }).toList(),
+    );
+  }
+}
@@ -15,7 +15,6 @@ class ThumbnailImage extends StatelessWidget {
  final int totalAssets;
  final bool showStorageIndicator;
  final bool showStack;
-  final bool useGrayBoxPlaceholder;
  final bool isSelected;
  final bool multiselectEnabled;
  final Function? onSelect;
@@ -30,7 +29,6 @@ class ThumbnailImage extends StatelessWidget {
    required this.totalAssets,
    this.showStorageIndicator = true,
    this.showStack = false,
-    this.useGrayBoxPlaceholder = false,
    this.isSelected = false,
    this.multiselectEnabled = false,
    this.onDeselect,
@@ -136,10 +134,10 @@ class ThumbnailImage extends StatelessWidget {
          tag: isFromDto
              ? '${asset.remoteId}-$heroOffset'
              : asset.id + heroOffset,
-          child: ImmichImage(
+          child: ImmichImage.thumbnail(
            asset,
-            useGrayBoxPlaceholder: useGrayBoxPlaceholder,
-            fit: BoxFit.cover,
+            height: 300,
+            width: 300,
          ),
        ),
      );
@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+
+class ThumbnailPlaceholder extends StatelessWidget {
+  final EdgeInsets margin;
+  final double width;
+  final double height;
+
+  const ThumbnailPlaceholder({
+    super.key,
+    this.margin = EdgeInsets.zero,
+    this.width = 250,
+    this.height = 250,
+  });
+
+  static const _brightColors = [
+    Color(0xFFF1F3F4),
+    Color(0xFFB4B6B8),
+  ];
+
+  static const _darkColors = [
+    Color(0xFF3B3F42),
+    Color(0xFF2B2F32),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: width,
+      height: height,
+      margin: margin,
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          colors: context.isDarkTheme ? _darkColors : _brightColors,
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+        ),
+      ),
+    );
+  }
+}
@@ -125,6 +125,19 @@ class ControlBottomAppBar extends ConsumerWidget {
                .tr(),
            onPressed: enabled ? onFavorite : null,
          ),
+        if (hasLocal && hasRemote && onDelete != null)
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 90),
+            child: ControlBoxButton(
+              iconData: Icons.delete_sweep_outlined,
+              label: "control_bottom_app_bar_delete".tr(),
+              onPressed: enabled
+                  ? () => handleRemoteDelete(!trashEnabled, onDelete!)
+                  : null,
+              onLongPressed:
+                  enabled ? () => showForceDeleteDialog(onDelete!) : null,
+            ),
+          ),
        if (hasRemote && onDeleteServer != null)
          ConstrainedBox(
            constraints: const BoxConstraints(maxWidth: 85),
@@ -172,44 +185,43 @@ class ControlBottomAppBar extends ConsumerWidget {
                  : null,
            ),
          ),
-        if (hasLocal && hasRemote && onDelete != null)
+        if (hasRemote && onEditTime != null)
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 95),
+            child: ControlBoxButton(
+              iconData: Icons.edit_calendar_outlined,
+              label: "control_bottom_app_bar_edit_time".tr(),
+              onPressed: enabled ? onEditTime : null,
+            ),
+          ),
+        if (hasRemote && onEditLocation != null)
          ConstrainedBox(
            constraints: const BoxConstraints(maxWidth: 90),
            child: ControlBoxButton(
-              iconData: Icons.delete_sweep_outlined,
-              label: "control_bottom_app_bar_delete".tr(),
-              onPressed: enabled
-                  ? () => handleRemoteDelete(!trashEnabled, onDelete!)
-                  : null,
-              onLongPressed:
-                  enabled ? () => showForceDeleteDialog(onDelete!) : null,
+              iconData: Icons.edit_location_alt_outlined,
+              label: "control_bottom_app_bar_edit_location".tr(),
+              onPressed: enabled ? onEditLocation : null,
            ),
          ),
-        if (hasRemote && onEditTime != null)
-          ControlBoxButton(
-            iconData: Icons.edit_calendar_outlined,
-            label: "control_bottom_app_bar_edit_time".tr(),
-            onPressed: enabled ? onEditTime : null,
-          ),
-        if (hasRemote && onEditLocation != null)
-          ControlBoxButton(
-            iconData: Icons.edit_location_alt_outlined,
-            label: "control_bottom_app_bar_edit_location".tr(),
-            onPressed: enabled ? onEditLocation : null,
-          ),
        if (!selectionAssetState.hasLocal &&
            selectionAssetState.selectedCount > 1 &&
            onStack != null)
-          ControlBoxButton(
-            iconData: Icons.filter_none_rounded,
-            label: "control_bottom_app_bar_stack".tr(),
-            onPressed: enabled ? onStack : null,
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 90),
+            child: ControlBoxButton(
+              iconData: Icons.filter_none_rounded,
+              label: "control_bottom_app_bar_stack".tr(),
+              onPressed: enabled ? onStack : null,
+            ),
          ),
        if (onRemoveFromAlbum != null)
-          ControlBoxButton(
-            iconData: Icons.delete_sweep_rounded,
-            label: 'album_viewer_appbar_share_remove'.tr(),
-            onPressed: enabled ? onRemoveFromAlbum : null,
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 90),
+            child: ControlBoxButton(
+              iconData: Icons.delete_sweep_rounded,
+              label: 'album_viewer_appbar_share_remove'.tr(),
+              onPressed: enabled ? onRemoveFromAlbum : null,
+            ),
          ),
        if (selectionAssetState.hasLocal)
          ControlBoxButton(
@@ -230,9 +242,9 @@ class ControlBottomAppBar extends ConsumerWidget {
    }

    return DraggableScrollableSheet(
-      initialChildSize: hasRemote ? 0.30 : bottomPadding,
+      initialChildSize: hasRemote ? 0.35 : bottomPadding,
      minChildSize: bottomPadding,
-      maxChildSize: hasRemote ? 0.60 : bottomPadding,
+      maxChildSize: hasRemote ? 0.65 : bottomPadding,
      snap: true,
      builder: (
        BuildContext context,
@@ -257,9 +269,9 @@ class ControlBottomAppBar extends ConsumerWidget {
                  children: <Widget>[
                    const SizedBox(height: 12),
                    const CustomDraggingHandle(),
-                    const SizedBox(height: 24),
+                    const SizedBox(height: 12),
                    SizedBox(
-                      height: 90,
+                      height: 100,
                      child: ListView(
                        shrinkWrap: true,
                        scrollDirection: Axis.horizontal,
@@ -1,14 +1,11 @@
 import 'dart:ui';

-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
-import 'package:openapi/api.dart';

 class MemoryCard extends StatelessWidget {
  final Asset asset;
@@ -45,14 +42,9 @@ class MemoryCard extends StatelessWidget {
            child: Container(
              decoration: BoxDecoration(
                image: DecorationImage(
-                  image: CachedNetworkImageProvider(
-                    getThumbnailUrl(
-                      asset,
-                    ),
-                    cacheKey: getThumbnailCacheKey(
-                      asset,
-                    ),
-                    headers: {"x-immich-user-token": accessToken},
+                  image: ImmichImage.imageProvider(
+                    asset: asset,
+                    isThumbnail: true,
                  ),
                  fit: BoxFit.cover,
                ),
@@ -84,8 +76,6 @@ class MemoryCard extends StatelessWidget {
                    fit: fit,
                    height: double.infinity,
                    width: double.infinity,
-                    type: ThumbnailFormat.JPEG,
-                    preferredLocalAssetSize: 2048,
                  ),
                );
              } else {
@@ -97,8 +87,6 @@ class MemoryCard extends StatelessWidget {
                    placeholder: ImmichImage(
                      asset,
                      fit: fit,
-                      type: ThumbnailFormat.JPEG,
-                      preferredLocalAssetSize: 2048,
                    ),
                    hideControlsTimer: const Duration(seconds: 2),
                    onVideoEnded: onVideoEnded,
@@ -2,10 +2,10 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/thumbnail_placeholder.dart';
 import 'package:immich_mobile/modules/memories/providers/memory.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
-import 'package:openapi/api.dart';

 class MemoryLane extends HookConsumerWidget {
  const MemoryLane({super.key});
@@ -61,8 +61,10 @@ class MemoryLane extends HookConsumerWidget {
                                    fit: BoxFit.cover,
                                    width: 130,
                                    height: 200,
-                                    useGrayBoxPlaceholder: true,
-                                    type: ThumbnailFormat.JPEG,
+                                    placeholder: const ThumbnailPlaceholder(
+                                      width: 130,
+                                      height: 200,
+                                    ),
                                  ),
                                ),
                              ),
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/immich_colors.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';

 class MemoryProgressIndicator extends StatelessWidget {
  /// The number of ticks in the progress indicator
@@ -39,9 +38,9 @@ class MemoryProgressIndicator extends StatelessWidget {
                    decoration: BoxDecoration(
                      border: i == 0
                          ? null
-                          : Border(
+                          : const Border(
                              left: BorderSide(
-                                color: context.colorScheme.onSecondaryContainer,
+                                color: Colors.black,
                                width: 1,
                              ),
                            ),
@@ -10,7 +10,6 @@ import 'package:immich_mobile/modules/memories/ui/memory_epilogue.dart';
 import 'package:immich_mobile/modules/memories/ui/memory_progress_indicator.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
-import 'package:openapi/api.dart' as api;

@RoutePage()
 class MemoryPage extends HookConsumerWidget {
@@ -113,23 +112,21 @@ class MemoryPage extends HookConsumerWidget {
      // Gets the thumbnail url and precaches it
      final precaches = <Future<dynamic>>[];

-      precaches.add(
-        ImmichImage.precacheAsset(
-          asset,
+      precaches.addAll([
+        precacheImage(
+          ImmichImage.imageProvider(
+            asset: asset,
+          ),
          context,
-          type: api.ThumbnailFormat.WEBP,
-          size: 2048,
        ),
-      );
-      precaches.add(
-        ImmichImage.precacheAsset(
-          asset,
+        precacheImage(
+          ImmichImage.imageProvider(
+            asset: asset,
+            isThumbnail: true,
+          ),
          context,
-          type: api.ThumbnailFormat.JPEG,
-          size: 2048,
        ),
-      );
-
+      ]);
      await Future.wait(precaches);
    }

@@ -354,6 +354,9 @@ abstract class _$AppRouter extends RootStackRouter {
          onPlaying: args.onPlaying,
          onPaused: args.onPaused,
          placeholder: args.placeholder,
+          showControls: args.showControls,
+          hideControlsTimer: args.hideControlsTimer,
+          showDownloadingIndicator: args.showDownloadingIndicator,
        ),
      );
    },
@@ -1384,11 +1387,14 @@ class VideoViewerRoute extends PageRouteInfo<VideoViewerRouteArgs> {
  VideoViewerRoute({
    Key? key,
    required Asset asset,
-    required bool isMotionVideo,
-    required void Function() onVideoEnded,
+    bool isMotionVideo = false,
+    void Function()? onVideoEnded,
    void Function()? onPlaying,
    void Function()? onPaused,
    Widget? placeholder,
+    bool showControls = true,
+    Duration hideControlsTimer = const Duration(seconds: 5),
+    bool showDownloadingIndicator = true,
    List<PageRouteInfo>? children,
  }) : super(
          VideoViewerRoute.name,
@@ -1400,6 +1406,9 @@ class VideoViewerRoute extends PageRouteInfo<VideoViewerRouteArgs> {
            onPlaying: onPlaying,
            onPaused: onPaused,
            placeholder: placeholder,
+            showControls: showControls,
+            hideControlsTimer: hideControlsTimer,
+            showDownloadingIndicator: showDownloadingIndicator,
          ),
          initialChildren: children,
        );
@@ -1414,11 +1423,14 @@ class VideoViewerRouteArgs {
  const VideoViewerRouteArgs({
    this.key,
    required this.asset,
-    required this.isMotionVideo,
-    required this.onVideoEnded,
+    this.isMotionVideo = false,
+    this.onVideoEnded,
    this.onPlaying,
    this.onPaused,
    this.placeholder,
+    this.showControls = true,
+    this.hideControlsTimer = const Duration(seconds: 5),
+    this.showDownloadingIndicator = true,
  });

  final Key? key;
@@ -1427,7 +1439,7 @@ class VideoViewerRouteArgs {

  final bool isMotionVideo;

-  final void Function() onVideoEnded;
+  final void Function()? onVideoEnded;

  final void Function()? onPlaying;

@@ -1435,8 +1447,14 @@ class VideoViewerRouteArgs {

  final Widget? placeholder;

+  final bool showControls;
+
+  final Duration hideControlsTimer;
+
+  final bool showDownloadingIndicator;
+
  @override
  String toString() {
-    return 'VideoViewerRouteArgs{key: $key, asset: $asset, isMotionVideo: $isMotionVideo, onVideoEnded: $onVideoEnded, onPlaying: $onPlaying, onPaused: $onPaused, placeholder: $placeholder}';
+    return 'VideoViewerRouteArgs{key: $key, asset: $asset, isMotionVideo: $isMotionVideo, onVideoEnded: $onVideoEnded, onPlaying: $onPlaying, onPaused: $onPaused, placeholder: $placeholder, showControls: $showControls, hideControlsTimer: $hideControlsTimer, showDownloadingIndicator: $showDownloadingIndicator}';
  }
 }
@@ -1,6 +1,5 @@
 import 'package:flutter/painting.dart';
-
-import 'original_image_provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_local_image_provider.dart';

 /// [ImageCache] that uses two caches for small and large images
 /// so that a single large image does not evict all small iamges
@@ -34,7 +33,7 @@ final class CustomImageCache implements ImageCache {

  @override
  bool containsKey(Object key) =>
-      (key is OriginalImageProvider ? _large : _small).containsKey(key);
+      (key is ImmichLocalImageProvider ? _large : _small).containsKey(key);

  @override
  int get currentSize => _small.currentSize + _large.currentSize;
@@ -44,7 +43,7 @@ final class CustomImageCache implements ImageCache {

  @override
  bool evict(Object key, {bool includeLive = true}) =>
-      (key is OriginalImageProvider ? _large : _small)
+      (key is ImmichLocalImageProvider ? _large : _small)
          .evict(key, includeLive: includeLive);

  @override
@@ -60,10 +59,10 @@ final class CustomImageCache implements ImageCache {
    ImageStreamCompleter Function() loader, {
    ImageErrorListener? onError,
  }) =>
-      (key is OriginalImageProvider ? _large : _small)
+      (key is ImmichLocalImageProvider ? _large : _small)
          .putIfAbsent(key, loader, onError: onError);

  @override
  ImageCacheStatus statusForKey(Object key) =>
-      (key is OriginalImageProvider ? _large : _small).statusForKey(key);
+      (key is ImmichLocalImageProvider ? _large : _small).statusForKey(key);
 }
@@ -1,73 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:ui' as ui;
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-
-/// Loads the original image for local assets
-@immutable
-final class OriginalImageProvider extends ImageProvider<OriginalImageProvider> {
-  final Asset asset;
-
-  const OriginalImageProvider(this.asset);
-
-  @override
-  Future<OriginalImageProvider> obtainKey(ImageConfiguration configuration) =>
-      SynchronousFuture<OriginalImageProvider>(this);
-
-  @override
-  ImageStreamCompleter loadImage(
-    OriginalImageProvider key,
-    ImageDecoderCallback decode,
-  ) =>
-      MultiFrameImageStreamCompleter(
-        codec: _loadAsync(key, decode),
-        scale: 1.0,
-        informationCollector: () sync* {
-          yield ErrorDescription(asset.fileName);
-        },
-      );
-
-  Future<ui.Codec> _loadAsync(
-    OriginalImageProvider key,
-    ImageDecoderCallback decode,
-  ) async {
-    final ui.ImmutableBuffer buffer;
-    if (asset.isImage) {
-      final File? file = await asset.local?.originFile;
-      if (file == null) {
-        throw StateError("Opening file for asset ${asset.fileName} failed");
-      }
-      try {
-        buffer = await ui.ImmutableBuffer.fromFilePath(file.path);
-      } catch (error) {
-        throw StateError("Loading asset ${asset.fileName} failed");
-      }
-    } else {
-      final thumbBytes = await asset.local?.thumbnailData;
-      if (thumbBytes == null) {
-        throw StateError("Loading thumb for video ${asset.fileName} failed");
-      }
-      buffer = await ui.ImmutableBuffer.fromUint8List(thumbBytes);
-    }
-    try {
-      final codec = await decode(buffer);
-      debugPrint("Decoded image ${asset.fileName}");
-      return codec;
-    } catch (error) {
-      throw StateError("Decoding asset ${asset.fileName} failed");
-    }
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! OriginalImageProvider) return false;
-    if (identical(this, other)) return true;
-    return asset == other.asset;
-  }
-
-  @override
-  int get hashCode => asset.hashCode;
-}
@@ -437,17 +437,17 @@ class Asset {
  "remoteId": "${remoteId ?? "N/A"}",
  "localId": "${localId ?? "N/A"}",
  "checksum": "$checksum",
-  "ownerId": $ownerId, 
+  "ownerId": $ownerId,
  "livePhotoVideoId": "${livePhotoVideoId ?? "N/A"}",
  "stackCount": "$stackCount",
  "stackParentId": "${stackParentId ?? "N/A"}",
  "fileCreatedAt": "$fileCreatedAt",
-  "fileModifiedAt": "$fileModifiedAt", 
-  "updatedAt": "$updatedAt", 
-  "durationInSeconds": $durationInSeconds, 
+  "fileModifiedAt": "$fileModifiedAt",
+  "updatedAt": "$updatedAt",
+  "durationInSeconds": $durationInSeconds,
  "type": "$type",
-  "fileName": "$fileName", 
-  "isFavorite": $isFavorite, 
+  "fileName": "$fileName",
+  "isFavorite": $isFavorite,
  "isRemote": $isRemote,
  "storage": "$storage",
  "width": ${width ?? "N/A"},
@@ -110,7 +110,8 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
        final endpoint = Uri.parse(Store.get(StoreKey.serverEndpoint));
        final headers = {"x-immich-user-token": accessToken};
        if (endpoint.userInfo.isNotEmpty) {
-          headers["Authorization"] = "Basic ${base64.encode(utf8.encode(endpoint.userInfo))}";
+          headers["Authorization"] =
+              "Basic ${base64.encode(utf8.encode(endpoint.userInfo))}";
        }

        debugPrint("Attempting to connect to websocket");
@@ -161,6 +162,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
        socket.on('on_asset_trash', _handleServerUpdates);
        socket.on('on_asset_restore', _handleServerUpdates);
        socket.on('on_asset_update', _handleServerUpdates);
+        socket.on('on_asset_stack_update', _handleServerUpdates);
        socket.on('on_asset_hidden', _handleOnAssetHidden);
        socket.on('on_new_release', _handleReleaseUpdates);
      } catch (e) {
@@ -63,7 +63,7 @@ class AssetService {

  /// Returns `null` if the server state did not change, else list of assets
  Future<List<Asset>?> _getRemoteAssets(User user) async {
-    const int chunkSize = 5000;
+    const int chunkSize = 10000;
    try {
      final DateTime now = DateTime.now().toUtc();
      final List<Asset> allAssets = [];
@@ -27,7 +27,12 @@ class ShareService {
      final downloadedXFiles = <XFile>[];

      for (var asset in assets) {
-        if (asset.isRemote) {
+        if (asset.isLocal) {
+          // Prefer local assets to share
+          File? f = await asset.local!.file;
+          downloadedXFiles.add(XFile(f!.path));
+        } else if (asset.isRemote) {
+          // Download remote asset otherwise
          final tempDir = await getTemporaryDirectory();
          final fileName = asset.fileName;
          final tempFile = await File('${tempDir.path}/$fileName').create();
@@ -43,9 +48,6 @@ class ShareService {

          tempFile.writeAsBytesSync(res.bodyBytes);
          downloadedXFiles.add(XFile(tempFile.path));
-        } else {
-          File? f = await asset.local!.file;
-          downloadedXFiles.add(XFile(f!.path));
        }
      }

@@ -1,40 +1,109 @@
-import 'package:cached_network_image/cached_network_image.dart';
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_local_image_provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_image_provider.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/thumbnail_placeholder.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/store.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
+import 'package:octo_image/octo_image.dart';
 import 'package:photo_manager/photo_manager.dart';
-import 'package:openapi/api.dart' as api;
 import 'package:photo_manager_image_provider/photo_manager_image_provider.dart';

-/// Renders an Asset using local data if available, else remote data
 class ImmichImage extends StatelessWidget {
  const ImmichImage(
    this.asset, {
    this.width,
    this.height,
    this.fit = BoxFit.cover,
-    this.useGrayBoxPlaceholder = false,
-    this.useProgressIndicator = false,
-    this.type = api.ThumbnailFormat.WEBP,
-    this.preferredLocalAssetSize = 250,
+    this.placeholder = const ThumbnailPlaceholder(),
+    this.isThumbnail = false,
+    this.thumbnailSize = 250,
    super.key,
  });
+
  final Asset? asset;
-  final bool useGrayBoxPlaceholder;
-  final bool useProgressIndicator;
+  final Widget? placeholder;
  final double? width;
  final double? height;
  final BoxFit fit;
-  final api.ThumbnailFormat type;
-  final int preferredLocalAssetSize;
+  final bool isThumbnail;
+  final int thumbnailSize;

+  /// Factory constructor to use the thumbnail variant
+  factory ImmichImage.thumbnail(
+    Asset? asset, {
+    BoxFit fit = BoxFit.cover,
+    double? width,
+    double? height,
+  }) {
+    // Use the width and height to derive thumbnail size
+    final thumbnailSize = max(width ?? 250, height ?? 250).toInt();
+
+    return ImmichImage(
+      asset,
+      isThumbnail: true,
+      fit: fit,
+      width: width,
+      height: height,
+      placeholder: ThumbnailPlaceholder(
+        height: thumbnailSize.toDouble(),
+        width: thumbnailSize.toDouble(),
+      ),
+      thumbnailSize: thumbnailSize,
+    );
+  }
+
+  // Helper function to return the image provider for the asset
+  // either by using the asset ID or the asset itself
+  /// [asset] is the Asset to request, or else use [assetId] to get a remote
+  /// image provider
+  /// Use [isThumbnail] and [thumbnailSize] if you'd like to request a thumbnail
+  /// The size of the square thumbnail to request. Ignored if isThumbnail
+  /// is not true
+  static ImageProvider imageProvider({
+    Asset? asset,
+    String? assetId,
+    bool isThumbnail = false,
+    int thumbnailSize = 250,
+  }) {
+    if (asset == null && assetId == null) {
+      throw Exception('Must supply either asset or assetId');
+    }
+
+    if (asset == null) {
+      return ImmichRemoteImageProvider(
+        assetId: assetId!,
+        isThumbnail: isThumbnail,
+      );
+    }
+
+    if (useLocal(asset) && isThumbnail) {
+      return AssetEntityImageProvider(
+        asset.local!,
+        isOriginal: false,
+        thumbnailSize: ThumbnailSize.square(thumbnailSize),
+      );
+    } else if (useLocal(asset) && !isThumbnail) {
+      return ImmichLocalImageProvider(
+        asset: asset,
+      );
+    } else {
+      return ImmichRemoteImageProvider(
+        assetId: asset.remoteId!,
+        isThumbnail: isThumbnail,
+      );
+    }
+  }
+
+  static bool useLocal(Asset asset) =>
+      !asset.isRemote ||
+      asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false);
  @override
  Widget build(BuildContext context) {
-    if (this.asset == null) {
+    if (asset == null) {
      return Container(
        decoration: const BoxDecoration(
          color: Colors.grey,
@@ -48,96 +117,35 @@ class ImmichImage extends StatelessWidget {
        ),
      );
    }
-    final Asset asset = this.asset!;
-    if (useLocal(asset)) {
-      return Image(
-        image: localImageProvider(asset, size: preferredLocalAssetSize),
-        width: width,
-        height: height,
-        fit: fit,
-        frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
-          if (wasSynchronouslyLoaded || frame != null) {
-            return child;
-          }

-          // Show loading if desired
-          return Stack(
-            children: [
-              if (useGrayBoxPlaceholder)
-                const SizedBox.square(
-                  dimension: 250,
-                  child: DecoratedBox(
-                    decoration: BoxDecoration(color: Colors.grey),
-                  ),
-                ),
-              if (useProgressIndicator)
-                const Center(
-                  child: CircularProgressIndicator(),
-                ),
-            ],
-          );
-        },
-        errorBuilder: (context, error, stackTrace) {
-          if (error is PlatformException &&
-              error.code == "The asset not found!") {
-            debugPrint(
-              "Asset ${asset.localId} does not exist anymore on device!",
-            );
-          } else {
-            debugPrint(
-              "Error getting thumb for assetId=${asset.localId}: $error",
-            );
-          }
-          return Icon(
-            Icons.image_not_supported_outlined,
-            color: context.primaryColor,
-          );
-        },
-      );
-    }
-    final String? accessToken = Store.get(StoreKey.accessToken);
-    final String thumbnailRequestUrl = getThumbnailUrl(asset, type: type);
-    return CachedNetworkImage(
-      imageUrl: thumbnailRequestUrl,
-      httpHeaders: {"x-immich-user-token": accessToken ?? ""},
-      cacheKey: getThumbnailCacheKey(asset, type: type),
+    return OctoImage(
+      fadeInDuration: const Duration(milliseconds: 0),
+      fadeOutDuration: const Duration(milliseconds: 200),
+      placeholderBuilder: (context) {
+        if (placeholder != null) {
+          // Use the gray box placeholder
+          return placeholder!;
+        }
+        // No placeholder
+        return const SizedBox();
+      },
+      image: ImmichImage.imageProvider(
+        asset: asset,
+        isThumbnail: isThumbnail,
+      ),
      width: width,
      height: height,
-      // keeping memCacheWidth, memCacheHeight, maxWidthDiskCache and
-      // maxHeightDiskCache = null allows to simply store the webp thumbnail
-      // from the server and use it for all rendered thumbnail sizes
      fit: fit,
-      fadeInDuration: const Duration(milliseconds: 250),
-      progressIndicatorBuilder: (context, url, downloadProgress) {
-        // Show loading if desired
-        return Stack(
-          children: [
-            if (useGrayBoxPlaceholder)
-              const SizedBox.square(
-                dimension: 250,
-                child: DecoratedBox(
-                  decoration: BoxDecoration(color: Colors.grey),
-                ),
-              ),
-            if (useProgressIndicator)
-              Transform.scale(
-                scale: 2,
-                child: Center(
-                  child: CircularProgressIndicator.adaptive(
-                    strokeWidth: 1,
-                    value: downloadProgress.progress,
-                  ),
-                ),
-              ),
-          ],
-        );
-      },
-      errorWidget: (context, url, error) {
-        if (error is HttpExceptionWithStatus &&
-            error.statusCode >= 400 &&
-            error.statusCode < 500) {
-          debugPrint("Evicting thumbnail '$url' from cache: $error");
-          CachedNetworkImage.evictFromCache(url);
+      errorBuilder: (context, error, stackTrace) {
+        if (error is PlatformException &&
+            error.code == "The asset not found!") {
+          debugPrint(
+            "Asset ${asset?.localId} does not exist anymore on device!",
+          );
+        } else {
+          debugPrint(
+            "Error getting thumb for assetId=${asset?.localId}: $error",
+          );
        }
        return Icon(
          Icons.image_not_supported_outlined,
@@ -146,65 +154,4 @@ class ImmichImage extends StatelessWidget {
      },
    );
  }
-
-  static AssetEntityImageProvider localImageProvider(
-    Asset asset, {
-    int size = 250,
-  }) =>
-      AssetEntityImageProvider(
-        asset.local!,
-        isOriginal: false,
-        thumbnailSize: ThumbnailSize.square(size),
-      );
-
-  static CachedNetworkImageProvider remoteThumbnailProvider(
-    Asset asset,
-    api.ThumbnailFormat type,
-    Map<String, String> authHeader,
-  ) =>
-      CachedNetworkImageProvider(
-        getThumbnailUrl(asset, type: type),
-        cacheKey: getThumbnailCacheKey(asset, type: type),
-        headers: authHeader,
-      );
-
-  /// TODO: refactor image providers to separate class
-  static CachedNetworkImageProvider remoteThumbnailProviderForId(
-    String assetId, {
-    api.ThumbnailFormat type = api.ThumbnailFormat.WEBP,
-  }) =>
-      CachedNetworkImageProvider(
-        getThumbnailUrlForRemoteId(assetId, type: type),
-        cacheKey: getThumbnailCacheKeyForRemoteId(assetId, type: type),
-        headers: {
-          "x-immich-user-token": Store.get(StoreKey.accessToken),
-        },
-      );
-
-  /// Precaches this asset for instant load the next time it is shown
-  static Future<void> precacheAsset(
-    Asset asset,
-    BuildContext context, {
-    type = api.ThumbnailFormat.WEBP,
-    size = 250,
-  }) {
-    if (useLocal(asset)) {
-      // Precache the local image
-      return precacheImage(
-        localImageProvider(asset, size: size),
-        context,
-      );
-    } else {
-      final accessToken = Store.get(StoreKey.accessToken);
-      // Precache the remote image since we are not using local images
-      return precacheImage(
-        remoteThumbnailProvider(asset, type, {"x-immich-user-token": accessToken}),
-        context,
-      );
-    }
-  }
-
-  static bool useLocal(Asset asset) =>
-      !asset.isRemote ||
-      asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false);
 }
@@ -56,7 +56,11 @@ String getAlbumThumbNailCacheKey(
 }

 String getImageUrl(final Asset asset) {
-  return '${Store.get(StoreKey.serverEndpoint)}/asset/file/${asset.remoteId}?isThumb=false';
+  return getImageUrlFromId(asset.remoteId!);
+}
+
+String getImageUrlFromId(final String id) {
+  return '${Store.get(StoreKey.serverEndpoint)}/asset/file/$id?isThumb=false';
 }

 String getImageCacheKey(final Asset asset) {
@@ -90,6 +90,7 @@ doc/MapMarkerResponseDto.md
 doc/MapTheme.md
 doc/MemoryLaneResponseDto.md
 doc/MergePersonDto.md
+doc/MetadataSearchDto.md
 doc/ModelType.md
 doc/OAuthApi.md
 doc/OAuthAuthorizeResponseDto.md
@@ -120,6 +121,7 @@ doc/SearchExploreResponseDto.md
 doc/SearchFacetCountResponseDto.md
 doc/SearchFacetResponseDto.md
 doc/SearchResponseDto.md
+doc/SearchSuggestionType.md
 doc/ServerConfigDto.md
 doc/ServerFeaturesDto.md
 doc/ServerInfoApi.md
@@ -136,6 +138,7 @@ doc/SharedLinkResponseDto.md
 doc/SharedLinkType.md
 doc/SignUpDto.md
 doc/SmartInfoResponseDto.md
+doc/SmartSearchDto.md
 doc/SystemConfigApi.md
 doc/SystemConfigDto.md
 doc/SystemConfigFFmpegDto.md
@@ -179,6 +182,9 @@ doc/UserAvatarColor.md
 doc/UserDto.md
 doc/UserResponseDto.md
 doc/ValidateAccessTokenResponseDto.md
+doc/ValidateLibraryDto.md
+doc/ValidateLibraryImportPathResponseDto.md
+doc/ValidateLibraryResponseDto.md
 doc/VideoCodec.md
 git_push.sh
 lib/api.dart
@@ -287,6 +293,7 @@ lib/model/map_marker_response_dto.dart
 lib/model/map_theme.dart
 lib/model/memory_lane_response_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
@@ -313,6 +320,7 @@ 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
@@ -327,6 +335,7 @@ 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_job_dto.dart
@@ -366,6 +375,9 @@ lib/model/user_avatar_color.dart
 lib/model/user_dto.dart
 lib/model/user_response_dto.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
@@ -455,6 +467,7 @@ test/map_marker_response_dto_test.dart
 test/map_theme_test.dart
 test/memory_lane_response_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
@@ -485,6 +498,7 @@ 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
@@ -501,6 +515,7 @@ 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/system_config_api_test.dart
 test/system_config_dto_test.dart
 test/system_config_f_fmpeg_dto_test.dart
@@ -544,4 +559,7 @@ test/user_avatar_color_test.dart
 test/user_dto_test.dart
 test/user_response_dto_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
@@ -3,7 +3,7 @@ Immich API

 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:

- API version: 1.94.1
+- API version: 1.95.1
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

 ## Requirements
@@ -141,6 +141,7 @@ Class | Method | HTTP request | Description
 *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 | 
 *OAuthApi* | [**finishOAuth**](doc//OAuthApi.md#finishoauth) | **POST** /oauth/callback | 
 *OAuthApi* | [**linkOAuthAccount**](doc//OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | 
 *OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | 
@@ -161,10 +162,11 @@ Class | Method | HTTP request | Description
 *PersonApi* | [**updatePeople**](doc//PersonApi.md#updatepeople) | **PUT** /person | 
 *PersonApi* | [**updatePerson**](doc//PersonApi.md#updateperson) | **PUT** /person/{id} | 
 *SearchApi* | [**getExploreData**](doc//SearchApi.md#getexploredata) | **GET** /search/explore | 
+*SearchApi* | [**getSearchSuggestions**](doc//SearchApi.md#getsearchsuggestions) | **GET** /search/suggestions | 
 *SearchApi* | [**search**](doc//SearchApi.md#search) | **GET** /search | 
-*SearchApi* | [**searchMetadata**](doc//SearchApi.md#searchmetadata) | **GET** /search/metadata | 
+*SearchApi* | [**searchMetadata**](doc//SearchApi.md#searchmetadata) | **POST** /search/metadata | 
 *SearchApi* | [**searchPerson**](doc//SearchApi.md#searchperson) | **GET** /search/person | 
-*SearchApi* | [**searchSmart**](doc//SearchApi.md#searchsmart) | **GET** /search/smart | 
+*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 | 
@@ -289,6 +291,7 @@ Class | Method | HTTP request | Description
 - [MapTheme](doc//MapTheme.md)
 - [MemoryLaneResponseDto](doc//MemoryLaneResponseDto.md)
 - [MergePersonDto](doc//MergePersonDto.md)
+ - [MetadataSearchDto](doc//MetadataSearchDto.md)
 - [ModelType](doc//ModelType.md)
 - [OAuthAuthorizeResponseDto](doc//OAuthAuthorizeResponseDto.md)
 - [OAuthCallbackDto](doc//OAuthCallbackDto.md)
@@ -315,6 +318,7 @@ Class | Method | HTTP request | Description
 - [SearchFacetCountResponseDto](doc//SearchFacetCountResponseDto.md)
 - [SearchFacetResponseDto](doc//SearchFacetResponseDto.md)
 - [SearchResponseDto](doc//SearchResponseDto.md)
+ - [SearchSuggestionType](doc//SearchSuggestionType.md)
 - [ServerConfigDto](doc//ServerConfigDto.md)
 - [ServerFeaturesDto](doc//ServerFeaturesDto.md)
 - [ServerInfoResponseDto](doc//ServerInfoResponseDto.md)
@@ -329,6 +333,7 @@ Class | Method | HTTP request | Description
 - [SharedLinkType](doc//SharedLinkType.md)
 - [SignUpDto](doc//SignUpDto.md)
 - [SmartInfoResponseDto](doc//SmartInfoResponseDto.md)
+ - [SmartSearchDto](doc//SmartSearchDto.md)
 - [SystemConfigDto](doc//SystemConfigDto.md)
 - [SystemConfigFFmpegDto](doc//SystemConfigFFmpegDto.md)
 - [SystemConfigJobDto](doc//SystemConfigJobDto.md)
@@ -368,6 +373,9 @@ Class | Method | HTTP request | Description
 - [UserDto](doc//UserDto.md)
 - [UserResponseDto](doc//UserResponseDto.md)
 - [ValidateAccessTokenResponseDto](doc//ValidateAccessTokenResponseDto.md)
+ - [ValidateLibraryDto](doc//ValidateLibraryDto.md)
+ - [ValidateLibraryImportPathResponseDto](doc//ValidateLibraryImportPathResponseDto.md)
+ - [ValidateLibraryResponseDto](doc//ValidateLibraryResponseDto.md)
 - [VideoCodec](doc//VideoCodec.md)


@@ -659,7 +659,7 @@ This endpoint does not need any parameter.
 [[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)

 # **getMapMarkers**
-> List<MapMarkerResponseDto> getMapMarkers(fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite)
+> List<MapMarkerResponseDto> getMapMarkers(fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite, withPartners)



@@ -686,9 +686,10 @@ final fileCreatedAfter = 2013-10-20T19:20:30+01:00; // DateTime |
 final fileCreatedBefore = 2013-10-20T19:20:30+01:00; // DateTime | 
 final isArchived = true; // bool | 
 final isFavorite = true; // bool | 
+final withPartners = true; // bool | 

 try {
-    final result = api_instance.getMapMarkers(fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite);
+    final result = api_instance.getMapMarkers(fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite, withPartners);
    print(result);
 } catch (e) {
    print('Exception when calling AssetApi->getMapMarkers: $e\n');
@@ -703,6 +704,7 @@ Name | Type | Description  | Notes
 **fileCreatedBefore** | **DateTime**|  | [optional] 
 **isArchived** | **bool**|  | [optional] 
 **isFavorite** | **bool**|  | [optional] 
+ **withPartners** | **bool**|  | [optional] 

 ### Return type

@@ -1034,7 +1036,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **searchAssets**
-> List<AssetResponseDto> searchAssets(checksum, city, country, createdAfter, createdBefore, deviceAssetId, deviceId, encodedVideoPath, id, isArchived, isEncoded, isExternal, isFavorite, isMotion, isOffline, isReadOnly, isVisible, lensModel, libraryId, make, model, order, originalFileName, originalPath, page, resizePath, size, state, takenAfter, takenBefore, trashedAfter, trashedBefore, type, updatedAfter, updatedBefore, webpPath, withArchived, withDeleted, withExif, withPeople, withStacked)
+> List<AssetResponseDto> searchAssets(checksum, city, country, createdAfter, createdBefore, deviceAssetId, deviceId, encodedVideoPath, id, isArchived, isEncoded, isExternal, isFavorite, isMotion, isNotInAlbum, isOffline, isReadOnly, isVisible, lensModel, libraryId, make, model, order, originalFileName, originalPath, page, personIds, resizePath, size, state, takenAfter, takenBefore, trashedAfter, trashedBefore, type, updatedAfter, updatedBefore, webpPath, withArchived, withDeleted, withExif, withPeople, withStacked)



@@ -1071,6 +1073,7 @@ final isEncoded = true; // bool |
 final isExternal = true; // bool | 
 final isFavorite = true; // bool | 
 final isMotion = true; // bool | 
+final isNotInAlbum = true; // bool | 
 final isOffline = true; // bool | 
 final isReadOnly = true; // bool | 
 final isVisible = true; // bool | 
@@ -1082,6 +1085,7 @@ final order = ; // AssetOrder |
 final originalFileName = originalFileName_example; // String | 
 final originalPath = originalPath_example; // String | 
 final page = 8.14; // num | 
+final personIds = []; // List<String> | 
 final resizePath = resizePath_example; // String | 
 final size = 8.14; // num | 
 final state = state_example; // String | 
@@ -1100,7 +1104,7 @@ final withPeople = true; // bool |
 final withStacked = true; // bool | 

 try {
-    final result = api_instance.searchAssets(checksum, city, country, createdAfter, createdBefore, deviceAssetId, deviceId, encodedVideoPath, id, isArchived, isEncoded, isExternal, isFavorite, isMotion, isOffline, isReadOnly, isVisible, lensModel, libraryId, make, model, order, originalFileName, originalPath, page, resizePath, size, state, takenAfter, takenBefore, trashedAfter, trashedBefore, type, updatedAfter, updatedBefore, webpPath, withArchived, withDeleted, withExif, withPeople, withStacked);
+    final result = api_instance.searchAssets(checksum, city, country, createdAfter, createdBefore, deviceAssetId, deviceId, encodedVideoPath, id, isArchived, isEncoded, isExternal, isFavorite, isMotion, isNotInAlbum, isOffline, isReadOnly, isVisible, lensModel, libraryId, make, model, order, originalFileName, originalPath, page, personIds, resizePath, size, state, takenAfter, takenBefore, trashedAfter, trashedBefore, type, updatedAfter, updatedBefore, webpPath, withArchived, withDeleted, withExif, withPeople, withStacked);
    print(result);
 } catch (e) {
    print('Exception when calling AssetApi->searchAssets: $e\n');
@@ -1125,6 +1129,7 @@ Name | Type | Description  | Notes
 **isExternal** | **bool**|  | [optional] 
 **isFavorite** | **bool**|  | [optional] 
 **isMotion** | **bool**|  | [optional] 
+ **isNotInAlbum** | **bool**|  | [optional] 
 **isOffline** | **bool**|  | [optional] 
 **isReadOnly** | **bool**|  | [optional] 
 **isVisible** | **bool**|  | [optional] 
@@ -1136,6 +1141,7 @@ Name | Type | Description  | Notes
 **originalFileName** | **String**|  | [optional] 
 **originalPath** | **String**|  | [optional] 
 **page** | **num**|  | [optional] 
+ **personIds** | [**List<String>**](String.md)|  | [optional] [default to const []]
 **resizePath** | **String**|  | [optional] 
 **size** | **num**|  | [optional] 
 **state** | **String**|  | [optional] 
@@ -1147,7 +1153,7 @@ Name | Type | Description  | Notes
 **updatedAfter** | **DateTime**|  | [optional] 
 **updatedBefore** | **DateTime**|  | [optional] 
 **webpPath** | **String**|  | [optional] 
- **withArchived** | **bool**|  | [optional] 
+ **withArchived** | **bool**|  | [optional] [default to false]
 **withDeleted** | **bool**|  | [optional] 
 **withExif** | **bool**|  | [optional] 
 **withPeople** | **bool**|  | [optional] 
@@ -17,6 +17,7 @@ Method | HTTP request | Description
 [**removeOfflineFiles**](LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
 [**scanLibrary**](LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | 
 [**updateLibrary**](LibraryApi.md#updatelibrary) | **PUT** /library/{id} | 
+[**validate**](LibraryApi.md#validate) | **POST** /library/{id}/validate | 


 # **createLibrary**
@@ -456,3 +457,60 @@ Name | Type | Description  | Notes

 [[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)

+# **validate**
+> ValidateLibraryResponseDto validate(id, validateLibraryDto)
+
+
+
+### 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 = LibraryApi();
+final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
+final validateLibraryDto = ValidateLibraryDto(); // ValidateLibraryDto | 
+
+try {
+    final result = api_instance.validate(id, validateLibraryDto);
+    print(result);
+} catch (e) {
+    print('Exception when calling LibraryApi->validate: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **String**|  | 
+ **validateLibraryDto** | [**ValidateLibraryDto**](ValidateLibraryDto.md)|  | 
+
+### Return type
+
+[**ValidateLibraryResponseDto**](ValidateLibraryResponseDto.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)
+
@@ -0,0 +1,57 @@
+# openapi.model.MetadataSearchDto
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**checksum** | **String** |  | [optional] 
+**city** | **String** |  | [optional] 
+**country** | **String** |  | [optional] 
+**createdAfter** | [**DateTime**](DateTime.md) |  | [optional] 
+**createdBefore** | [**DateTime**](DateTime.md) |  | [optional] 
+**deviceAssetId** | **String** |  | [optional] 
+**deviceId** | **String** |  | [optional] 
+**encodedVideoPath** | **String** |  | [optional] 
+**id** | **String** |  | [optional] 
+**isArchived** | **bool** |  | [optional] 
+**isEncoded** | **bool** |  | [optional] 
+**isExternal** | **bool** |  | [optional] 
+**isFavorite** | **bool** |  | [optional] 
+**isMotion** | **bool** |  | [optional] 
+**isNotInAlbum** | **bool** |  | [optional] 
+**isOffline** | **bool** |  | [optional] 
+**isReadOnly** | **bool** |  | [optional] 
+**isVisible** | **bool** |  | [optional] 
+**lensModel** | **String** |  | [optional] 
+**libraryId** | **String** |  | [optional] 
+**make** | **String** |  | [optional] 
+**model** | **String** |  | [optional] 
+**order** | [**AssetOrder**](AssetOrder.md) |  | [optional] 
+**originalFileName** | **String** |  | [optional] 
+**originalPath** | **String** |  | [optional] 
+**page** | **num** |  | [optional] 
+**personIds** | **List<String>** |  | [optional] [default to const []]
+**resizePath** | **String** |  | [optional] 
+**size** | **num** |  | [optional] 
+**state** | **String** |  | [optional] 
+**takenAfter** | [**DateTime**](DateTime.md) |  | [optional] 
+**takenBefore** | [**DateTime**](DateTime.md) |  | [optional] 
+**trashedAfter** | [**DateTime**](DateTime.md) |  | [optional] 
+**trashedBefore** | [**DateTime**](DateTime.md) |  | [optional] 
+**type** | [**AssetTypeEnum**](AssetTypeEnum.md) |  | [optional] 
+**updatedAfter** | [**DateTime**](DateTime.md) |  | [optional] 
+**updatedBefore** | [**DateTime**](DateTime.md) |  | [optional] 
+**webpPath** | **String** |  | [optional] 
+**withArchived** | **bool** |  | [optional] [default to false]
+**withDeleted** | **bool** |  | [optional] 
+**withExif** | **bool** |  | [optional] 
+**withPeople** | **bool** |  | [optional] 
+**withStacked** | **bool** |  | [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)
+
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex The Bot	7c34d0595e	Version v1.95.1	2024-02-21 04:02:43 +00:00
Mert	eb73f6605b	fix(server): don't return archived assets by default (#7278 ) * don't show archived results by default * fix e2e * generate sql * set default in dto --------- Co-authored-by: Alex Tran <alex.tran1502@gmail.com>	2024-02-21 03:59:26 +00:00
Alex	bb5236ae65	fix(server): not in album filter with context search (#7275 )	2024-02-20 20:44:34 -06:00
Mert	e33fd40b4c	fix(server): quote database name in migration (#7277 ) quote database name	2024-02-21 02:13:43 +00:00
Alex	73825918c0	fix(web): presenting modal removes the browser's scroll ability (#7257 ) * fix(web): presenting modal removes the browser's scroll ability * removed unsued code * eslint	2024-02-20 14:02:01 -06:00
martyfuhry	a22bf99206	fix(mobile): Uses immich thumbnail for background of memory picture (#7254 ) unused imports	2024-02-20 13:58:41 -06:00
Alex	578b71b961	chore: post release tasks	2024-02-20 11:05:24 -06:00
Alex The Bot	302d98ebe1	Version v1.95.0	2024-02-20 16:52:23 +00:00
martyfuhry	e338e4def6	fix(mobile): Prefer sharing local assets to remote (#7245 ) Prefer sharing local assets to remote	2024-02-20 10:03:24 -06:00
Michel Heusschen	b896d45ee7	feat(web): improve feedback for favorite and archive actions (#7232 )	2024-02-20 10:01:52 -06:00
Jonathan Jogenfors	b3c7bebbd4	feat(server,web) Semantic import path validation (#7076 ) * add library validation api * chore: open api * show warning i UI * add flex row * fix e2e * tests * fix tests * enforce path validation * enforce validation on refresh * return 400 on bad import path * add limits to import paths * set response code to 200 * fix e2e * fix lint * fix test * restore e2e folder * fix import * use startsWith * icon color * notify user of failed validation * add parent div to validation * add docs to the import validation * improve library troubleshooting docs * fix button alignment --------- Co-authored-by: Alex Tran <alex.tran1502@gmail.com>	2024-02-20 09:53:12 -06:00
Michel Heusschen	e7a875eadd	fix(web): websocket reconnect (#7234 ) * fix(web): websocket reconnect * reset store after navigation completes * remove loggedOut check	2024-02-20 08:20:09 -06:00
Jason Rasmussen	7f5459f050	fix(web): download from shared album link (#7227 ) * fix(web): download in album shared link * chore: e2e test	2024-02-19 22:39:49 -06:00
renovate[bot]	7158706296	fix(deps): update server (#7224 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-19 22:34:39 -05:00
Jason Rasmussen	9b20604a70	refactor(server): e2e (#7223 ) * refactor: download e2e * refactor: oauth e2e * refactor: system config e2e * refactor: partner e2e * refactor: server-info e2e * refactor: user e2e * chore: uncomment test	2024-02-19 22:34:18 -05:00
renovate[bot]	02b9f3ee88	fix(deps): update dependency @mdx-js/react to v3.0.1 (#7222 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-19 22:34:01 -05:00
renovate[bot]	f14a2ae099	chore(deps): update web (#7221 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-19 22:33:52 -05:00
Alex	42ce8c5093	chore(web): show people list on a single line in filter form when not expanded (#7216 )	2024-02-19 21:24:41 -06:00
Mert	6690e8edf2	fix(docs): document vector extension env variable (#7220 )	2024-02-19 21:32:55 -05:00
renovate[bot]	14ca471dea	chore(deps): pin dependencies (#7217 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-19 19:35:46 -05:00
renovate[bot]	84b2fc80a4	chore(deps): update dependency vite to v5.1.2 (#7218 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-19 19:34:47 -05:00
Mert	d5ef91b1ae	feat(cli): concurrent upload (#7192 ) * concurrent cli upload * added concurrency flag, progress bar refinements * no data property 🦀 * use lodash-es * rebase * linting * typing * album bug fixes * dev dependency for lodash typing * fixed not deleting assets if album isn't specified * formatting * fixed tests * use `arrayContaining` * add more checks * assert updates existing assets	2024-02-19 19:32:57 -05:00
Jason Rasmussen	947bcf2d68	refactor: cli e2e (#7211 )	2024-02-19 17:25:57 -05:00
Alex	870d517ce3	fix(web): don't show motion part in search result (#7210 ) fix: don't show motion part in search result	2024-02-19 20:56:02 +00:00
Michel Heusschen	529a83cc72	fix(web): broken links to places search (#7208 )	2024-02-19 14:55:54 -06:00
Jason Rasmussen	5e1498a279	chore: remove unused file (#7205 )	2024-02-19 12:45:13 -06:00
Michel Heusschen	ea4be83ee9	fix(web): memory view broken by enhanced:img import (#7206 )	2024-02-19 12:42:22 -06:00
Jason Rasmussen	a03b37ca86	refactor: server auth e2e (#7203 )	2024-02-19 12:03:51 -05:00
martyfuhry	59f8a886e7	fix(mobile): Fixes memory lane progress indicator color in dark mode (#7199 ) * Fixes memory lane progress indicator color in dark mode * Removed unused import	2024-02-19 09:13:28 -06:00
Jason Rasmussen	c50d318152	chore: cleanup old jest references (#7198 )	2024-02-19 08:54:41 -05:00
Alex	a8f177066b	fix(server): `getAllAssets` endpoint includes motion part of LivePhotos (#7194 )	2024-02-19 07:24:14 -06:00
martyfuhry	dd53795953	chore(mobile): Adds dart format to static analysis (#7193 ) Adds dart format to static analysis	2024-02-18 22:30:24 -06:00
Alex	9e7cb52413	chore(mobile): minor housekeeping	2024-02-18 22:17:20 -06:00
Thomas	0795410a41	fix: only show scrollbars if needed (#7191 ) The class 'overflow-y-scroll' will always show the scrollbar. Changing this to 'overflow-y-auto' will only show the scrollbar when needed. All instances of the 'overflow-y-scroll' class have been changed. Fixes: #7190	2024-02-18 20:57:56 -06:00
martin	66d3daa074	fix: shell scripts (#7189 ) * fix: bash scripts * fix: use bash * fix: e2e	2024-02-18 20:57:24 -06:00
martin	ddae707ea9	fix: shell scripts (#7186 ) * fix: bash scripts * pr feedback * wrong variable * ci: add shellcheck workflow * fix: missing scripts	2024-02-18 17:03:01 -06:00
Michel Heusschen	4b46bb49d7	fix(server): on_asset_update event sends varying data types (#7179 )	2024-02-18 16:50:32 -06:00
renovate[bot]	072f61927c	chore(deps): update typescript-eslint monorepo to v7 (major) (#7171 )	2024-02-18 11:26:01 -08:00
martin	36e5d298db	perf(web): optimize images and modules (#7088 ) * perf: optimize images and modules * fix: tests * fix: missing font * fix: delay showing the loading spinner * simplify * simplify * pr feedback * chore: merge main * fix: enum --------- Co-authored-by: Alex Tran <alex.tran1502@gmail.com>	2024-02-18 13:18:40 -06:00
Ben McCann	3480fe5326	chore(web): remove createEventDispatcher from LoginForm (#7177 )	2024-02-18 12:47:13 -06:00
Mert	857ec0451d	feat(server): optimize get asset query (#7176 ) * faster query * add index * remove legacy code * update mock * remove unused imports * add relations * add stack * formatting * remove stack relation * remove unused import * increase chunk size * generate sql * linting * fix typing * formatting	2024-02-18 12:22:25 -06:00
Alex	8e1c85fe4f	fix(server): not in album filter show motion part of LivePhotos (#7175 )	2024-02-18 12:17:53 -06:00
martyfuhry	88214a485b	fix(mobile): Fixes bottom exif info sheet modal drag controls (#7165 ) * WIPip * Fixed show modal bottom sheet to use drag handle * Fixes advanced bottom sheet scrolling --------- Co-authored-by: Alex <alex.tran1502@gmail.com>	2024-02-17 22:03:01 -06:00
Ben Basten	9c1dd373a5	feat(web): add skip link to top navigation (#7091 ) * feat(web): add skip link to top nav * Styling skip link with tailwind	2024-02-17 21:34:27 -06:00
martyfuhry	70e5febb72	refactor(mobile): Use widgets in Immich asset grid (#7140 ) * Refactors to use widgets in immich asset grid Adds comments * Fixes asset thumbnail absoluteOffset * feat(mobile): Uses gradient image placeholders in memory lane and in the asset grid (#7142) * Uses gradient image placeholders in memory lane and in the asset grid * Changes to create placeholders in immmich image.thumbnail * removed unused import * uses context.isDarkTheme and fixed function signature for allAssetsSelected	2024-02-17 21:31:34 -06:00
Michel Heusschen	0730b54ca9	fix(server): empty/restore trash (#7161 ) * fix(server): empty/restore trash * add e2e tests * add e2e tests - part 2	2024-02-17 14:05:43 -06:00
Alex	69983ff83a	feat: enhance search (#7127 ) * feat: hybrid search * fixing normal search * building out the query * okla * filters * date * order by date * Remove hybrid search endpoint * remove search hybrid endpoint * faces query * search for person * search and pagination * with exif * with exif * justify gallery viewer * memory view * Fixed userId is null * openapi and styling * searchdto * lint and format * remove term * generate sql * fix test * chips * not showing true * pr feedback * pr feedback * nit name * linting * pr feedback * styling * linting	2024-02-17 11:00:55 -06:00
Michel Heusschen	60ba37b3a7	fix(web): validation when editing asset date & time (#7160 )	2024-02-17 09:28:34 -05:00
Ben McCann	3915867b1b	chore: remove svelte-preprocess (#7159 )	2024-02-17 08:35:51 -05:00
Michel Heusschen	fab19a8583	fix(server): recognize faces when min. faces is set to 1 (#7144 ) * fix(server): recognize face when min. faces is set to 1 * update logic * clarified log --------- Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com>	2024-02-17 03:32:11 +00:00
Jason Rasmussen	a24f3805c9	chore: web e2e improvements (#7155 )	2024-02-16 16:31:22 -05:00
Jan	67b1675850	fix(web) display wrong apikey-name on edit (#7131 ) * fix display wrong apikey-name on edit * use apiKey property with fallback value * remove null fallback * chore: cleanup --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2024-02-16 16:01:44 -05:00
Michel Heusschen	c84c0bae6c	refactor(web): websocket events (#7152 )	2024-02-16 15:43:40 -05:00
Daniel Dietzler	bbf7a54c65	chore(web): upgrade to maplibre 4 (#7132 ) upgrade to maplibre 4	2024-02-16 07:55:13 -06:00
waclaw66	0ca7adcdbf	fix(mobile): bottom app bar icons (#7147 )	2024-02-16 07:54:17 -06:00
Ben McCann	dabbd63a02	fix(web): update unauthorized share link handling (#7126 )	2024-02-14 22:01:01 -06:00
Alex	9b814354a4	fix(web): search params (#7123 ) * fix(web): search params * format	2024-02-14 20:43:48 -06:00
martyfuhry	31ae35e9a6	chore(mobile): Fixed exclude analyzer options (#7125 ) Fixed exclude analyzer options	2024-02-15 01:28:45 +00:00
Ben McCann	5abbb335c3	chore(deps): upgrade tj-actions/verify-changed-files to v18 (#7121 )	2024-02-14 11:53:42 -08:00
Mert	5ff68d4cdb	feat(server): only transcode streams that require it (#7106 )	2024-02-14 11:24:39 -05:00
Jason Rasmussen	b823dfffdc	chore: suppress abort errors (#7120 ) * chore: suppress abort errors * chore: return if aborted * chore: linting	2024-02-14 10:24:18 -06:00
Jason Rasmussen	747df0ae86	chore(web): auto sort imports (#7118 ) chore(web): auto sort impomrts	2024-02-14 10:54:32 -05:00
Ben McCann	2906950188	fix: update error handling to match new API (#7117 )	2024-02-14 07:25:15 -08:00
Torbjorn Tyridal	6adff50f0a	feat(server, web): Include partner's photos on map (#7065 ) * feat(server): Include partner's photos on map - if included in timeline * depend on query parameter withPartners instead of partners.inTimeline * web: map option to include partners images * make open-api	2024-02-14 10:07:00 -05:00
Jason Rasmussen	7d59900662	chore: web shutdown signal (#7114 )	2024-02-14 08:57:02 -06:00
Jason Rasmussen	69166fa520	chore(cli): auto-sort imports (#7116 )	2024-02-14 09:55:40 -05:00
Ben McCann	87ae0be081	chore: enum support for new API (#7110 ) Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2024-02-14 06:38:57 -08:00
martin	6f5648569a	fix(web): always show asset owner when viewing an asset from a shared album (#7104 ) fix: always show album owner when viewing a shared album	2024-02-14 09:08:33 -05:00
Jason Rasmussen	d8631a00bb	refactor(web) open api client (#7103 ) * refactor: person api * refactor: shared link and others	2024-02-14 08:09:49 -05:00
ItsJustRuby	5fc1d43012	chore(web,mobile): Fix reoccurring typo (#7111 )	2024-02-14 08:48:59 +00:00
Łukasz Wawrzyk	e9f3360f02	chore(mobile): Put the real delete button before other delete variants (#6895 ) fix: put the real delete button before other delete variants	2024-02-13 20:17:21 -06:00
renovate[bot]	b2181ee6f1	chore(deps): update dependency @types/node to v20.11.17 (#7102 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-13 22:13:38 +00:00
renovate[bot]	021867fe6c	chore(deps): update dependency @types/node to v20.11.17 (#7099 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-13 17:08:38 -05:00
renovate[bot]	caa9673f3a	chore(deps): update dependency @types/node to v20.11.17 (#7098 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-02-13 17:08:25 -05:00
Jason Rasmussen	8fd94211c0	refactor(web): use new open api client (#7097 ) * refactor(web): use new open api client * refactor: remove activity api * refactor: trash, oauth, and partner apis * refactor: job api * refactor: face, library, system config * refactor: user api * refactor: album api	2024-02-13 17:07:37 -05:00
martyfuhry	9b4a770b9d	refactor(mobile): Immich image provider (#7016 ) * Adds image provider * uses image provider * wip load preview * wip everything but activity asset thumbnail needs some help with a remote id * Immich provider used in gallery * First draft of the immich image provider, working nicely! * Removed OriginalImageProvider * Fixes for thumbnails * feat(mobile): thumbhash support (#7028) * feat(mobile): thumbhash support * perf(mobile): store bmp thumbhash bytes in Isar --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> * Uses octoimage for fade in and placeholders * fixes thumbnails, removes unused values, adds better thumbnail size * removes thumbhash support for now * Forgot one thumbhash removal * Use big thumbnail for local image on ios * fix(mobile): Multipart image loading for iOS double swipe (#7064) * uses local thumb first * Multipart thumbnail * Clean up file delete * await file delete * Fynn's comments, made thumbnail smaller and doesn't crash on erroring out on thumbnail * lint --------- Co-authored-by: Marty Fuhry <marty@fuhry.farm> Co-authored-by: Alex <alex.tran1502@gmail.com> * Moves http client to global private place for reuse * Got rid of usePreview for local image providers since we always show a thumbnail anyway first * linter --------- Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com> Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> Co-authored-by: Marty Fuhry <marty@fuhry.farm>	2024-02-13 15:30:32 -06:00
Alex	4b3f8d1946	feat: Search filtering logic (#6968 ) * commit * controller/service/repository logic * use enum * openapi * suggest people * suggest place/camera * cursor hover * refactor * Add try catch * Remove get people with name service * Remove deadcode * people selection * People placement * sort people * Update server/src/domain/repositories/metadata.repository.ts Co-authored-by: Jason Rasmussen <jrasm91@gmail.com> * pr feedback * styling * done * open api * fix test * use string type * remmove bad merge * use correct type * fix test * fix lint * remove unused code * remove unused code * pr feedback * pr feedback --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2024-02-13 19:54:58 +00:00
Jason Rasmussen	0c45f51a29	fix(deps): bump oazapfts to v6 (#7093 ) chore: bump to v6	2024-02-13 13:37:57 -06:00