Compare commits

..
Author SHA1 Message Date
Meier Lukas 30a336f951 fix: missing updated imports 2025-12-20 22:50:50 +01:00
Meier Lukas 978121b6ed fix(db): remove bulk drizzle-orm export 2025-12-20 22:37:09 +01:00
233 changed files with 3985 additions and 4094 deletions

No files matched your search

-3
View File
@@ -33,9 +33,6 @@ body:
options: options:
# The below comment is used to insert a new version with on-release.yml # The below comment is used to insert a new version with on-release.yml
#NEXT_VERSION# #NEXT_VERSION#
- 1.49.0
- 1.48.0
- 1.47.0
- 1.46.0 - 1.46.0
- 1.45.3 - 1.45.3
- 1.45.2 - 1.45.2
@@ -19,6 +19,11 @@ inputs:
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Prebuilt debian dependencies
uses: homarr-labs/homarr/.github/actions/prebuilt-debian@dev
id: prebuilt-debian
with:
architecture: ${{ inputs.architecture }}
- name: Start docker container for ${{ inputs.architecture }} - name: Start docker container for ${{ inputs.architecture }}
run: | run: |
docker run --name homarr \ docker run --name homarr \
@@ -36,9 +41,12 @@ runs:
docker cp homarr:/app/extraction-alpine.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz && \ docker cp homarr:/app/extraction-alpine.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz && \
docker exec homarr rm /app/extraction-alpine.tar.gz docker exec homarr rm /app/extraction-alpine.tar.gz
shell: bash shell: bash
- name: Copy source for debian build artifact - name: Extract source from ${{ inputs.architecture }} container (debian)
run: | run: |
cp ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/build && \
docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/node_modules/better-sqlite3/build/Release && \
docker exec homarr tar -czf extraction-debian.tar.gz -C /app . && \
docker cp homarr:/app/extraction-debian.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz
shell: bash shell: bash
- name: Stop ${{ inputs.architecture }} container - name: Stop ${{ inputs.architecture }} container
if: always() if: always()
@@ -0,0 +1,42 @@
name: Prebuilt dependencies for debian
description: Provides prebuilt dependencies for debian based docker images
inputs:
architecture:
description: Name of architecture, will be used to build docker image (e.g. amd64, arm64)
required: true
outputs:
path:
description: Path to extracted prebuilt dependencies
value: ${{ runner.temp }}/prebuilts
runs:
using: "composite"
steps:
- uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build docker image for ${{ inputs.architecture }}
id: build
uses: docker/build-push-action@v6
with:
push: false
load: true
context: ./deployments/prebuilt-debian
platforms: linux/${{ inputs.architecture }}
tags: prebuilt-debian
- name: Start docker container for ${{ inputs.architecture }}
run: |
docker run --name prebuilt-debian \
--detach --rm prebuilt-debian
shell: bash
- name: Extract prebuilt dependencies from ${{ inputs.architecture }} container
run: |
mkdir -p ${{ runner.temp }}/prebuilts && \
docker cp prebuilt-debian:/app/node_modules/better-sqlite3/build/Release/better_sqlite3.node ${{ runner.temp }}/prebuilts/better_sqlite3.node
shell: bash
- name: Stop ${{ inputs.architecture }} container
if: always()
run: docker container remove --force --volumes prebuilt-debian
shell: bash
+1
View File
@@ -20,6 +20,7 @@
matchPackageNames: [ matchPackageNames: [
"@tree-sitter-grammars/tree-sitter-yaml", "@tree-sitter-grammars/tree-sitter-yaml",
"bcrypt", "bcrypt",
"better-sqlite3",
"cpu-features", "cpu-features",
"esbuild", "esbuild",
"sharp", "sharp",
@@ -0,0 +1,45 @@
name: "[Deployments] Validate prebuilt debian dependencies"
permissions:
contents: read
on:
pull_request:
branches: ["*"]
paths: [".github/actions/prebuilt-debian/**", "deployments/prebuilt-debian/**"]
jobs:
prebuilt-debian-validate-amd64:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v6
- name: Validate prebuilt dependencies for amd64
id: validate-amd64
uses: ./.github/actions/prebuilt-debian
with:
architecture: amd64
- name: Check extracted files for amd64
run: |
if [ ! -f "${{ steps.validate-amd64.outputs.path }}/better_sqlite3.node" ]; then
echo "better_sqlite3.node not found for amd64!"
exit 1
fi
prebuilt-debian-validate-arm64:
runs-on: ubuntu-24.04-
timeout-minutes: 5
steps:
- uses: actions/checkout@v6
- name: Validate prebuilt dependencies for arm64
id: validate-arm64
uses: ./.github/actions/prebuilt-debian
with:
architecture: arm64
- name: Check extracted files for arm64
run: |
if [ ! -f "${{ steps.validate-arm64.outputs.path }}/better_sqlite3.node" ]; then
echo "better_sqlite3.node not found for arm64!"
exit 1
fi
-102
View File
@@ -1,105 +1,3 @@
## [1.50.1](https://github.com/homarr-labs/homarr/compare/v1.50.0...v1.50.1) (2026-01-16)
### Bug Fixes
* **deps:** update dependency ioredis to v5.9.0 ([#4827](https://github.com/homarr-labs/homarr/issues/4827)) ([155d4f2](https://github.com/homarr-labs/homarr/commit/155d4f2270b3b35c4ad696499b0aaa0b10100989))
* **deps:** update dependency ioredis to v5.9.1 ([#4844](https://github.com/homarr-labs/homarr/issues/4844)) ([5d00642](https://github.com/homarr-labs/homarr/commit/5d006422688cf3fe7440ae3ab66ad3b2cc9286a8))
* **deps:** update dependency ldapts to v8.1.3 ([#4841](https://github.com/homarr-labs/homarr/issues/4841)) ([7fa9907](https://github.com/homarr-labs/homarr/commit/7fa990712bddc88bbb3bbe01e758bfef7cb4dea3))
* **deps:** update dependency react-error-boundary to ^6.0.2 ([#4821](https://github.com/homarr-labs/homarr/issues/4821)) ([e9ba102](https://github.com/homarr-labs/homarr/commit/e9ba102cf668c0ef54628d3dbc6e6cbda2d059b5))
* **deps:** update dependency react-error-boundary to ^6.0.3 ([#4847](https://github.com/homarr-labs/homarr/issues/4847)) ([c24006d](https://github.com/homarr-labs/homarr/commit/c24006dca691f26a7187c0ba112d9ed2ec424bb0))
* **deps:** update dependency sass to ^1.97.2 ([#4835](https://github.com/homarr-labs/homarr/issues/4835)) ([07ba531](https://github.com/homarr-labs/homarr/commit/07ba53165c90d675aa54c5ad3fca930fef5cd35e))
* **deps:** update dependency typescript-eslint to ^8.52.0 ([#4830](https://github.com/homarr-labs/homarr/issues/4830)) ([fa8af6a](https://github.com/homarr-labs/homarr/commit/fa8af6a453b846af2305db3c318c8c1c303a3a88))
* **deps:** update dependency undici to v7.17.0 ([#4826](https://github.com/homarr-labs/homarr/issues/4826)) ([21a91b1](https://github.com/homarr-labs/homarr/commit/21a91b1489ff1a1f0a1428a3f50f00db8932da72))
* **deps:** update dependency undici to v7.18.0 ([#4829](https://github.com/homarr-labs/homarr/issues/4829)) ([b76ab29](https://github.com/homarr-labs/homarr/commit/b76ab2961d84081c9ef04d76193f21a1068e72d9))
* **deps:** update dependency undici to v7.18.2 ([#4837](https://github.com/homarr-labs/homarr/issues/4837)) ([16733c2](https://github.com/homarr-labs/homarr/commit/16733c2a0efabcbc5b693a8b6f82833f6fc344b7))
* **deps:** update dependency ws to ^8.19.0 ([#4833](https://github.com/homarr-labs/homarr/issues/4833)) ([629359e](https://github.com/homarr-labs/homarr/commit/629359e3e44ddad880842cfd576edb514f80d61a))
* **deps:** update mantine monorepo to ^8.3.11 ([#4822](https://github.com/homarr-labs/homarr/issues/4822)) ([0364e10](https://github.com/homarr-labs/homarr/commit/0364e102cd6c0f560bc49e0b9ccd71df0b75eed6))
* **deps:** update mantine monorepo to ^8.3.12 ([#4848](https://github.com/homarr-labs/homarr/issues/4848)) ([275a346](https://github.com/homarr-labs/homarr/commit/275a346afaaebfa894ef2193f70966986a138dbb))
* **deps:** update tiptap monorepo to v3.15.0 ([#4832](https://github.com/homarr-labs/homarr/issues/4832)) ([ab3ee4f](https://github.com/homarr-labs/homarr/commit/ab3ee4f78a739bdb3b49a81652420df6ec143b62))
* **deps:** update tiptap monorepo to v3.15.1 ([#4838](https://github.com/homarr-labs/homarr/issues/4838)) ([d479b63](https://github.com/homarr-labs/homarr/commit/d479b63a803f2295ccdf20fcd31c418a4aab148c))
* **deps:** update tiptap monorepo to v3.15.2 ([#4842](https://github.com/homarr-labs/homarr/issues/4842)) ([55c2666](https://github.com/homarr-labs/homarr/commit/55c2666f9d27ca34b6d028070f0d7b84e4c40e97))
* **deps:** update tiptap monorepo to v3.15.3 ([#4843](https://github.com/homarr-labs/homarr/issues/4843)) ([b26cf0e](https://github.com/homarr-labs/homarr/commit/b26cf0e65fd8150e241465628df2cb8b5a72088e))
* **deps:** update turbo monorepo to ^2.7.3 ([#4831](https://github.com/homarr-labs/homarr/issues/4831)) ([50410fe](https://github.com/homarr-labs/homarr/commit/50410fedb3f33ed131f923257e61ae2dca4e0288))
## [1.50.0](https://github.com/homarr-labs/homarr/compare/v1.49.1...v1.50.0) (2026-01-09)
### Features
* **auth:** extend API key authentication to tRPC endpoints ([#4732](https://github.com/homarr-labs/homarr/issues/4732)) ([0dc61a8](https://github.com/homarr-labs/homarr/commit/0dc61a88b8d12c61fd436adf0693c9fa5087a8c0))
* **users:** add libravatar / gravatar support ([#4277](https://github.com/homarr-labs/homarr/issues/4277)) ([a2a3412](https://github.com/homarr-labs/homarr/commit/a2a34124ae11b0b9242b9c2579f7376768d35d52))
### Bug Fixes
* **deps:** update dependency @tabler/icons-react to ^3.36.0 ([#4707](https://github.com/homarr-labs/homarr/issues/4707)) ([35e0198](https://github.com/homarr-labs/homarr/commit/35e0198b5df2a315ea2efb584752c5af062f960d))
* **deps:** update dependency @tabler/icons-react to ^3.36.1 ([#4812](https://github.com/homarr-labs/homarr/issues/4812)) ([dabb2bb](https://github.com/homarr-labs/homarr/commit/dabb2bb7821f6a68d41c4a931bb70c41fdd21a72))
* **deps:** update dependency @tanstack/react-query to ^5.90.15 ([#4794](https://github.com/homarr-labs/homarr/issues/4794)) ([ea848bd](https://github.com/homarr-labs/homarr/commit/ea848bdd0bc1268675d00213bb86dc1d1b298162))
* **deps:** update dependency @tanstack/react-query to ^5.90.16 ([#4799](https://github.com/homarr-labs/homarr/issues/4799)) ([413e846](https://github.com/homarr-labs/homarr/commit/413e846133f13a800f509273b8b87cf677f0024d))
* **deps:** update dependency ldapts to v8.1.0 ([#4804](https://github.com/homarr-labs/homarr/issues/4804)) ([c8ecf5f](https://github.com/homarr-labs/homarr/commit/c8ecf5f0a13b1c74f24cebced76a60728eb2d543))
* **deps:** update dependency ldapts to v8.1.2 ([#4805](https://github.com/homarr-labs/homarr/issues/4805)) ([9e63e34](https://github.com/homarr-labs/homarr/commit/9e63e3443af7946199999104024f00991cc1cba2))
* **deps:** update dependency next-intl to v4.7.0 ([#4806](https://github.com/homarr-labs/homarr/issues/4806)) ([35042a7](https://github.com/homarr-labs/homarr/commit/35042a783ce5c381425bb96766adbefcac75bfdd))
* **deps:** update dependency typescript-eslint to ^8.51.0 ([#4795](https://github.com/homarr-labs/homarr/issues/4795)) ([f0a2551](https://github.com/homarr-labs/homarr/commit/f0a2551fdf5b5e02ece789d473411ad3edcfb093))
## [1.49.1](https://github.com/homarr-labs/homarr/compare/v1.49.0...v1.49.1) (2026-01-03)
### Bug Fixes
* **db:** connection issue do to missing host and name of db when connecting with host ([#4786](https://github.com/homarr-labs/homarr/issues/4786)) ([7d33225](https://github.com/homarr-labs/homarr/commit/7d3322576c3ed1b9917873bf707d77d2a4eef1a8))
* **deps:** update dependency ldapts to v8.0.36 ([#4790](https://github.com/homarr-labs/homarr/issues/4790)) ([1842e5f](https://github.com/homarr-labs/homarr/commit/1842e5fff5c072c8da45a01be860e63d12d5062a))
* **deps:** update dependency react-error-boundary to ^6.0.1 ([#4791](https://github.com/homarr-labs/homarr/issues/4791)) ([1b70973](https://github.com/homarr-labs/homarr/commit/1b70973084c9e9ebed34e8d7d9690a9e5530f60f))
* **unraid:** temperature of disks can be null ([#4788](https://github.com/homarr-labs/homarr/issues/4788)) ([60f9d4e](https://github.com/homarr-labs/homarr/commit/60f9d4e6e69df2190171e5d8e263b2030447ab2e))
## [1.49.0](https://github.com/homarr-labs/homarr/compare/v1.48.0...v1.49.0) (2026-01-02)
### Features
* unraid integration ([#4439](https://github.com/homarr-labs/homarr/issues/4439)) ([9b0dd6d](https://github.com/homarr-labs/homarr/commit/9b0dd6d6cebda4a541c8859506d89e9e9f782fa4))
### Bug Fixes
* add orphaned status for containers with invalid stats ([#4441](https://github.com/homarr-labs/homarr/issues/4441)) ([f04f537](https://github.com/homarr-labs/homarr/commit/f04f53759b6890d5d2dd683a9bf124d8ff12780b))
* **deps:** update dependency @xterm/addon-fit to v0.11.0 ([#4756](https://github.com/homarr-labs/homarr/issues/4756)) ([1c727e5](https://github.com/homarr-labs/homarr/commit/1c727e59af4041e5e41da854633ccd3c030c1d18))
* **deps:** update dependency @xterm/xterm to v6 ([#4757](https://github.com/homarr-labs/homarr/issues/4757)) ([fad478c](https://github.com/homarr-labs/homarr/commit/fad478c549cdbc616f921d9b444bff48b59e77a5))
* **deps:** update dependency isomorphic-dompurify to ^2.35.0 ([#4779](https://github.com/homarr-labs/homarr/issues/4779)) ([236fa35](https://github.com/homarr-labs/homarr/commit/236fa35f7e0943be33bba153e7030ce4e3bb204e))
* **deps:** update dependency jotai to ^2.16.1 ([#4772](https://github.com/homarr-labs/homarr/issues/4772)) ([d002700](https://github.com/homarr-labs/homarr/commit/d00270046a041a10c1c540cfa79c1eee477f3303))
* **deps:** update dependency ldapts to v8.0.31 ([#4755](https://github.com/homarr-labs/homarr/issues/4755)) ([8b09693](https://github.com/homarr-labs/homarr/commit/8b096939e4e1da8e98791a8e05f108a136fe2810))
* **deps:** update dependency ldapts to v8.0.32 ([#4762](https://github.com/homarr-labs/homarr/issues/4762)) ([49afb82](https://github.com/homarr-labs/homarr/commit/49afb8244615f67af0586aaacf77a509231ac6dc))
* **deps:** update dependency ldapts to v8.0.34 ([#4765](https://github.com/homarr-labs/homarr/issues/4765)) ([809bf55](https://github.com/homarr-labs/homarr/commit/809bf559fe1b96df9a903dc790d138cad7368adb))
* **deps:** update dependency ldapts to v8.0.35 ([#4768](https://github.com/homarr-labs/homarr/issues/4768)) ([e574dd7](https://github.com/homarr-labs/homarr/commit/e574dd70f1421e9254a289a0f02fd0b4d43e26ad))
* **deps:** update dependency typescript-eslint to ^8.50.1 ([#4758](https://github.com/homarr-labs/homarr/issues/4758)) ([adaa803](https://github.com/homarr-labs/homarr/commit/adaa8039dd545109246ccd9fa15570739f755f62))
* **deps:** update nextjs monorepo to v16.1.1 ([#4759](https://github.com/homarr-labs/homarr/issues/4759)) ([7712ab4](https://github.com/homarr-labs/homarr/commit/7712ab410b5094e5d84df75461e07efdfccc285b))
* **deps:** update tanstack-query monorepo ([#4782](https://github.com/homarr-labs/homarr/issues/4782)) ([1e5d38f](https://github.com/homarr-labs/homarr/commit/1e5d38fd3ca4c68fa4c61b02757a3cff39839fdb))
* **deps:** update testcontainers-node monorepo to ^11.11.0 ([#4781](https://github.com/homarr-labs/homarr/issues/4781)) ([e40a116](https://github.com/homarr-labs/homarr/commit/e40a11608cb21a75e6910028abf97e14b5275f56))
* **deps:** update turbo monorepo to ^2.7.2 ([#4764](https://github.com/homarr-labs/homarr/issues/4764)) ([9191430](https://github.com/homarr-labs/homarr/commit/919143022969350f6ee7be2f53be2fe09a89bba3))
## [1.48.0](https://github.com/homarr-labs/homarr/compare/v1.47.0...v1.48.0) (2025-12-26)
### Features
* enable dns caching by default ([#4706](https://github.com/homarr-labs/homarr/issues/4706)) ([fbb5298](https://github.com/homarr-labs/homarr/commit/fbb5298cb05b12eb2f19c121a1bc103caeb3e576))
* **http:** add proxy support ([#4721](https://github.com/homarr-labs/homarr/issues/4721)) ([5a57115](https://github.com/homarr-labs/homarr/commit/5a57115ca073aea1c75a000fda6a23648c5488e4))
### Bug Fixes
* **deps:** update dependency @t3-oss/env-nextjs to ^0.13.10 ([#4710](https://github.com/homarr-labs/homarr/issues/4710)) ([689523a](https://github.com/homarr-labs/homarr/commit/689523a194ab48bdc072b1cdf65f07ade6cbc584))
* **deps:** update dependency ldapts to v8.0.24 ([#4711](https://github.com/homarr-labs/homarr/issues/4711)) ([648f7e2](https://github.com/homarr-labs/homarr/commit/648f7e2c7743af81f4bced36b7e1e80c21e851e5))
* **deps:** update dependency ldapts to v8.0.25 ([#4724](https://github.com/homarr-labs/homarr/issues/4724)) ([ef12b2b](https://github.com/homarr-labs/homarr/commit/ef12b2b5c2e1131138937fb6da61ce4c167fe0eb))
* **deps:** update dependency ldapts to v8.0.27 ([#4737](https://github.com/homarr-labs/homarr/issues/4737)) ([8891ac4](https://github.com/homarr-labs/homarr/commit/8891ac42399e47fda6efc657b8ff2fe58aebca9e))
* **deps:** update dependency ldapts to v8.0.28 ([#4743](https://github.com/homarr-labs/homarr/issues/4743)) ([75c5453](https://github.com/homarr-labs/homarr/commit/75c545344aae39550917331458c01a894b6a942f))
* **deps:** update dependency ldapts to v8.0.29 ([#4747](https://github.com/homarr-labs/homarr/issues/4747)) ([5dd7400](https://github.com/homarr-labs/homarr/commit/5dd74006843ae72f63e631b14f0fd50c911d610b))
* **deps:** update dependency ldapts to v8.0.30 ([#4749](https://github.com/homarr-labs/homarr/issues/4749)) ([96c2c0d](https://github.com/homarr-labs/homarr/commit/96c2c0d604737c64722fa21bf79965c806bf4da3))
* **deps:** update dependency mysql2 to v3.16.0 ([#4731](https://github.com/homarr-labs/homarr/issues/4731)) ([f34bdce](https://github.com/homarr-labs/homarr/commit/f34bdce6446d4e62b54b96f63e91cfdddd51e901))
* **deps:** update dependency next-intl to v4.6.1 ([#4730](https://github.com/homarr-labs/homarr/issues/4730)) ([f4d782a](https://github.com/homarr-labs/homarr/commit/f4d782abefb78e085ca3fc66034c0ca54fb21120))
* **deps:** update dependency sass to ^1.97.0 ([#4726](https://github.com/homarr-labs/homarr/issues/4726)) ([88baad8](https://github.com/homarr-labs/homarr/commit/88baad8143f4ca830e50644d6bd1d1980ef1da82))
* **deps:** update dependency sass to ^1.97.1 ([#4746](https://github.com/homarr-labs/homarr/issues/4746)) ([6b774f4](https://github.com/homarr-labs/homarr/commit/6b774f47d0a8bf731e7e1837a9d47e0dc53a1ff0))
* **deps:** update dependency typescript-eslint to ^8.50.0 ([#4720](https://github.com/homarr-labs/homarr/issues/4720)) ([2dc8fea](https://github.com/homarr-labs/homarr/commit/2dc8feae7ea6174a1d826d8f0151ddc2c04c6aa6))
* **deps:** update dependency zod to ^4.2.0 ([#4712](https://github.com/homarr-labs/homarr/issues/4712)) ([6e39524](https://github.com/homarr-labs/homarr/commit/6e39524f9d28d201c13738212d238726e1685832))
* **deps:** update dependency zod to ^4.2.1 ([#4722](https://github.com/homarr-labs/homarr/issues/4722)) ([68dc684](https://github.com/homarr-labs/homarr/commit/68dc6844fdee53aca55b44dd7d19bf9d3a35c057))
* **deps:** update nextjs monorepo to v16.1.0 ([#4739](https://github.com/homarr-labs/homarr/issues/4739)) ([99f2842](https://github.com/homarr-labs/homarr/commit/99f2842a5a102056c76ddc68cb5083791f324c3c))
* **deps:** update tiptap monorepo to v3.14.0 ([#4744](https://github.com/homarr-labs/homarr/issues/4744)) ([adbe707](https://github.com/homarr-labs/homarr/commit/adbe707c73f462771c3d21cbbcc21e8245eea6f3))
* **deps:** update trpc monorepo to ^11.8.1 ([#4750](https://github.com/homarr-labs/homarr/issues/4750)) ([93bf9ab](https://github.com/homarr-labs/homarr/commit/93bf9ab84b5387eefb8cc0b03057a4ccf0b13aa9))
* **deps:** update turbo monorepo to ^2.7.0 ([#4745](https://github.com/homarr-labs/homarr/issues/4745)) ([5d659a3](https://github.com/homarr-labs/homarr/commit/5d659a3ebbf79266158cb57236de90e7883e7a4e))
* **deps:** update turbo monorepo to ^2.7.1 ([#4751](https://github.com/homarr-labs/homarr/issues/4751)) ([d8db016](https://github.com/homarr-labs/homarr/commit/d8db0169a142c2ec302806fe946cb17431ccae6b))
## [1.47.0](https://github.com/homarr-labs/homarr/compare/v1.46.0...v1.47.0) (2025-12-19) ## [1.47.0](https://github.com/homarr-labs/homarr/compare/v1.46.0...v1.47.0) (2025-12-19)
### Features ### Features
+5 -5
View File
@@ -2,8 +2,8 @@
* @homarr-labs/maintainers * @homarr-labs/maintainers
# Exempt Renovate‑managed files (no owners) # Exempt Renovate‑managed files (no owners)
package.json package.json @homarr-labs/none
package-lock.json package-lock.json @homarr-labs/none
pnpm-lock.yaml pnpm-lock.yaml @homarr-labs/none
Dockerfile Dockerfile @homarr-labs/none
docker-compose.yml docker-compose.yml @homarr-labs/none
+1
View File
@@ -45,6 +45,7 @@ COPY --from=builder /app/apps/nextjs/package.json .
COPY --from=builder /app/apps/tasks/tasks.cjs ./apps/tasks/tasks.cjs COPY --from=builder /app/apps/tasks/tasks.cjs ./apps/tasks/tasks.cjs
COPY --from=builder /app/apps/websocket/wssServer.cjs ./apps/websocket/wssServer.cjs COPY --from=builder /app/apps/websocket/wssServer.cjs ./apps/websocket/wssServer.cjs
COPY --from=builder /app/node_modules/better-sqlite3/build/Release/better_sqlite3.node /app/build/better_sqlite3.node
COPY --from=builder /app/packages/db/migrations ./db/migrations COPY --from=builder /app/packages/db/migrations ./db/migrations
+24 -23
View File
@@ -48,55 +48,56 @@
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"@homarr/widgets": "workspace:^0.1.0", "@homarr/widgets": "workspace:^0.1.0",
"@mantine/colors-generator": "^8.3.12", "@mantine/colors-generator": "^8.3.10",
"@mantine/core": "^8.3.12", "@mantine/core": "^8.3.10",
"@mantine/dropzone": "^8.3.12", "@mantine/dropzone": "^8.3.10",
"@mantine/hooks": "^8.3.12", "@mantine/hooks": "^8.3.10",
"@mantine/modals": "^8.3.12", "@mantine/modals": "^8.3.10",
"@mantine/tiptap": "^8.3.12", "@mantine/tiptap": "^8.3.10",
"@million/lint": "1.0.14", "@million/lint": "1.0.14",
"@tabler/icons-react": "^3.36.1", "@tabler/icons-react": "^3.35.0",
"@tanstack/react-query": "^5.90.16", "@tanstack/react-query": "^5.90.12",
"@tanstack/react-query-devtools": "^5.91.2", "@tanstack/react-query-devtools": "^5.91.1",
"@tanstack/react-query-next-experimental": "^5.91.0", "@tanstack/react-query-next-experimental": "^5.91.0",
"@trpc/client": "^11.8.1", "@trpc/client": "^11.8.0",
"@trpc/next": "^11.8.1", "@trpc/next": "^11.8.0",
"@trpc/react-query": "^11.8.1", "@trpc/react-query": "^11.8.0",
"@trpc/server": "^11.8.1", "@trpc/server": "^11.8.0",
"@xterm/addon-canvas": "^0.7.0", "@xterm/addon-canvas": "^0.7.0",
"@xterm/addon-fit": "0.11.0", "@xterm/addon-fit": "0.10.0",
"@xterm/xterm": "^6.0.0", "@xterm/xterm": "^5.5.0",
"babel-plugin-react-compiler": "^1.0.0", "babel-plugin-react-compiler": "^1.0.0",
"chroma-js": "^3.2.0", "chroma-js": "^3.2.0",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"drizzle-orm": "^0.45.1",
"flag-icons": "^7.5.0", "flag-icons": "^7.5.0",
"glob": "^13.0.0", "glob": "^13.0.0",
"isomorphic-dompurify": "^2.35.0", "isomorphic-dompurify": "^2.34.0",
"jotai": "^2.16.1", "jotai": "^2.16.0",
"mantine-react-table": "2.0.0-beta.9", "mantine-react-table": "2.0.0-beta.9",
"next": "16.1.1", "next": "16.0.10",
"postcss-preset-mantine": "^1.18.0", "postcss-preset-mantine": "^1.18.0",
"prismjs": "^1.30.0", "prismjs": "^1.30.0",
"react": "19.2.3", "react": "19.2.3",
"react-dom": "19.2.3", "react-dom": "19.2.3",
"react-error-boundary": "^6.0.3", "react-error-boundary": "^6.0.0",
"react-simple-code-editor": "^0.14.1", "react-simple-code-editor": "^0.14.1",
"sass": "^1.97.2", "sass": "^1.96.0",
"superjson": "2.2.6", "superjson": "2.2.6",
"swagger-ui-react": "^5.31.0", "swagger-ui-react": "^5.31.0",
"use-deep-compare-effect": "^1.8.1", "use-deep-compare-effect": "^1.8.1",
"zod": "^4.2.1" "zod": "^4.2.0"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/chroma-js": "3.1.2", "@types/chroma-js": "3.1.2",
"@types/node": "^24.10.7", "@types/node": "^24.10.4",
"@types/prismjs": "^1.26.5", "@types/prismjs": "^1.26.5",
"@types/react": "19.2.8", "@types/react": "19.2.7",
"@types/react-dom": "19.2.3", "@types/react-dom": "19.2.3",
"@types/swagger-ui-react": "^5.18.0", "@types/swagger-ui-react": "^5.18.0",
"concurrently": "^9.2.1", "concurrently": "^9.2.1",
@@ -1,9 +1,10 @@
import { notFound } from "next/navigation"; import { notFound } from "next/navigation";
import { Card, Center, Stack, Text, Title } from "@mantine/core"; import { Card, Center, Stack, Text, Title } from "@mantine/core";
import { and, eq } from "drizzle-orm";
import { auth } from "@homarr/auth/next"; import { auth } from "@homarr/auth/next";
import { isProviderEnabled } from "@homarr/auth/server"; import { isProviderEnabled } from "@homarr/auth/server";
import { and, db, eq } from "@homarr/db"; import { db } from "@homarr/db";
import { invites } from "@homarr/db/schema"; import { invites } from "@homarr/db/schema";
import { getScopedI18n } from "@homarr/translation/server"; import { getScopedI18n } from "@homarr/translation/server";
-1
View File
@@ -106,7 +106,6 @@ export default async function Layout(props: {
forceDisableStatus: serverSettings.board.forceDisableStatus, forceDisableStatus: serverSettings.board.forceDisableStatus,
}, },
search: { defaultSearchEngineId: serverSettings.search.defaultSearchEngineId }, search: { defaultSearchEngineId: serverSettings.search.defaultSearchEngineId },
user: { enableGravatar: serverSettings.user.enableGravatar },
}} }}
{...innerProps} {...innerProps}
/> />
@@ -1,26 +0,0 @@
"use client";
import { Switch } from "@mantine/core";
import type { ServerSettings } from "@homarr/server-settings";
import { useScopedI18n } from "@homarr/translation/client";
import { CommonSettingsForm } from "./common-form";
export const UserSettingsForm = ({ defaultValues }: { defaultValues: ServerSettings["user"] }) => {
const tUser = useScopedI18n("management.page.settings.section.user");
return (
<CommonSettingsForm settingKey="user" defaultValues={defaultValues}>
{(form) => (
<>
<Switch
{...form.getInputProps("enableGravatar", { type: "checkbox" })}
label={tUser("enableGravatar.label")}
description={tUser("enableGravatar.description")}
/>
</>
)}
</CommonSettingsForm>
);
};
@@ -12,7 +12,6 @@ import { AppearanceSettingsForm } from "./_components/appearance-settings-form";
import { BoardSettingsForm } from "./_components/board-settings-form"; import { BoardSettingsForm } from "./_components/board-settings-form";
import { CultureSettingsForm } from "./_components/culture-settings-form"; import { CultureSettingsForm } from "./_components/culture-settings-form";
import { SearchSettingsForm } from "./_components/search-settings-form"; import { SearchSettingsForm } from "./_components/search-settings-form";
import { UserSettingsForm } from "./_components/user-settings-form";
export async function generateMetadata() { export async function generateMetadata() {
const t = await getScopedI18n("management"); const t = await getScopedI18n("management");
@@ -43,10 +42,6 @@ export default async function SettingsPage() {
<Title order={2}>{tSettings("section.board.title")}</Title> <Title order={2}>{tSettings("section.board.title")}</Title>
<BoardSettingsForm defaultValues={serverSettings.board} /> <BoardSettingsForm defaultValues={serverSettings.board} />
</Stack> </Stack>
<Stack>
<Title order={2}>{tSettings("section.user.title")}</Title>
<UserSettingsForm defaultValues={serverSettings.user} />
</Stack>
<Stack> <Stack>
<Title order={2}>{tSettings("section.search.title")}</Title> <Title order={2}>{tSettings("section.search.title")}</Title>
<SearchSettingsForm defaultValues={serverSettings.search} /> <SearchSettingsForm defaultValues={serverSettings.search} />
@@ -76,7 +76,6 @@ const createColumns = (
accessorKey: "ports", accessorKey: "ports",
header: t("docker.field.ports.label"), header: t("docker.field.ports.label"),
Cell({ cell }) { Cell({ cell }) {
if (!cell.row.original.ports.length) return null;
return ( return (
<OverflowBadge overflowCount={1} data={cell.row.original.ports.map((port) => port.PrivatePort.toString())} /> <OverflowBadge overflowCount={1} data={cell.row.original.ports.map((port) => port.PrivatePort.toString())} />
); );
@@ -200,10 +200,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
<Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}> <Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
<Card p="xl" shadow="md" withBorder> <Card p="xl" shadow="md" withBorder>
<Stack maw={300} align="center" mx="auto"> <Stack maw={300} align="center" mx="auto">
<UserAvatar <UserAvatar size="xl" user={{ name: generalForm.values.username, image: null }} />
size="xl"
user={{ name: generalForm.values.username, email: generalForm.values.email ?? null, image: null }}
/>
<Text tt="uppercase" fw="bolder" size="xl"> <Text tt="uppercase" fw="bolder" size="xl">
{generalForm.values.username} {generalForm.values.username}
</Text> </Text>
@@ -1,8 +1,9 @@
import { notFound } from "next/navigation"; import { notFound } from "next/navigation";
import { inArray } from "drizzle-orm";
import { auth } from "@homarr/auth/next"; import { auth } from "@homarr/auth/next";
import { isProviderEnabled } from "@homarr/auth/server"; import { isProviderEnabled } from "@homarr/auth/server";
import { db, inArray } from "@homarr/db"; import { db } from "@homarr/db";
import { groups } from "@homarr/db/schema"; import { groups } from "@homarr/db/schema";
import { everyoneGroup } from "@homarr/definitions"; import { everyoneGroup } from "@homarr/definitions";
import { getScopedI18n } from "@homarr/translation/server"; import { getScopedI18n } from "@homarr/translation/server";
@@ -44,7 +44,7 @@ export default async function GroupsDetailPage(props: GroupsDetailPageProps) {
<Card> <Card>
{group.owner ? ( {group.owner ? (
<Group> <Group>
<UserAvatar user={group.owner} size={"lg"} /> <UserAvatar user={{ name: group.owner.name, image: group.owner.image }} size={"lg"} />
<Stack align={"start"} gap={3}> <Stack align={"start"} gap={3}>
<Text fw={"bold"}>{group.owner.name}</Text> <Text fw={"bold"}>{group.owner.name}</Text>
<Text>{group.owner.email}</Text> <Text>{group.owner.email}</Text>
+69 -10
View File
@@ -1,26 +1,24 @@
import type { NextRequest } from "next/server"; import type { NextRequest } from "next/server";
import { userAgent } from "next/server"; import { userAgent } from "next/server";
import { eq } from "drizzle-orm";
import { createOpenApiFetchHandler } from "trpc-to-openapi"; import { createOpenApiFetchHandler } from "trpc-to-openapi";
import { appRouter, createTRPCContext } from "@homarr/api"; import { appRouter, createTRPCContext } from "@homarr/api";
import { API_KEY_HEADER_NAME, getSessionFromApiKeyAsync } from "@homarr/auth/api-key"; import type { Session } from "@homarr/auth";
import { ipAddressFromHeaders } from "@homarr/common/server"; import { hashPasswordAsync } from "@homarr/auth";
import { createSessionAsync } from "@homarr/auth/server";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error"; import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
import { db } from "@homarr/db"; import { db } from "@homarr/db";
import { apiKeys } from "@homarr/db/schema";
const logger = createLogger({ module: "trpcOpenApiRoute" }); const logger = createLogger({ module: "trpcOpenApiRoute" });
const handlerAsync = async (req: NextRequest) => { const handlerAsync = async (req: NextRequest) => {
const apiKeyHeaderValue = req.headers.get(API_KEY_HEADER_NAME); const apiKeyHeaderValue = req.headers.get("ApiKey");
const ipAddress = ipAddressFromHeaders(req.headers); const ipAddress = req.headers.get("x-forwarded-for");
const { ua } = userAgent(req); const { ua } = userAgent(req);
const session: Session | null = await getSessionOrDefaultFromHeadersAsync(apiKeyHeaderValue, ipAddress, ua);
logger.info(
`Creating OpenAPI fetch handler for user ${apiKeyHeaderValue ? "with an api key" : "without an api key"}`,
);
const session = await getSessionFromApiKeyAsync(db, apiKeyHeaderValue, ipAddress, ua);
// Fallback to JSON if no content type is set // Fallback to JSON if no content type is set
if (!req.headers.has("Content-Type")) { if (!req.headers.has("Content-Type")) {
@@ -38,6 +36,67 @@ const handlerAsync = async (req: NextRequest) => {
}); });
}; };
const getSessionOrDefaultFromHeadersAsync = async (
apiKeyHeaderValue: string | null,
ipAdress: string | null,
userAgent: string,
): Promise<Session | null> => {
logger.info(
`Creating OpenAPI fetch handler for user ${apiKeyHeaderValue ? "with an api key" : "without an api key"}`,
);
if (apiKeyHeaderValue === null) {
return null;
}
const [apiKeyId, apiKey] = apiKeyHeaderValue.split(".");
if (!apiKeyId || !apiKey) {
logger.warn("An attempt to authenticate over API has failed due to invalid API key format", {
ipAdress,
userAgent,
});
return null;
}
const apiKeyFromDb = await db.query.apiKeys.findFirst({
where: eq(apiKeys.id, apiKeyId),
columns: {
id: true,
apiKey: true,
salt: true,
},
with: {
user: {
columns: {
id: true,
name: true,
email: true,
emailVerified: true,
},
},
},
});
if (!apiKeyFromDb) {
logger.warn("An attempt to authenticate over API has failed", { ipAdress, userAgent });
return null;
}
const hashedApiKey = await hashPasswordAsync(apiKey, apiKeyFromDb.salt);
if (apiKeyFromDb.apiKey !== hashedApiKey) {
logger.warn("An attempt to authenticate over API has failed", { ipAdress, userAgent });
return null;
}
logger.info("Read session from API request and found user", {
name: apiKeyFromDb.user.name,
id: apiKeyFromDb.user.id,
});
return await createSessionAsync(db, apiKeyFromDb.user);
};
export { export {
handlerAsync as DELETE, handlerAsync as DELETE,
handlerAsync as GET, handlerAsync as GET,
+1 -14
View File
@@ -1,14 +1,10 @@
import { userAgent } from "next/server";
import { fetchRequestHandler } from "@trpc/server/adapters/fetch"; import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
import { appRouter, createTRPCContext } from "@homarr/api"; import { appRouter, createTRPCContext } from "@homarr/api";
import { trpcPath } from "@homarr/api/shared"; import { trpcPath } from "@homarr/api/shared";
import { API_KEY_HEADER_NAME, getSessionFromApiKeyAsync } from "@homarr/auth/api-key";
import { auth } from "@homarr/auth/next"; import { auth } from "@homarr/auth/next";
import { ipAddressFromHeaders } from "@homarr/common/server";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error"; import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
import { db } from "@homarr/db";
const logger = createLogger({ module: "trpcRoute" }); const logger = createLogger({ module: "trpcRoute" });
@@ -32,20 +28,11 @@ export function OPTIONS() {
} }
const handler = auth(async (req) => { const handler = auth(async (req) => {
// Try API key auth first, fall back to session cookie
const apiKeyHeader = req.headers.get(API_KEY_HEADER_NAME);
const ipAddress = ipAddressFromHeaders(req.headers);
const { ua } = userAgent(req);
const apiKeySession = await getSessionFromApiKeyAsync(db, apiKeyHeader, ipAddress, ua);
const session = apiKeySession ?? req.auth;
const response = await fetchRequestHandler({ const response = await fetchRequestHandler({
endpoint: trpcPath, endpoint: trpcPath,
router: appRouter, router: appRouter,
req, req,
createContext: () => createTRPCContext({ session, headers: req.headers }), createContext: () => createTRPCContext({ session: req.auth, headers: req.headers }),
onError({ error, path, type }) { onError({ error, path, type }) {
logger.error(new ErrorWithMetadata("tRPC Error occured", { path, type }, { cause: error })); logger.error(new ErrorWithMetadata("tRPC Error occured", { path, type }, { cause: error }));
}, },
@@ -1,9 +1,10 @@
import { notFound } from "next/navigation"; import { notFound } from "next/navigation";
import { NextResponse } from "next/server"; import { NextResponse } from "next/server";
import type { NextRequest } from "next/server"; import type { NextRequest } from "next/server";
import { eq } from "drizzle-orm";
import DOMPurify from "isomorphic-dompurify"; import DOMPurify from "isomorphic-dompurify";
import { db, eq } from "@homarr/db"; import { db } from "@homarr/db";
import { medias } from "@homarr/db/schema"; import { medias } from "@homarr/db/schema";
export async function GET(_req: NextRequest, props: { params: Promise<{ id: string }> }) { export async function GET(_req: NextRequest, props: { params: Promise<{ id: string }> }) {
@@ -26,7 +26,6 @@ interface UserAccessPermission<TPermission extends string> {
user: { user: {
name: string | null; name: string | null;
image: string | null; image: string | null;
email: string | null;
id: string; id: string;
}; };
} }
@@ -67,7 +66,6 @@ interface Props<TPermission extends string> {
id: string; id: string;
name: string | null; name: string | null;
image: string | null; image: string | null;
email: string | null;
} | null; } | null;
}; };
translate: (key: TPermission) => string; translate: (key: TPermission) => string;
@@ -1,6 +1,5 @@
import { createContext, useContext } from "react"; import { createContext, useContext } from "react";
import type { TablerIcon } from "@tabler/icons-react";
import type { TablerIcon } from "@homarr/ui";
const AccessContext = createContext<{ const AccessContext = createContext<{
permissions: readonly string[]; permissions: readonly string[];
@@ -21,7 +21,6 @@ export interface FormProps<TPermission extends string> {
id: string; id: string;
name: string | null; name: string | null;
image: string | null; image: string | null;
email: string | null;
} | null; } | null;
}; };
accessQueryData: AccessQueryData<TPermission>; accessQueryData: AccessQueryData<TPermission>;
@@ -119,7 +118,6 @@ interface UserItemContentProps {
id: string; id: string;
name: string | null; name: string | null;
image: string | null; image: string | null;
email: string | null;
}; };
} }
@@ -13,7 +13,7 @@ import { UserAvatar } from "@homarr/ui";
interface InnerProps { interface InnerProps {
presentUserIds: string[]; presentUserIds: string[];
excludeExternalProviders?: boolean; excludeExternalProviders?: boolean;
onSelect: (props: { id: string; name: string; image: string; email: string | null }) => void | Promise<void>; onSelect: (props: { id: string; name: string; image: string }) => void | Promise<void>;
confirmLabel?: string; confirmLabel?: string;
} }
@@ -36,7 +36,6 @@ export const UserSelectModal = createModal<InnerProps>(({ actions, innerProps })
id: currentUser.id, id: currentUser.id,
name: currentUser.name ?? "", name: currentUser.name ?? "",
image: currentUser.image ?? "", image: currentUser.image ?? "",
email: currentUser.email ?? null,
}); });
setLoading(false); setLoading(false);
@@ -34,7 +34,6 @@ export class BoardMockBuilder {
id: createId(), id: createId(),
image: null, image: null,
name: "User", name: "User",
email: null,
}, },
groupPermissions: [], groupPermissions: [],
userPermissions: [], userPermissions: [],
+1 -2
View File
@@ -1,6 +1,5 @@
import { Anchor, Card, Stack, Text } from "@mantine/core"; import { Anchor, Card, Stack, Text } from "@mantine/core";
import type { TablerIcon } from "@tabler/icons-react";
import type { TablerIcon } from "@homarr/ui";
interface NoResultsProps { interface NoResultsProps {
icon: TablerIcon; icon: TablerIcon;
+8 -12
View File
@@ -3,21 +3,17 @@ import type { MantineSize } from "@mantine/core";
import { auth } from "@homarr/auth/next"; import { auth } from "@homarr/auth/next";
import { UserAvatar } from "@homarr/ui"; import { UserAvatar } from "@homarr/ui";
interface CurrentUserAvatarProps { interface UserAvatarProps {
size: MantineSize; size: MantineSize;
} }
export const CurrentUserAvatar = async ({ size }: CurrentUserAvatarProps) => { export const CurrentUserAvatar = async ({ size }: UserAvatarProps) => {
const currentSession = await auth(); const currentSession = await auth();
return ( const user = {
<UserAvatar name: currentSession?.user.name ?? null,
user={{ image: currentSession?.user.image ?? null,
name: currentSession?.user.name ?? null, };
image: currentSession?.user.image ?? null,
email: currentSession?.user.email ?? null, return <UserAvatar user={user} size={size} />;
}}
size={size}
/>
);
}; };
+4 -3
View File
@@ -39,17 +39,18 @@
"@homarr/widgets": "workspace:^0.1.0", "@homarr/widgets": "workspace:^0.1.0",
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"drizzle-orm": "^0.45.1",
"fastify": "^5.6.2", "fastify": "^5.6.2",
"superjson": "2.2.6", "superjson": "2.2.6",
"undici": "7.18.2" "undici": "7.16.0"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/node": "^24.10.7", "@types/node": "^24.10.4",
"dotenv-cli": "^11.0.0", "dotenv-cli": "^11.0.0",
"esbuild": "^0.27.2", "esbuild": "^0.27.1",
"eslint": "^9.39.2", "eslint": "^9.39.2",
"prettier": "^3.7.4", "prettier": "^3.7.4",
"tsx": "4.20.4", "tsx": "4.20.4",
+3 -2
View File
@@ -1,10 +1,11 @@
import type { InferInsertModel } from "drizzle-orm";
import { eq } from "drizzle-orm";
import { schedule, validate as validateCron } from "node-cron"; import { schedule, validate as validateCron } from "node-cron";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import type { IJobManager } from "@homarr/cron-job-api"; import type { IJobManager } from "@homarr/cron-job-api";
import type { jobGroup as cronJobGroup, JobGroupKeys } from "@homarr/cron-jobs"; import type { jobGroup as cronJobGroup, JobGroupKeys } from "@homarr/cron-jobs";
import type { Database, InferInsertModel } from "@homarr/db"; import type { Database } from "@homarr/db";
import { eq } from "@homarr/db";
import { cronJobConfigurations } from "@homarr/db/schema"; import { cronJobConfigurations } from "@homarr/db/schema";
const logger = createLogger({ module: "jobManager" }); const logger = createLogger({ module: "jobManager" });
+3 -1
View File
@@ -1,6 +1,8 @@
import { eq, inArray } from "drizzle-orm";
import { env } from "@homarr/auth/env"; import { env } from "@homarr/auth/env";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { db, eq, inArray } from "@homarr/db"; import { db } from "@homarr/db";
import { sessions, users } from "@homarr/db/schema"; import { sessions, users } from "@homarr/db/schema";
import { supportedAuthProviders } from "@homarr/definitions"; import { supportedAuthProviders } from "@homarr/definitions";
+2 -2
View File
@@ -27,14 +27,14 @@
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"tsx": "4.20.4", "tsx": "4.20.4",
"ws": "^8.19.0" "ws": "^8.18.3"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/ws": "^8.18.1", "@types/ws": "^8.18.1",
"esbuild": "^0.27.2", "esbuild": "^0.27.1",
"eslint": "^9.39.2", "eslint": "^9.39.2",
"prettier": "^3.7.4", "prettier": "^3.7.4",
"typescript": "^5.9.3" "typescript": "^5.9.3"
+6
View File
@@ -0,0 +1,6 @@
FROM node:24.12.0-trixie AS base
WORKDIR /app
COPY package.json .
COPY pnpm-lock.yaml .
RUN corepack enable pnpm && pnpm install --frozen-lockfile
CMD ["sleep", "60s"]
+17
View File
@@ -0,0 +1,17 @@
{
"name": "homarr-prebuilt-debian",
"private": true,
"dependencies": {
"better-sqlite3": "^12.5.0"
},
"packageManager": "pnpm@10.26.0",
"engines": {
"node": ">=24.12.0",
"pnpm": ">=10.26.0"
},
"pnpm": {
"onlyBuiltDependencies": [
"better-sqlite3"
]
}
}
+286
View File
@@ -0,0 +1,286 @@
lockfileVersion: '9.0'
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
importers:
.:
dependencies:
better-sqlite3:
specifier: ^12.5.0
version: 12.5.0
packages:
base64-js@1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
better-sqlite3@12.5.0:
resolution: {integrity: sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg==}
engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
bindings@1.5.0:
resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
bl@4.1.0:
resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
buffer@5.7.1:
resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
chownr@1.1.4:
resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
decompress-response@6.0.0:
resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
engines: {node: '>=10'}
deep-extend@0.6.0:
resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
engines: {node: '>=4.0.0'}
detect-libc@2.1.2:
resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
engines: {node: '>=8'}
end-of-stream@1.4.5:
resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
expand-template@2.0.3:
resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
engines: {node: '>=6'}
file-uri-to-path@1.0.0:
resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
fs-constants@1.0.0:
resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
github-from-package@0.0.0:
resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
ieee754@1.2.1:
resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
inherits@2.0.4:
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
ini@1.3.8:
resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
mimic-response@3.1.0:
resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
engines: {node: '>=10'}
minimist@1.2.8:
resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
mkdirp-classic@0.5.3:
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
napi-build-utils@2.0.0:
resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
node-abi@3.85.0:
resolution: {integrity: sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg==}
engines: {node: '>=10'}
once@1.4.0:
resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
prebuild-install@7.1.3:
resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
engines: {node: '>=10'}
hasBin: true
pump@3.0.3:
resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
rc@1.2.8:
resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
hasBin: true
readable-stream@3.6.2:
resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
engines: {node: '>= 6'}
safe-buffer@5.2.1:
resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
semver@7.7.3:
resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
engines: {node: '>=10'}
hasBin: true
simple-concat@1.0.1:
resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
simple-get@4.0.1:
resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
string_decoder@1.3.0:
resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
strip-json-comments@2.0.1:
resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
engines: {node: '>=0.10.0'}
tar-fs@2.1.4:
resolution: {integrity: sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==}
tar-stream@2.2.0:
resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
engines: {node: '>=6'}
tunnel-agent@0.6.0:
resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
util-deprecate@1.0.2:
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
wrappy@1.0.2:
resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
snapshots:
base64-js@1.5.1: {}
better-sqlite3@12.5.0:
dependencies:
bindings: 1.5.0
prebuild-install: 7.1.3
bindings@1.5.0:
dependencies:
file-uri-to-path: 1.0.0
bl@4.1.0:
dependencies:
buffer: 5.7.1
inherits: 2.0.4
readable-stream: 3.6.2
buffer@5.7.1:
dependencies:
base64-js: 1.5.1
ieee754: 1.2.1
chownr@1.1.4: {}
decompress-response@6.0.0:
dependencies:
mimic-response: 3.1.0
deep-extend@0.6.0: {}
detect-libc@2.1.2: {}
end-of-stream@1.4.5:
dependencies:
once: 1.4.0
expand-template@2.0.3: {}
file-uri-to-path@1.0.0: {}
fs-constants@1.0.0: {}
github-from-package@0.0.0: {}
ieee754@1.2.1: {}
inherits@2.0.4: {}
ini@1.3.8: {}
mimic-response@3.1.0: {}
minimist@1.2.8: {}
mkdirp-classic@0.5.3: {}
napi-build-utils@2.0.0: {}
node-abi@3.85.0:
dependencies:
semver: 7.7.3
once@1.4.0:
dependencies:
wrappy: 1.0.2
prebuild-install@7.1.3:
dependencies:
detect-libc: 2.1.2
expand-template: 2.0.3
github-from-package: 0.0.0
minimist: 1.2.8
mkdirp-classic: 0.5.3
napi-build-utils: 2.0.0
node-abi: 3.85.0
pump: 3.0.3
rc: 1.2.8
simple-get: 4.0.1
tar-fs: 2.1.4
tunnel-agent: 0.6.0
pump@3.0.3:
dependencies:
end-of-stream: 1.4.5
once: 1.4.0
rc@1.2.8:
dependencies:
deep-extend: 0.6.0
ini: 1.3.8
minimist: 1.2.8
strip-json-comments: 2.0.1
readable-stream@3.6.2:
dependencies:
inherits: 2.0.4
string_decoder: 1.3.0
util-deprecate: 1.0.2
safe-buffer@5.2.1: {}
semver@7.7.3: {}
simple-concat@1.0.1: {}
simple-get@4.0.1:
dependencies:
decompress-response: 6.0.0
once: 1.4.0
simple-concat: 1.0.1
string_decoder@1.3.0:
dependencies:
safe-buffer: 5.2.1
strip-json-comments@2.0.1: {}
tar-fs@2.1.4:
dependencies:
chownr: 1.1.4
mkdirp-classic: 0.5.3
pump: 3.0.3
tar-stream: 2.2.0
tar-stream@2.2.0:
dependencies:
bl: 4.1.0
end-of-stream: 1.4.5
fs-constants: 1.0.0
inherits: 2.0.4
readable-stream: 3.6.2
tunnel-agent@0.6.0:
dependencies:
safe-buffer: 5.2.1
util-deprecate@1.0.2: {}
wrappy@1.0.2: {}
-7
View File
@@ -314,13 +314,6 @@
<br/> <br/>
<p align="center">Unifi<br/>Controller</p> <p align="center">Unifi<br/>Controller</p>
</a> </a>
</td>
<td align="center">
<a href="https://homarr.dev/docs/integrations/unraid" target="_blank" rel="noreferrer noopener">
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/unraid.svg" alt="Unraid" width="90" height="90" />
<br/>
<p align="center">Unraid</p>
</a>
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
+5 -8
View File
@@ -1,9 +1,9 @@
import { mkdir } from "fs/promises"; import { mkdir } from "fs/promises";
import path from "path"; import path from "path";
import { createClient } from "@libsql/client/node";
import { createId } from "@paralleldrive/cuid2"; import { createId } from "@paralleldrive/cuid2";
import { drizzle, LibSQLDatabase } from "drizzle-orm/libsql"; import Database from "better-sqlite3";
import { migrate } from "drizzle-orm/libsql/migrator"; import { BetterSQLite3Database, drizzle } from "drizzle-orm/better-sqlite3";
import { migrate } from "drizzle-orm/better-sqlite3/migrator";
import { DB_CASING } from "../../packages/core/src/infrastructure/db/constants"; import { DB_CASING } from "../../packages/core/src/infrastructure/db/constants";
import * as sqliteSchema from "../../packages/db/schema/sqlite"; import * as sqliteSchema from "../../packages/db/schema/sqlite";
@@ -14,10 +14,7 @@ export const createSqliteDbFileAsync = async () => {
const localDbUrl = path.join(localMountPath, "db", "db.sqlite"); const localDbUrl = path.join(localMountPath, "db", "db.sqlite");
const connection = createClient({ const connection = new Database(localDbUrl);
url: `file:${localDbUrl}`,
});
const db = drizzle(connection, { const db = drizzle(connection, {
schema: sqliteSchema, schema: sqliteSchema,
casing: DB_CASING, casing: DB_CASING,
@@ -33,4 +30,4 @@ export const createSqliteDbFileAsync = async () => {
}; };
}; };
export type SqliteDatabase = LibSQLDatabase<typeof sqliteSchema>; export type SqliteDatabase = BetterSQLite3Database<typeof sqliteSchema>;
+20 -19
View File
@@ -1,6 +1,6 @@
{ {
"name": "homarr", "name": "homarr",
"version": "1.50.1", "version": "1.47.0",
"private": true, "private": true,
"scripts": { "scripts": {
"build": "cross-env CI=true turbo build", "build": "cross-env CI=true turbo build",
@@ -42,32 +42,33 @@
"@semantic-release/github": "^12.0.2", "@semantic-release/github": "^12.0.2",
"@semantic-release/npm": "^13.1.3", "@semantic-release/npm": "^13.1.3",
"@semantic-release/release-notes-generator": "^14.1.0", "@semantic-release/release-notes-generator": "^14.1.0",
"@testcontainers/redis": "^11.11.0", "@testcontainers/redis": "^11.10.0",
"@turbo/gen": "^2.7.4", "@turbo/gen": "^2.6.3",
"@vitejs/plugin-react": "^5.1.2", "@vitejs/plugin-react": "^5.1.2",
"@vitest/coverage-v8": "^4.0.17", "@vitest/coverage-v8": "^4.0.15",
"@vitest/ui": "^4.0.17", "@vitest/ui": "^4.0.15",
"conventional-changelog-conventionalcommits": "^9.1.0", "conventional-changelog-conventionalcommits": "^9.1.0",
"cross-env": "^10.1.0", "cross-env": "^10.1.0",
"jsdom": "^27.4.0", "jsdom": "^27.3.0",
"json5": "^2.2.3", "json5": "^2.2.3",
"prettier": "^3.7.4", "prettier": "^3.7.4",
"semantic-release": "^25.0.2", "semantic-release": "^25.0.2",
"testcontainers": "^11.11.0", "testcontainers": "^11.10.0",
"turbo": "^2.7.4", "turbo": "^2.6.3",
"typescript": "^5.9.3", "typescript": "^5.9.3",
"vite-tsconfig-paths": "^6.0.4", "vite-tsconfig-paths": "^5.1.4",
"vitest": "^4.0.17" "vitest": "^4.0.15"
}, },
"packageManager": "pnpm@10.28.0", "packageManager": "pnpm@10.26.0",
"engines": { "engines": {
"node": ">=24.12.0", "node": ">=24.12.0",
"pnpm": ">=10.28.0" "pnpm": ">=10.26.0"
}, },
"pnpm": { "pnpm": {
"onlyBuiltDependencies": [ "onlyBuiltDependencies": [
"@tree-sitter-grammars/tree-sitter-yaml", "@tree-sitter-grammars/tree-sitter-yaml",
"bcrypt", "bcrypt",
"better-sqlite3",
"cpu-features", "cpu-features",
"esbuild", "esbuild",
"sharp", "sharp",
@@ -76,25 +77,25 @@
"tree-sitter-json" "tree-sitter-json"
], ],
"overrides": { "overrides": {
"@babel/helpers@<7.26.10": ">=7.28.6", "@babel/helpers@<7.26.10": ">=7.28.4",
"@babel/runtime@<7.26.10": ">=7.28.6", "@babel/runtime@<7.26.10": ">=7.28.4",
"axios@>=1.0.0 <1.8.2": ">=1.13.2", "axios@>=1.0.0 <1.8.2": ">=1.13.2",
"brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1", "brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1",
"brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1", "brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1",
"esbuild@<=0.24.2": ">=0.27.2", "esbuild@<=0.24.2": ">=0.27.1",
"form-data@>=4.0.0 <4.0.4": ">=4.0.5", "form-data@>=4.0.0 <4.0.4": ">=4.0.5",
"hono@<4.6.5": ">=4.11.4", "hono@<4.6.5": ">=4.11.1",
"linkifyjs@<4.3.2": ">=4.3.2", "linkifyjs@<4.3.2": ">=4.3.2",
"nanoid@>=4.0.0 <5.0.9": ">=5.1.6", "nanoid@>=4.0.0 <5.0.9": ">=5.1.6",
"prismjs@<1.30.0": ">=1.30.0", "prismjs@<1.30.0": ">=1.30.0",
"proxmox-api>undici": "7.18.2", "proxmox-api>undici": "7.16.0",
"react-is": "^19.2.3", "react-is": "^19.2.3",
"rollup@>=4.0.0 <4.22.4": ">=4.55.1", "rollup@>=4.0.0 <4.22.4": ">=4.53.4",
"sha.js@<=2.4.11": ">=2.4.12", "sha.js@<=2.4.11": ">=2.4.12",
"tar-fs@>=3.0.0 <3.0.9": ">=3.1.1", "tar-fs@>=3.0.0 <3.0.9": ">=3.1.1",
"tar-fs@>=2.0.0 <2.1.3": ">=3.1.1", "tar-fs@>=2.0.0 <2.1.3": ">=3.1.1",
"tmp@<=0.2.3": ">=0.2.5", "tmp@<=0.2.3": ">=0.2.5",
"vite@>=5.0.0 <=5.4.18": ">=7.3.1" "vite@>=5.0.0 <=5.4.18": ">=7.3.0"
}, },
"patchedDependencies": { "patchedDependencies": {
"@types/node-unifi": "patches/@types__node-unifi.patch", "@types/node-unifi": "patches/@types__node-unifi.patch",
+1
View File
@@ -26,6 +26,7 @@
"@homarr/db": "workspace:^0.1.0", "@homarr/db": "workspace:^0.1.0",
"@homarr/server-settings": "workspace:^0.1.0", "@homarr/server-settings": "workspace:^0.1.0",
"@umami/node": "^0.4.0", "@umami/node": "^0.4.0",
"drizzle-orm": "^0.45.1",
"superjson": "2.2.6" "superjson": "2.2.6"
}, },
"devDependencies": { "devDependencies": {
@@ -1,8 +1,9 @@
import type { UmamiEventData } from "@umami/node"; import type { UmamiEventData } from "@umami/node";
import { Umami } from "@umami/node"; import { Umami } from "@umami/node";
import { count } from "drizzle-orm";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { count, db } from "@homarr/db"; import { db } from "@homarr/db";
import { getServerSettingByKeyAsync } from "@homarr/db/queries"; import { getServerSettingByKeyAsync } from "@homarr/db/queries";
import { integrations, items, users } from "@homarr/db/schema"; import { integrations, items, users } from "@homarr/db/schema";
import type { defaultServerSettings } from "@homarr/server-settings"; import type { defaultServerSettings } from "@homarr/server-settings";
+8 -7
View File
@@ -41,18 +41,19 @@
"@homarr/translation": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"@kubernetes/client-node": "^1.4.0", "@kubernetes/client-node": "^1.4.0",
"@tanstack/react-query": "^5.90.16", "@tanstack/react-query": "^5.90.12",
"@trpc/client": "^11.8.1", "@trpc/client": "^11.8.0",
"@trpc/react-query": "^11.8.1", "@trpc/react-query": "^11.8.0",
"@trpc/server": "^11.8.1", "@trpc/server": "^11.8.0",
"@trpc/tanstack-react-query": "^11.8.1", "@trpc/tanstack-react-query": "^11.8.0",
"drizzle-orm": "^0.45.1",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
"next": "16.1.1", "next": "16.0.10",
"react": "19.2.3", "react": "19.2.3",
"react-dom": "19.2.3", "react-dom": "19.2.3",
"superjson": "2.2.6", "superjson": "2.2.6",
"trpc-to-openapi": "^3.1.0", "trpc-to-openapi": "^3.1.0",
"zod": "^4.2.1" "zod": "^4.2.0"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
+1 -1
View File
@@ -1,4 +1,5 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, eq, inArray } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
@@ -7,7 +8,6 @@ import { constructIntegrationPermissions } from "@homarr/auth/shared";
import { decryptSecret } from "@homarr/common/server"; import { decryptSecret } from "@homarr/common/server";
import type { AtLeastOneOf } from "@homarr/common/types"; import type { AtLeastOneOf } from "@homarr/common/types";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq, inArray } from "@homarr/db";
import { integrations } from "@homarr/db/schema"; import { integrations } from "@homarr/db/schema";
import type { IntegrationKind } from "@homarr/definitions"; import type { IntegrationKind } from "@homarr/definitions";
+1 -1
View File
@@ -1,7 +1,7 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, eq } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { and, eq } from "@homarr/db";
import { items } from "@homarr/db/schema"; import { items } from "@homarr/db/schema";
import type { WidgetKind } from "@homarr/definitions"; import type { WidgetKind } from "@homarr/definitions";
+1 -3
View File
@@ -1,7 +1,5 @@
import { generateOpenApiDocument } from "trpc-to-openapi"; import { generateOpenApiDocument } from "trpc-to-openapi";
import { API_KEY_HEADER_NAME } from "@homarr/auth/api-key";
import { appRouter } from "./root"; import { appRouter } from "./root";
export const openApiDocument = (base: string) => export const openApiDocument = (base: string) =>
@@ -13,7 +11,7 @@ export const openApiDocument = (base: string) =>
securitySchemes: { securitySchemes: {
apikey: { apikey: {
type: "apiKey", type: "apiKey",
name: API_KEY_HEADER_NAME, name: "ApiKey",
description: "API key which can be obtained in the Homarr administration dashboard", description: "API key which can be obtained in the Homarr administration dashboard",
in: "header", in: "header",
}, },
+2 -2
View File
@@ -1,9 +1,10 @@
import { eq } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth"; import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { generateSecureRandomToken } from "@homarr/common/server"; import { generateSecureRandomToken } from "@homarr/common/server";
import { db, eq } from "@homarr/db"; import { db } from "@homarr/db";
import { apiKeys } from "@homarr/db/schema"; import { apiKeys } from "@homarr/db/schema";
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc"; import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
@@ -22,7 +23,6 @@ export const apiKeysRouter = createTRPCRouter({
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
}, },
}, },
+8 -10
View File
@@ -1,8 +1,8 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { asc, eq, inArray, like } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { asc, eq, inArray, like } from "@homarr/db";
import { apps } from "@homarr/db/schema"; import { apps } from "@homarr/db/schema";
import { selectAppSchema } from "@homarr/db/validationSchemas"; import { selectAppSchema } from "@homarr/db/validationSchemas";
import { getIconForName } from "@homarr/icons"; import { getIconForName } from "@homarr/icons";
@@ -141,15 +141,13 @@ export const appRouter = createTRPCRouter({
.output(z.void()) .output(z.void())
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
await ctx.db.insert(apps).values( await ctx.db.insert(apps).values(
await Promise.all( input.map((app) => ({
input.map(async (app) => ({ id: createId(),
id: createId(), name: app.name,
name: app.name, description: app.description,
description: app.description, iconUrl: app.iconUrl ?? getIconForName(ctx.db, app.name).sync()?.url ?? defaultIcon,
iconUrl: app.iconUrl ?? (await getIconForName(ctx.db, app.name))?.url ?? defaultIcon, href: app.href,
href: app.href, })),
})),
),
); );
}), }),
update: permissionRequiredProcedure update: permissionRequiredProcedure
@@ -1,7 +1,8 @@
import { eq, or } from "drizzle-orm";
import SuperJSON from "superjson"; import SuperJSON from "superjson";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { db, eq, or } from "@homarr/db"; import { db } from "@homarr/db";
import { items } from "@homarr/db/schema"; import { items } from "@homarr/db/schema";
import type { WidgetComponentProps } from "../../../../widgets/src"; import type { WidgetComponentProps } from "../../../../widgets/src";
+546 -230
View File
@@ -1,13 +1,15 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import type { InferInsertModel, InferSelectModel, SQL } from "drizzle-orm";
import { and, asc, eq, inArray, isNull, like, not, or, sql } from "drizzle-orm";
import superjson from "superjson"; import superjson from "superjson";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { constructBoardPermissions } from "@homarr/auth/shared"; import { constructBoardPermissions } from "@homarr/auth/shared";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { DeviceType } from "@homarr/common/server"; import type { DeviceType } from "@homarr/common/server";
import type { Database, InferInsertModel, InferSelectModel, SQL } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, asc, eq, inArray, isNull, like, not, or, sql } from "@homarr/db"; import { handleTransactionsAsync } from "@homarr/db";
import { createDbInsertCollection } from "@homarr/db/collection"; import { createDbInsertCollectionWithoutTransaction } from "@homarr/db/collection";
import { getServerSettingByKeyAsync } from "@homarr/db/queries"; import { getServerSettingByKeyAsync } from "@homarr/db/queries";
import { import {
boardGroupPermissions, boardGroupPermissions,
@@ -155,7 +157,6 @@ export const boardRouter = createTRPCRouter({
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
}, },
userPermissions: { userPermissions: {
@@ -273,7 +274,7 @@ export const boardRouter = createTRPCRouter({
}, },
}); });
const createBoardCollection = createDbInsertCollection(["boards", "sections", "layouts"]); const createBoardCollection = createDbInsertCollectionWithoutTransaction(["boards", "sections", "layouts"]);
createBoardCollection.boards.push({ createBoardCollection.boards.push({
id: boardId, id: boardId,
@@ -439,41 +440,86 @@ export const boardRouter = createTRPCRouter({
})), })),
); );
await ctx.db.transaction(async (transaction) => { await handleTransactionsAsync(ctx.db, {
transaction.insert(boards).values({ async handleAsync(db, schema) {
...boardProps, await db.transaction(async (transaction) => {
id: newBoardId, transaction.insert(schema.boards).values({
name: input.name, ...boardProps,
creatorId: ctx.session.user.id, id: newBoardId,
}); name: input.name,
creatorId: ctx.session.user.id,
});
if (layoutsToInsert.length > 0) { if (layoutsToInsert.length > 0) {
await transaction.insert(layouts).values(layoutsToInsert); await transaction.insert(schema.layouts).values(layoutsToInsert);
} }
if (sectionsToInsert.length > 0) { if (sectionsToInsert.length > 0) {
await transaction.insert(sections).values(sectionsToInsert); await transaction.insert(schema.sections).values(sectionsToInsert);
} }
if (sectionLayoutsToInsert.length > 0) { if (sectionLayoutsToInsert.length > 0) {
await transaction.insert(sectionLayouts).values(sectionLayoutsToInsert); await transaction.insert(schema.sectionLayouts).values(sectionLayoutsToInsert);
} }
if (sectionCollapseStatesToInsert.length > 0) { if (sectionCollapseStatesToInsert.length > 0) {
await transaction.insert(sectionCollapseStates).values(sectionCollapseStatesToInsert); await transaction.insert(schema.sectionCollapseStates).values(sectionCollapseStatesToInsert);
} }
if (itemsToInsert.length > 0) { if (itemsToInsert.length > 0) {
await transaction.insert(items).values(itemsToInsert); await transaction.insert(schema.items).values(itemsToInsert);
} }
if (itemLayoutsToInsert.length > 0) { if (itemLayoutsToInsert.length > 0) {
await transaction.insert(itemLayouts).values(itemLayoutsToInsert); await transaction.insert(schema.itemLayouts).values(itemLayoutsToInsert);
} }
if (itemIntegrationsToInsert.length > 0) { if (itemIntegrationsToInsert.length > 0) {
await transaction.insert(integrationItems).values(itemIntegrationsToInsert); await transaction.insert(schema.integrationItems).values(itemIntegrationsToInsert);
} }
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction
.insert(boards)
.values({
...boardProps,
id: newBoardId,
name: input.name,
creatorId: ctx.session.user.id,
})
.run();
if (layoutsToInsert.length > 0) {
transaction.insert(layouts).values(layoutsToInsert).run();
}
if (sectionsToInsert.length > 0) {
transaction.insert(sections).values(sectionsToInsert).run();
}
if (sectionLayoutsToInsert.length > 0) {
transaction.insert(sectionLayouts).values(sectionLayoutsToInsert).run();
}
if (sectionCollapseStatesToInsert.length > 0) {
transaction.insert(sectionCollapseStates).values(sectionCollapseStatesToInsert).run();
}
if (itemsToInsert.length > 0) {
transaction.insert(items).values(itemsToInsert).run();
}
if (itemLayoutsToInsert.length > 0) {
transaction.insert(itemLayouts).values(itemLayoutsToInsert).run();
}
if (itemIntegrationsToInsert.length > 0) {
transaction.insert(integrationItems).values(itemIntegrationsToInsert).run();
}
});
},
}); });
}), }),
renameBoard: protectedProcedure.input(boardRenameSchema).mutation(async ({ ctx, input }) => { renameBoard: protectedProcedure.input(boardRenameSchema).mutation(async ({ ctx, input }) => {
@@ -711,189 +757,415 @@ export const boardRouter = createTRPCRouter({
const dbBoard = await getFullBoardWithWhereAsync(ctx.db, eq(boards.id, input.id), ctx.session.user.id); const dbBoard = await getFullBoardWithWhereAsync(ctx.db, eq(boards.id, input.id), ctx.session.user.id);
await ctx.db.transaction(async (transaction) => { await handleTransactionsAsync(ctx.db, {
const addedSections = filterAddedItems(input.sections, dbBoard.sections); async handleAsync(db, schema) {
await db.transaction(async (transaction) => {
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
if (addedSections.length > 0) { if (addedSections.length > 0) {
await transaction.insert(sections).values( await transaction.insert(schema.sections).values(
addedSections.map((section) => ({ addedSections.map((section) => ({
id: section.id, id: section.id,
kind: section.kind, kind: section.kind,
yOffset: section.kind !== "dynamic" ? section.yOffset : null, yOffset: section.kind !== "dynamic" ? section.yOffset : null,
xOffset: section.kind === "dynamic" ? null : 0, xOffset: section.kind === "dynamic" ? null : 0,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON, options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: "name" in section ? section.name : null, name: "name" in section ? section.name : null,
boardId: dbBoard.id, boardId: dbBoard.id,
})), })),
); );
if (addedSections.some((section) => section.kind === "dynamic")) { if (addedSections.some((section) => section.kind === "dynamic")) {
await transaction.insert(sectionLayouts).values( await transaction.insert(schema.sectionLayouts).values(
addedSections addedSections
.filter((section) => section.kind === "dynamic") .filter((section) => section.kind === "dynamic")
.flatMap((section) => .flatMap((section) =>
section.layouts.map( section.layouts.map(
(sectionLayout): InferInsertModel<typeof sectionLayouts> => ({ (sectionLayout): InferInsertModel<typeof schema.sectionLayouts> => ({
layoutId: sectionLayout.layoutId, layoutId: sectionLayout.layoutId,
sectionId: section.id, sectionId: section.id,
parentSectionId: sectionLayout.parentSectionId, parentSectionId: sectionLayout.parentSectionId,
height: sectionLayout.height, height: sectionLayout.height,
width: sectionLayout.width, width: sectionLayout.width,
xOffset: sectionLayout.xOffset, xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset, yOffset: sectionLayout.yOffset,
}),
),
),
);
}
}
const addedItems = filterAddedItems(input.items, dbBoard.items);
if (addedItems.length > 0) {
await transaction.insert(schema.items).values(
addedItems.map((item) => ({
id: item.id,
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
boardId: dbBoard.id,
})),
);
await transaction.insert(schema.itemLayouts).values(
addedItems.flatMap((item) =>
item.layouts.map(
(layoutSection): InferInsertModel<typeof schema.itemLayouts> => ({
layoutId: layoutSection.layoutId,
sectionId: layoutSection.sectionId,
itemId: item.id,
height: layoutSection.height,
width: layoutSection.width,
xOffset: layoutSection.xOffset,
yOffset: layoutSection.yOffset,
}), }),
), ),
), ),
);
}
const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
); );
} const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
} integrationIds.map((integrationId) => ({
integrationId,
const addedItems = filterAddedItems(input.items, dbBoard.items); itemId,
})),
if (addedItems.length > 0) { );
await transaction.insert(items).values( const addedIntegrationRelations = inputIntegrationRelations.filter(
addedItems.map((item) => ({
id: item.id,
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
boardId: dbBoard.id,
})),
);
await transaction.insert(itemLayouts).values(
addedItems.flatMap((item) =>
item.layouts.map(
(layoutSection): InferInsertModel<typeof itemLayouts> => ({
layoutId: layoutSection.layoutId,
sectionId: layoutSection.sectionId,
itemId: item.id,
height: layoutSection.height,
width: layoutSection.width,
xOffset: layoutSection.xOffset,
yOffset: layoutSection.yOffset,
}),
),
),
);
}
const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const addedIntegrationRelations = inputIntegrationRelations.filter(
(inputRelation) =>
!dbIntegrationRelations.some(
(dbRelation) =>
dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
),
);
if (addedIntegrationRelations.length > 0) {
await transaction.insert(integrationItems).values(
addedIntegrationRelations.map((relation) => ({
itemId: relation.itemId,
integrationId: relation.integrationId,
})),
);
}
const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
for (const item of updatedItems) {
await transaction
.update(items)
.set({
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
})
.where(eq(items.id, item.id));
for (const itemSectionLayout of item.layouts) {
await transaction
.update(itemLayouts)
.set({
height: itemSectionLayout.height,
width: itemSectionLayout.width,
xOffset: itemSectionLayout.xOffset,
yOffset: itemSectionLayout.yOffset,
sectionId: itemSectionLayout.sectionId,
})
.where(and(eq(itemLayouts.itemId, item.id), eq(itemLayouts.layoutId, itemSectionLayout.layoutId)));
}
}
const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
for (const section of updatedSections) {
const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
await transaction
.update(sections)
.set({
yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: prev?.kind === "category" && "name" in section ? section.name : null,
})
.where(eq(sections.id, section.id));
if (section.kind !== "dynamic") continue;
for (const sectionLayout of section.layouts) {
await transaction
.update(sectionLayouts)
.set({
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
parentSectionId: sectionLayout.parentSectionId,
})
.where(and(eq(sectionLayouts.sectionId, section.id), eq(sectionLayouts.layoutId, sectionLayout.layoutId)));
}
}
const removedIntegrationRelations = dbIntegrationRelations.filter(
(dbRelation) =>
!inputIntegrationRelations.some(
(inputRelation) => (inputRelation) =>
dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId, !dbIntegrationRelations.some(
), (dbRelation) =>
); dbRelation.itemId === inputRelation.itemId &&
dbRelation.integrationId === inputRelation.integrationId,
for (const relation of removedIntegrationRelations) { ),
await transaction
.delete(integrationItems)
.where(
and(
eq(integrationItems.itemId, relation.itemId),
eq(integrationItems.integrationId, relation.integrationId),
),
); );
}
const removedItems = filterRemovedItems(input.items, dbBoard.items); if (addedIntegrationRelations.length > 0) {
await transaction.insert(schema.integrationItems).values(
addedIntegrationRelations.map((relation) => ({
itemId: relation.itemId,
integrationId: relation.integrationId,
})),
);
}
const itemIds = removedItems.map((item) => item.id); const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
if (itemIds.length > 0) {
await transaction.delete(items).where(inArray(items.id, itemIds));
}
const removedSections = filterRemovedItems(input.sections, dbBoard.sections); for (const item of updatedItems) {
const sectionIds = removedSections.map((section) => section.id); await transaction
.update(schema.items)
.set({
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
})
.where(eq(schema.items.id, item.id));
if (sectionIds.length > 0) { for (const itemSectionLayout of item.layouts) {
await transaction.delete(sections).where(inArray(sections.id, sectionIds)); await transaction
} .update(schema.itemLayouts)
.set({
height: itemSectionLayout.height,
width: itemSectionLayout.width,
xOffset: itemSectionLayout.xOffset,
yOffset: itemSectionLayout.yOffset,
sectionId: itemSectionLayout.sectionId,
})
.where(
and(
eq(schema.itemLayouts.itemId, item.id),
eq(schema.itemLayouts.layoutId, itemSectionLayout.layoutId),
),
);
}
}
const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
for (const section of updatedSections) {
const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
await transaction
.update(schema.sections)
.set({
yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: prev?.kind === "category" && "name" in section ? section.name : null,
})
.where(eq(schema.sections.id, section.id));
if (section.kind !== "dynamic") continue;
for (const sectionLayout of section.layouts) {
await transaction
.update(schema.sectionLayouts)
.set({
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
parentSectionId: sectionLayout.parentSectionId,
})
.where(
and(
eq(schema.sectionLayouts.sectionId, section.id),
eq(schema.sectionLayouts.layoutId, sectionLayout.layoutId),
),
);
}
}
const removedIntegrationRelations = dbIntegrationRelations.filter(
(dbRelation) =>
!inputIntegrationRelations.some(
(inputRelation) =>
dbRelation.itemId === inputRelation.itemId &&
dbRelation.integrationId === inputRelation.integrationId,
),
);
for (const relation of removedIntegrationRelations) {
await transaction
.delete(schema.integrationItems)
.where(
and(
eq(integrationItems.itemId, relation.itemId),
eq(integrationItems.integrationId, relation.integrationId),
),
);
}
const removedItems = filterRemovedItems(input.items, dbBoard.items);
const itemIds = removedItems.map((item) => item.id);
if (itemIds.length > 0) {
await transaction.delete(schema.items).where(inArray(schema.items.id, itemIds));
}
const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
const sectionIds = removedSections.map((section) => section.id);
if (sectionIds.length > 0) {
await transaction.delete(schema.sections).where(inArray(schema.sections.id, sectionIds));
}
});
},
handleSync(db) {
db.transaction((transaction) => {
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
if (addedSections.length > 0) {
transaction
.insert(sections)
.values(
addedSections.map((section) => ({
id: section.id,
kind: section.kind,
yOffset: section.kind !== "dynamic" ? section.yOffset : null,
xOffset: section.kind === "dynamic" ? null : 0,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: "name" in section ? section.name : null,
boardId: dbBoard.id,
})),
)
.run();
if (addedSections.some((section) => section.kind === "dynamic")) {
transaction
.insert(sectionLayouts)
.values(
addedSections
.filter((section) => section.kind === "dynamic")
.flatMap((section) =>
section.layouts.map(
(sectionLayout): InferInsertModel<typeof sectionLayouts> => ({
layoutId: sectionLayout.layoutId,
sectionId: section.id,
parentSectionId: sectionLayout.parentSectionId,
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
}),
),
),
)
.run();
}
}
const addedItems = filterAddedItems(input.items, dbBoard.items);
if (addedItems.length > 0) {
transaction
.insert(items)
.values(
addedItems.map((item) => ({
id: item.id,
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
boardId: dbBoard.id,
})),
)
.run();
transaction
.insert(itemLayouts)
.values(
addedItems.flatMap((item) =>
item.layouts.map(
(layoutSection): InferInsertModel<typeof itemLayouts> => ({
layoutId: layoutSection.layoutId,
sectionId: layoutSection.sectionId,
itemId: item.id,
height: layoutSection.height,
width: layoutSection.width,
xOffset: layoutSection.xOffset,
yOffset: layoutSection.yOffset,
}),
),
),
)
.run();
}
const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const addedIntegrationRelations = inputIntegrationRelations.filter(
(inputRelation) =>
!dbIntegrationRelations.some(
(dbRelation) =>
dbRelation.itemId === inputRelation.itemId &&
dbRelation.integrationId === inputRelation.integrationId,
),
);
if (addedIntegrationRelations.length > 0) {
transaction
.insert(integrationItems)
.values(
addedIntegrationRelations.map((relation) => ({
itemId: relation.itemId,
integrationId: relation.integrationId,
})),
)
.run();
}
const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
for (const item of updatedItems) {
transaction
.update(items)
.set({
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
})
.where(eq(items.id, item.id))
.run();
for (const itemSectionLayout of item.layouts) {
transaction
.update(itemLayouts)
.set({
height: itemSectionLayout.height,
width: itemSectionLayout.width,
xOffset: itemSectionLayout.xOffset,
yOffset: itemSectionLayout.yOffset,
sectionId: itemSectionLayout.sectionId,
})
.where(and(eq(itemLayouts.itemId, item.id), eq(itemLayouts.layoutId, itemSectionLayout.layoutId)))
.run();
}
}
const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
for (const section of updatedSections) {
const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
transaction
.update(sections)
.set({
yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: prev?.kind === "category" && "name" in section ? section.name : null,
})
.where(eq(sections.id, section.id))
.run();
if (section.kind !== "dynamic") continue;
for (const sectionLayout of section.layouts) {
transaction
.update(sectionLayouts)
.set({
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
parentSectionId: sectionLayout.parentSectionId,
})
.where(
and(eq(sectionLayouts.sectionId, section.id), eq(sectionLayouts.layoutId, sectionLayout.layoutId)),
)
.run();
}
}
const removedIntegrationRelations = dbIntegrationRelations.filter(
(dbRelation) =>
!inputIntegrationRelations.some(
(inputRelation) =>
dbRelation.itemId === inputRelation.itemId &&
dbRelation.integrationId === inputRelation.integrationId,
),
);
for (const relation of removedIntegrationRelations) {
transaction
.delete(integrationItems)
.where(
and(
eq(integrationItems.itemId, relation.itemId),
eq(integrationItems.integrationId, relation.integrationId),
),
)
.run();
}
const removedItems = filterRemovedItems(input.items, dbBoard.items);
const itemIds = removedItems.map((item) => item.id);
if (itemIds.length > 0) {
transaction.delete(items).where(inArray(items.id, itemIds)).run();
}
const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
const sectionIds = removedSections.map((section) => section.id);
if (sectionIds.length > 0) {
transaction.delete(sections).where(inArray(sections.id, sectionIds)).run();
}
});
},
}); });
}), }),
getBoardPermissions: protectedProcedure.input(byIdSchema).query(async ({ input, ctx }) => { getBoardPermissions: protectedProcedure.input(byIdSchema).query(async ({ input, ctx }) => {
@@ -925,7 +1197,6 @@ export const boardRouter = createTRPCRouter({
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
}, },
}, },
@@ -971,35 +1242,81 @@ export const boardRouter = createTRPCRouter({
saveUserBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => { saveUserBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
await ctx.db.transaction(async (transaction) => { await handleTransactionsAsync(ctx.db, {
await transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId)); async handleAsync(db, schema) {
if (input.permissions.length === 0) { await db.transaction(async (transaction) => {
return; await transaction.delete(schema.boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId));
} if (input.permissions.length === 0) {
await transaction.insert(boardUserPermissions).values( return;
input.permissions.map((permission) => ({ }
userId: permission.principalId, await transaction.insert(schema.boardUserPermissions).values(
permission: permission.permission, input.permissions.map((permission) => ({
boardId: input.entityId, userId: permission.principalId,
})), permission: permission.permission,
); boardId: input.entityId,
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId)).run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(boardUserPermissions)
.values(
input.permissions.map((permission) => ({
userId: permission.principalId,
permission: permission.permission,
boardId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
saveGroupBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => { saveGroupBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
await ctx.db.transaction(async (transaction) => { await handleTransactionsAsync(ctx.db, {
await transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId)); async handleAsync(db, schema) {
if (input.permissions.length === 0) { await db.transaction(async (transaction) => {
return; await transaction
} .delete(schema.boardGroupPermissions)
await transaction.insert(boardGroupPermissions).values( .where(eq(boardGroupPermissions.boardId, input.entityId));
input.permissions.map((permission) => ({ if (input.permissions.length === 0) {
groupId: permission.principalId, return;
permission: permission.permission, }
boardId: input.entityId, await transaction.insert(schema.boardGroupPermissions).values(
})), input.permissions.map((permission) => ({
); groupId: permission.principalId,
permission: permission.permission,
boardId: input.entityId,
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId)).run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(boardGroupPermissions)
.values(
input.permissions.map((permission) => ({
groupId: permission.principalId,
permission: permission.permission,
boardId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
importOldmarrConfig: permissionRequiredProcedure importOldmarrConfig: permissionRequiredProcedure
@@ -1222,7 +1539,6 @@ const getFullBoardWithWhereAsync = async (db: Database, where: SQL<unknown>, use
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
}, },
sections: { sections: {
@@ -1,9 +1,10 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import type { SQL } from "drizzle-orm";
import { eq, inArray } from "drizzle-orm";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { constructBoardPermissions } from "@homarr/auth/shared"; import { constructBoardPermissions } from "@homarr/auth/shared";
import type { Database, SQL } from "@homarr/db"; import type { Database } from "@homarr/db";
import { eq, inArray } from "@homarr/db";
import { boardGroupPermissions, boardUserPermissions, groupMembers } from "@homarr/db/schema"; import { boardGroupPermissions, boardUserPermissions, groupMembers } from "@homarr/db/schema";
import type { BoardPermission } from "@homarr/definitions"; import type { BoardPermission } from "@homarr/definitions";
@@ -1,5 +1,6 @@
import { X509Certificate } from "node:crypto"; import { X509Certificate } from "node:crypto";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, eq } from "drizzle-orm";
import { zfd } from "zod-form-data"; import { zfd } from "zod-form-data";
import { z } from "zod/v4"; import { z } from "zod/v4";
@@ -8,7 +9,6 @@ import {
removeCustomRootCertificateAsync, removeCustomRootCertificateAsync,
} from "@homarr/core/infrastructure/certificates"; } from "@homarr/core/infrastructure/certificates";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { and, eq } from "@homarr/db";
import { trustedCertificateHostnames } from "@homarr/db/schema"; import { trustedCertificateHostnames } from "@homarr/db/schema";
import { certificateValidFileNameSchema, checkCertificateFile } from "@homarr/validation/certificates"; import { certificateValidFileNameSchema, checkCertificateFile } from "@homarr/validation/certificates";
@@ -91,7 +91,7 @@ export const certificateRouter = createTRPCRouter({
hostname: input.hostname, hostname: input.hostname,
thumbprint: input.thumbprint, thumbprint: input.thumbprint,
}); });
await ctx.db const dbResult = await ctx.db
.delete(trustedCertificateHostnames) .delete(trustedCertificateHostnames)
.where( .where(
and( and(
@@ -103,6 +103,7 @@ export const certificateRouter = createTRPCRouter({
logger.info("Removed trusted hostname", { logger.info("Removed trusted hostname", {
hostname: input.hostname, hostname: input.hostname,
thumbprint: input.thumbprint, thumbprint: input.thumbprint,
count: dbResult.changes,
}); });
}), }),
removeCertificate: permissionRequiredProcedure removeCertificate: permissionRequiredProcedure
+17 -5
View File
@@ -1,9 +1,10 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, eq, like, not } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq, like, not } from "@homarr/db"; import { handleTransactionsAsync } from "@homarr/db";
import { getMaxGroupPositionAsync } from "@homarr/db/queries"; import { getMaxGroupPositionAsync } from "@homarr/db/queries";
import { groupMembers, groupPermissions, groups } from "@homarr/db/schema"; import { groupMembers, groupPermissions, groups } from "@homarr/db/schema";
import { everyoneGroup } from "@homarr/definitions"; import { everyoneGroup } from "@homarr/definitions";
@@ -252,10 +253,21 @@ export const groupRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
const positions = input.positions.map((id, index) => ({ id, position: index + 1 })); const positions = input.positions.map((id, index) => ({ id, position: index + 1 }));
await ctx.db.transaction(async (trx) => { await handleTransactionsAsync(ctx.db, {
for (const { id, position } of positions) { handleAsync: async (db, schema) => {
await trx.update(groups).set({ position }).where(eq(groups.id, id)); await db.transaction(async (trx) => {
} for (const { id, position } of positions) {
await trx.update(schema.groups).set({ position }).where(eq(groups.id, id));
}
});
},
handleSync: (db) => {
db.transaction((trx) => {
for (const { id, position } of positions) {
trx.update(groups).set({ position }).where(eq(groups.id, id)).run();
}
});
},
}); });
}), }),
savePermissions: permissionRequiredProcedure savePermissions: permissionRequiredProcedure
+3 -1
View File
@@ -1,5 +1,7 @@
import { eq, inArray, or } from "drizzle-orm";
import { isProviderEnabled } from "@homarr/auth/server"; import { isProviderEnabled } from "@homarr/auth/server";
import { db, eq, inArray, or } from "@homarr/db"; import { db } from "@homarr/db";
import { import {
apps, apps,
boards, boards,
+2 -1
View File
@@ -1,4 +1,5 @@
import { and, like } from "@homarr/db"; import { and, like } from "drizzle-orm";
import { icons } from "@homarr/db/schema"; import { icons } from "@homarr/db/schema";
import { iconsFindSchema } from "@homarr/validation/icons"; import { iconsFindSchema } from "@homarr/validation/icons";
@@ -1,9 +1,10 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import type { SQL } from "drizzle-orm";
import { eq, inArray } from "drizzle-orm";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { constructIntegrationPermissions } from "@homarr/auth/shared"; import { constructIntegrationPermissions } from "@homarr/auth/shared";
import type { Database, SQL } from "@homarr/db"; import type { Database } from "@homarr/db";
import { eq, inArray } from "@homarr/db";
import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema"; import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema";
import type { IntegrationPermission } from "@homarr/definitions"; import type { IntegrationPermission } from "@homarr/definitions";
@@ -1,11 +1,12 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, asc, eq, inArray, like, or } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createId, objectEntries } from "@homarr/common"; import { createId, objectEntries } from "@homarr/common";
import { decryptSecret, encryptSecret } from "@homarr/common/server"; import { decryptSecret, encryptSecret } from "@homarr/common/server";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { handleTransactionsAsync } from "@homarr/db";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, asc, eq, inArray, like, or } from "@homarr/db";
import { import {
apps, apps,
groupMembers, groupMembers,
@@ -476,7 +477,6 @@ export const integrationRouter = createTRPCRouter({
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
}, },
}, },
@@ -524,20 +524,45 @@ export const integrationRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
await ctx.db.transaction(async (transaction) => { await handleTransactionsAsync(ctx.db, {
await transaction async handleAsync(db, schema) {
.delete(integrationUserPermissions) await ctx.db.transaction(async (transaction) => {
.where(eq(integrationUserPermissions.integrationId, input.entityId)); await transaction
if (input.permissions.length === 0) { .delete(schema.integrationUserPermissions)
return; .where(eq(schema.integrationUserPermissions.integrationId, input.entityId));
} if (input.permissions.length === 0) {
await transaction.insert(integrationUserPermissions).values( return;
input.permissions.map((permission) => ({ }
userId: permission.principalId, await transaction.insert(schema.integrationUserPermissions).values(
permission: permission.permission, input.permissions.map((permission) => ({
integrationId: input.entityId, userId: permission.principalId,
})), permission: permission.permission,
); integrationId: input.entityId,
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction
.delete(integrationUserPermissions)
.where(eq(integrationUserPermissions.integrationId, input.entityId))
.run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(integrationUserPermissions)
.values(
input.permissions.map((permission) => ({
userId: permission.principalId,
permission: permission.permission,
integrationId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
saveGroupIntegrationPermissions: protectedProcedure saveGroupIntegrationPermissions: protectedProcedure
@@ -545,20 +570,45 @@ export const integrationRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
await ctx.db.transaction(async (transaction) => { await handleTransactionsAsync(ctx.db, {
await transaction async handleAsync(db, schema) {
.delete(integrationGroupPermissions) await db.transaction(async (transaction) => {
.where(eq(integrationGroupPermissions.integrationId, input.entityId)); await transaction
if (input.permissions.length === 0) { .delete(schema.integrationGroupPermissions)
return; .where(eq(schema.integrationGroupPermissions.integrationId, input.entityId));
} if (input.permissions.length === 0) {
await transaction.insert(integrationGroupPermissions).values( return;
input.permissions.map((permission) => ({ }
groupId: permission.principalId, await transaction.insert(schema.integrationGroupPermissions).values(
permission: permission.permission, input.permissions.map((permission) => ({
integrationId: input.entityId, groupId: permission.principalId,
})), permission: permission.permission,
); integrationId: input.entityId,
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction
.delete(integrationGroupPermissions)
.where(eq(integrationGroupPermissions.integrationId, input.entityId))
.run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(integrationGroupPermissions)
.values(
input.permissions.map((permission) => ({
groupId: permission.principalId,
permission: permission.permission,
integrationId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
searchInIntegration: protectedProcedure searchInIntegration: protectedProcedure
+1 -1
View File
@@ -1,9 +1,9 @@
import { randomBytes } from "crypto"; import { randomBytes } from "crypto";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { asc, eq } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { asc, eq } from "@homarr/db";
import { invites } from "@homarr/db/schema"; import { invites } from "@homarr/db/schema";
import { selectInviteSchema } from "@homarr/db/validationSchemas"; import { selectInviteSchema } from "@homarr/db/validationSchemas";
+2 -8
View File
@@ -1,7 +1,6 @@
import { z } from "zod/v4"; import { z } from "zod/v4";
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http"; import { fetchWithTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
import { createTRPCRouter, publicProcedure } from "../trpc"; import { createTRPCRouter, publicProcedure } from "../trpc";
@@ -37,12 +36,7 @@ export const locationRouter = createTRPCRouter({
.input(locationSearchCityInput) .input(locationSearchCityInput)
.output(locationSearchCityOutput) .output(locationSearchCityOutput)
.query(async ({ input }) => { .query(async ({ input }) => {
const res = await withTimeoutAsync(async (signal) => { const res = await fetchWithTimeoutAsync(`https://geocoding-api.open-meteo.com/v1/search?name=${input.query}`);
return await fetchWithTrustedCertificatesAsync(
`https://geocoding-api.open-meteo.com/v1/search?name=${input.query}`,
{ signal },
);
});
return (await res.json()) as z.infer<typeof locationSearchCityOutput>; return (await res.json()) as z.infer<typeof locationSearchCityOutput>;
}), }),
}); });
@@ -1,9 +1,9 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import type { InferInsertModel } from "drizzle-orm";
import { and, desc, eq, like } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { InferInsertModel } from "@homarr/db";
import { and, desc, eq, like } from "@homarr/db";
import { iconRepositories, icons, medias } from "@homarr/db/schema"; import { iconRepositories, icons, medias } from "@homarr/db/schema";
import { createLocalImageUrl, LOCAL_ICON_REPOSITORY_SLUG, mapMediaToIcon } from "@homarr/icons/local"; import { createLocalImageUrl, LOCAL_ICON_REPOSITORY_SLUG, mapMediaToIcon } from "@homarr/icons/local";
import { byIdSchema, paginatedSchema } from "@homarr/validation/common"; import { byIdSchema, paginatedSchema } from "@homarr/validation/common";
@@ -39,7 +39,6 @@ export const mediaRouter = createTRPCRouter({
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
}, },
}, },
@@ -1,8 +1,9 @@
import { eq } from "drizzle-orm";
import { isProviderEnabled } from "@homarr/auth/server"; import { isProviderEnabled } from "@homarr/auth/server";
import { objectEntries } from "@homarr/common"; import { objectEntries } from "@homarr/common";
import type { MaybePromise } from "@homarr/common/types"; import type { MaybePromise } from "@homarr/common/types";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { eq } from "@homarr/db";
import { groups, onboarding } from "@homarr/db/schema"; import { groups, onboarding } from "@homarr/db/schema";
import type { OnboardingStep } from "@homarr/definitions"; import type { OnboardingStep } from "@homarr/definitions";
import { credentialsAdminGroup } from "@homarr/definitions"; import { credentialsAdminGroup } from "@homarr/definitions";
@@ -1,9 +1,9 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { asc, eq, like } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { asc, eq, like } from "@homarr/db";
import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries"; import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries";
import { searchEngines, users } from "@homarr/db/schema"; import { searchEngines, users } from "@homarr/db/schema";
import { createIntegrationAsync } from "@homarr/integrations"; import { createIntegrationAsync } from "@homarr/integrations";
@@ -1,7 +1,7 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, eq } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { and, eq } from "@homarr/db";
import { sectionCollapseStates, sections } from "@homarr/db/schema"; import { sectionCollapseStates, sections } from "@homarr/db/schema";
import { createTRPCRouter, protectedProcedure } from "../../trpc"; import { createTRPCRouter, protectedProcedure } from "../../trpc";
+11 -11
View File
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { apps } from "@homarr/db/schema"; import { apps } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import type { GroupPermissionKey } from "@homarr/definitions"; import type { GroupPermissionKey } from "@homarr/definitions";
import { appRouter } from "../app"; import { appRouter } from "../app";
@@ -21,7 +21,7 @@ const createDefaultSession = (permissions: GroupPermissionKey[] = []): Session =
describe("all should return all apps", () => { describe("all should return all apps", () => {
test("should return all apps with session", async () => { test("should return all apps with session", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -55,7 +55,7 @@ describe("all should return all apps", () => {
test("should throw UNAUTHORIZED if the user is not authenticated", async () => { test("should throw UNAUTHORIZED if the user is not authenticated", async () => {
// Arrange // Arrange
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db: await createDbAsync(), db: createDb(),
deviceType: undefined, deviceType: undefined,
session: null, session: null,
}); });
@@ -71,7 +71,7 @@ describe("all should return all apps", () => {
describe("byId should return an app by id", () => { describe("byId should return an app by id", () => {
test("should return an app by id when canUserSeeAppAsync returns true", async () => { test("should return an app by id when canUserSeeAppAsync returns true", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -103,7 +103,7 @@ describe("byId should return an app by id", () => {
test("should throw NOT_FOUND error when canUserSeeAppAsync returns false", async () => { test("should throw NOT_FOUND error when canUserSeeAppAsync returns false", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -129,7 +129,7 @@ describe("byId should return an app by id", () => {
test("should throw an error if the app does not exist", async () => { test("should throw an error if the app does not exist", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -147,7 +147,7 @@ describe("byId should return an app by id", () => {
describe("create should create a new app with all arguments", () => { describe("create should create a new app with all arguments", () => {
test("should create a new app", async () => { test("should create a new app", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -176,7 +176,7 @@ describe("create should create a new app with all arguments", () => {
test("should create a new app only with required arguments", async () => { test("should create a new app only with required arguments", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -207,7 +207,7 @@ describe("create should create a new app with all arguments", () => {
describe("update should update an app", () => { describe("update should update an app", () => {
test("should update an app", async () => { test("should update an app", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -247,7 +247,7 @@ describe("update should update an app", () => {
test("should throw an error if the app does not exist", async () => { test("should throw an error if the app does not exist", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -273,7 +273,7 @@ describe("update should update an app", () => {
describe("delete should delete an app", () => { describe("delete should delete an app", () => {
test("should delete an app", async () => { test("should delete an app", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+44 -43
View File
@@ -1,10 +1,11 @@
import type { InferInsertModel } from "drizzle-orm";
import { and, eq, not } from "drizzle-orm";
import SuperJSON from "superjson"; import SuperJSON from "superjson";
import { describe, expect, it, test, vi } from "vitest"; import { describe, expect, it, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { Database, InferInsertModel } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq, not } from "@homarr/db";
import { import {
boardGroupPermissions, boardGroupPermissions,
boards, boards,
@@ -22,7 +23,7 @@ import {
serverSettings, serverSettings,
users, users,
} from "@homarr/db/schema"; } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import type { BoardPermission, GroupPermissionKey } from "@homarr/definitions"; import type { BoardPermission, GroupPermissionKey } from "@homarr/definitions";
import type { RouterOutputs } from "../.."; import type { RouterOutputs } from "../..";
@@ -55,7 +56,7 @@ const createRandomUserAsync = async (db: Database) => {
describe("getAllBoards should return all boards accessable to the current user", () => { describe("getAllBoards should return all boards accessable to the current user", () => {
test("without session it should return only public boards", async () => { test("without session it should return only public boards", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: null }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: null });
const user1 = await createRandomUserAsync(db); const user1 = await createRandomUserAsync(db);
@@ -86,7 +87,7 @@ describe("getAllBoards should return all boards accessable to the current user",
test("with session containing board-view-all permission it should return all boards", async () => { test("with session containing board-view-all permission it should return all boards", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ const caller = boardRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -128,7 +129,7 @@ describe("getAllBoards should return all boards accessable to the current user",
test("with session user beeing creator it should return all private boards of them", async () => { test("with session user beeing creator it should return all private boards of them", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const user1 = await createRandomUserAsync(db); const user1 = await createRandomUserAsync(db);
@@ -170,7 +171,7 @@ describe("getAllBoards should return all boards accessable to the current user",
"with %s group board permission it should show board", "with %s group board permission it should show board",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ const caller = boardRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -236,7 +237,7 @@ describe("getAllBoards should return all boards accessable to the current user",
"with %s user board permission it should show board", "with %s user board permission it should show board",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ const caller = boardRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -290,7 +291,7 @@ describe("getAllBoards should return all boards accessable to the current user",
describe("createBoard should create a new board", () => { describe("createBoard should create a new board", () => {
test("should create a new board with permission board-create", async () => { test("should create a new board with permission board-create", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = { const session = {
...defaultSession, ...defaultSession,
user: { user: {
@@ -333,7 +334,7 @@ describe("createBoard should create a new board", () => {
test("should throw error when user has no board-create permission", async () => { test("should throw error when user has no board-create permission", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -347,7 +348,7 @@ describe("createBoard should create a new board", () => {
describe("rename board should rename board", () => { describe("rename board should rename board", () => {
test("should rename board", async () => { test("should rename board", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -375,7 +376,7 @@ describe("rename board should rename board", () => {
test("should throw error when similar board name exists", async () => { test("should throw error when similar board name exists", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
await db.insert(users).values({ await db.insert(users).values({
@@ -402,7 +403,7 @@ describe("rename board should rename board", () => {
test("should throw error when board not found", async () => { test("should throw error when board not found", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -418,7 +419,7 @@ describe("changeBoardVisibility should change board visibility", () => {
"should change board visibility to %s", "should change board visibility to %s",
async (visibility) => { async (visibility) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -453,7 +454,7 @@ describe("changeBoardVisibility should change board visibility", () => {
describe("deleteBoard should delete board", () => { describe("deleteBoard should delete board", () => {
test("should delete board", async () => { test("should delete board", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -480,7 +481,7 @@ describe("deleteBoard should delete board", () => {
test("should throw error when board not found", async () => { test("should throw error when board not found", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -495,7 +496,7 @@ describe("getHomeBoard should return home board", () => {
test("should return user home board when user has one", async () => { test("should return user home board when user has one", async () => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const fullBoardProps = await createFullBoardAsync(db, "home"); const fullBoardProps = await createFullBoardAsync(db, "home");
@@ -519,7 +520,7 @@ describe("getHomeBoard should return home board", () => {
test("should return global home board when user doesn't have one", async () => { test("should return global home board when user doesn't have one", async () => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const fullBoardProps = await createFullBoardAsync(db, "home"); const fullBoardProps = await createFullBoardAsync(db, "home");
@@ -540,7 +541,7 @@ describe("getHomeBoard should return home board", () => {
}); });
test("should throw error when home board not configured in serverSettings", async () => { test("should throw error when home board not configured in serverSettings", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
await createFullBoardAsync(db, "home"); await createFullBoardAsync(db, "home");
@@ -556,7 +557,7 @@ describe("getBoardByName should return board by name", () => {
it.each([["default"], ["something"]])("should return board by name %s when present", async (name) => { it.each([["default"], ["something"]])("should return board by name %s when present", async (name) => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const fullBoardProps = await createFullBoardAsync(db, name); const fullBoardProps = await createFullBoardAsync(db, name);
@@ -574,7 +575,7 @@ describe("getBoardByName should return board by name", () => {
it("should throw error when not present", async () => { it("should throw error when not present", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
await createFullBoardAsync(db, "default"); await createFullBoardAsync(db, "default");
@@ -590,7 +591,7 @@ describe("savePartialBoardSettings should save general settings", () => {
it("should save general settings", async () => { it("should save general settings", async () => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const newPageTitle = "newPageTitle"; const newPageTitle = "newPageTitle";
@@ -647,7 +648,7 @@ describe("savePartialBoardSettings should save general settings", () => {
}); });
it("should throw error when board not found", async () => { it("should throw error when board not found", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const actAsync = async () => const actAsync = async () =>
@@ -666,7 +667,7 @@ describe("savePartialBoardSettings should save general settings", () => {
describe("saveBoard should save full board", () => { describe("saveBoard should save full board", () => {
it("should remove section when not present in input", async () => { it("should remove section when not present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -703,7 +704,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should remove item when not present in input", async () => { it("should remove item when not present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -760,7 +761,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should remove integration reference when not present in input", async () => { it("should remove integration reference when not present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const anotherIntegration = { const anotherIntegration = {
id: createId(), id: createId(),
@@ -832,7 +833,7 @@ describe("saveBoard should save full board", () => {
"should add section when present in input", "should add section when present in input",
async (partialSection) => { async (partialSection) => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -884,7 +885,7 @@ describe("saveBoard should save full board", () => {
); );
it("should add item when present in input", async () => { it("should add item when present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -956,7 +957,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should add integration reference when present in input", async () => { it("should add integration reference when present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const integration = { const integration = {
id: createId(), id: createId(),
@@ -1024,7 +1025,7 @@ describe("saveBoard should save full board", () => {
expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify"); expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify");
}); });
it("should update section when present in input", async () => { it("should update section when present in input", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -1083,7 +1084,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should update item when present in input", async () => { it("should update item when present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1147,7 +1148,7 @@ describe("saveBoard should save full board", () => {
expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify"); expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify");
}); });
it("should fail when board not found", async () => { it("should fail when board not found", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const actAsync = async () => const actAsync = async () =>
@@ -1164,7 +1165,7 @@ describe("saveBoard should save full board", () => {
describe("getBoardPermissions should return board permissions", () => { describe("getBoardPermissions should return board permissions", () => {
test("should return board permissions", async () => { test("should return board permissions", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -1220,11 +1221,11 @@ describe("getBoardPermissions should return board permissions", () => {
expect(result.users).toEqual( expect(result.users).toEqual(
expect.arrayContaining([ expect.arrayContaining([
{ {
user: { id: user1, name: null, image: null, email: null }, user: { id: user1, name: null, image: null },
permission: "view", permission: "view",
}, },
{ {
user: { id: user2, name: null, image: null, email: null }, user: { id: user2, name: null, image: null },
permission: "modify", permission: "modify",
}, },
]), ]),
@@ -1239,7 +1240,7 @@ describe("saveUserBoardPermissions should save user board permissions", () => {
"should save user board permissions", "should save user board permissions",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -1281,7 +1282,7 @@ describe("saveGroupBoardPermissions should save group board permissions", () =>
"should save group board permissions", "should save group board permissions",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -1339,7 +1340,7 @@ const createNewLayout = (columnCount: number) => ({
describe("saveLayouts should save layout changes", () => { describe("saveLayouts should save layout changes", () => {
test("should add layout when not present in database", async () => { test("should add layout when not present in database", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1363,7 +1364,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should add items and dynamic sections generated from grid-algorithm when new layout is added", async () => { test("should add items and dynamic sections generated from grid-algorithm when new layout is added", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default");
@@ -1394,7 +1395,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should update layout when present in input", async () => { test("should update layout when present in input", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1420,7 +1421,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should update position of items when column count changes", async () => { test("should update position of items when column count changes", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default");
@@ -1447,7 +1448,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should remove layout when not present in input", async () => { test("should remove layout when not present in input", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1466,7 +1467,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should fail when board not found", async () => { test("should fail when board not found", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { layoutId } = await createFullBoardAsync(db, "default"); const { layoutId } = await createFullBoardAsync(db, "default");
@@ -1,10 +1,10 @@
import { eq } from "drizzle-orm";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import * as authShared from "@homarr/auth/shared"; import * as authShared from "@homarr/auth/shared";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { eq } from "@homarr/db";
import { boards, users } from "@homarr/db/schema"; import { boards, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { throwIfActionForbiddenAsync } from "../../board/board-access"; import { throwIfActionForbiddenAsync } from "../../board/board-access";
@@ -26,7 +26,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, true], ["view" as const, true],
])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: true, hasFullAccess: true,
@@ -55,7 +55,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, true], ["view" as const, true],
])("with permission %s should return %s when hasChangeAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasChangeAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -84,7 +84,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, true], ["view" as const, true],
])("with permission %s should return %s when hasViewAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasViewAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -113,7 +113,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, false], ["view" as const, false],
])("with permission %s should return %s when hasViewAccess is false", async (permission, expectedResult) => { ])("with permission %s should return %s when hasViewAccess is false", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -138,7 +138,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
test("should throw when board is not found", async () => { test("should throw when board is not found", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
// Act // Act
const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(boards.id, createId()), "full"); const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(boards.id, createId()), "full");
+35 -35
View File
@@ -1,11 +1,11 @@
import { eq } from "drizzle-orm";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import * as env from "@homarr/auth/env"; import * as env from "@homarr/auth/env";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { eq } from "@homarr/db";
import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema"; import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import type { GroupPermissionKey } from "@homarr/definitions"; import type { GroupPermissionKey } from "@homarr/definitions";
import { groupRouter } from "../group"; import { groupRouter } from "../group";
@@ -37,7 +37,7 @@ describe("paginated should return a list of groups with pagination", () => {
"with 5 groups in database and pageSize set to 3 on page %s it should return %s groups", "with 5 groups in database and pageSize set to 3 on page %s it should return %s groups",
async (page, expectedCount) => { async (page, expectedCount) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values( await db.insert(groups).values(
@@ -61,7 +61,7 @@ describe("paginated should return a list of groups with pagination", () => {
test("with 5 groups in database and pagesize set to 3 it should return total count 5", async () => { test("with 5 groups in database and pagesize set to 3 it should return total count 5", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values( await db.insert(groups).values(
@@ -83,7 +83,7 @@ describe("paginated should return a list of groups with pagination", () => {
test("groups should contain id, name, email and image of members", async () => { test("groups should contain id, name, email and image of members", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const user = createDummyUser(); const user = createDummyUser();
@@ -120,7 +120,7 @@ describe("paginated should return a list of groups with pagination", () => {
"groups should be searchable by name with contains pattern, query %s should result in %s results", "groups should be searchable by name with contains pattern, query %s should result in %s results",
async (query, expectedCount, firstKey) => { async (query, expectedCount, firstKey) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values( await db.insert(groups).values(
@@ -144,7 +144,7 @@ describe("paginated should return a list of groups with pagination", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -158,7 +158,7 @@ describe("paginated should return a list of groups with pagination", () => {
describe("byId should return group by id including members and permissions", () => { describe("byId should return group by id including members and permissions", () => {
test('should return group with id "1" with members and permissions', async () => { test('should return group with id "1" with members and permissions', async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const user = createDummyUser(); const user = createDummyUser();
@@ -203,7 +203,7 @@ describe("byId should return group by id including members and permissions", ()
test("with group id 1 and group 2 in database it should throw NOT_FOUND error", async () => { test("with group id 1 and group 2 in database it should throw NOT_FOUND error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -221,7 +221,7 @@ describe("byId should return group by id including members and permissions", ()
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -235,7 +235,7 @@ describe("byId should return group by id including members and permissions", ()
describe("create should create group in database", () => { describe("create should create group in database", () => {
test("with valid input (64 character name) and non existing name it should be successful", async () => { test("with valid input (64 character name) and non existing name it should be successful", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const name = "a".repeat(64); const name = "a".repeat(64);
@@ -259,7 +259,7 @@ describe("create should create group in database", () => {
test("with more than 64 characters name it should fail while validation", async () => { test("with more than 64 characters name it should fail while validation", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const longName = "a".repeat(65); const longName = "a".repeat(65);
@@ -280,7 +280,7 @@ describe("create should create group in database", () => {
["test", " TeSt"], ["test", " TeSt"],
])("with similar name %s it should fail to create %s", async (similarName, nameToCreate) => { ])("with similar name %s it should fail to create %s", async (similarName, nameToCreate) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -298,7 +298,7 @@ describe("create should create group in database", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -315,7 +315,7 @@ describe("update should update name with value that is no duplicate", () => {
["first", " first", "first"], ["first", " first", "first"],
])("update should update name from %s to %s normalized", async (initialValue, updateValue, expectedValue) => { ])("update should update name from %s to %s normalized", async (initialValue, updateValue, expectedValue) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -350,7 +350,7 @@ describe("update should update name with value that is no duplicate", () => {
[" seCond", "second"], [" seCond", "second"],
])("with similar name %s it should fail to update %s", async (updateValue, initialDuplicate) => { ])("with similar name %s it should fail to update %s", async (updateValue, initialDuplicate) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -380,7 +380,7 @@ describe("update should update name with value that is no duplicate", () => {
test("with non existing id it should throw not found error", async () => { test("with non existing id it should throw not found error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -402,7 +402,7 @@ describe("update should update name with value that is no duplicate", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -420,7 +420,7 @@ describe("update should update name with value that is no duplicate", () => {
describe("savePermissions should save permissions for group", () => { describe("savePermissions should save permissions for group", () => {
test("with existing group and permissions it should save permissions", async () => { test("with existing group and permissions it should save permissions", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -451,7 +451,7 @@ describe("savePermissions should save permissions for group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -473,7 +473,7 @@ describe("savePermissions should save permissions for group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -491,7 +491,7 @@ describe("savePermissions should save permissions for group", () => {
describe("transferOwnership should transfer ownership of group", () => { describe("transferOwnership should transfer ownership of group", () => {
test("with existing group and user it should transfer ownership", async () => { test("with existing group and user it should transfer ownership", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -529,7 +529,7 @@ describe("transferOwnership should transfer ownership of group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -551,7 +551,7 @@ describe("transferOwnership should transfer ownership of group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -569,7 +569,7 @@ describe("transferOwnership should transfer ownership of group", () => {
describe("deleteGroup should delete group", () => { describe("deleteGroup should delete group", () => {
test("with existing group it should delete group", async () => { test("with existing group it should delete group", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -600,7 +600,7 @@ describe("deleteGroup should delete group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -621,7 +621,7 @@ describe("deleteGroup should delete group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -638,7 +638,7 @@ describe("deleteGroup should delete group", () => {
describe("addMember should add member to group", () => { describe("addMember should add member to group", () => {
test("with existing group and user it should add member", async () => { test("with existing group and user it should add member", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -679,7 +679,7 @@ describe("addMember should add member to group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(users).values({ await db.insert(users).values({
@@ -700,7 +700,7 @@ describe("addMember should add member to group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -716,7 +716,7 @@ describe("addMember should add member to group", () => {
test("without credentials provider it should throw FORBIDDEN error", async () => { test("without credentials provider it should throw FORBIDDEN error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -755,7 +755,7 @@ describe("addMember should add member to group", () => {
describe("removeMember should remove member from group", () => { describe("removeMember should remove member from group", () => {
test("with existing group and user it should remove member", async () => { test("with existing group and user it should remove member", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -799,7 +799,7 @@ describe("removeMember should remove member from group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(users).values({ await db.insert(users).values({
@@ -820,7 +820,7 @@ describe("removeMember should remove member from group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -836,7 +836,7 @@ describe("removeMember should remove member from group", () => {
test("without credentials provider it should throw FORBIDDEN error", async () => { test("without credentials provider it should throw FORBIDDEN error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -1,10 +1,10 @@
import { eq } from "drizzle-orm";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import * as authShared from "@homarr/auth/shared"; import * as authShared from "@homarr/auth/shared";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { eq } from "@homarr/db";
import { integrations, users } from "@homarr/db/schema"; import { integrations, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { throwIfActionForbiddenAsync } from "../../integration/integration-access"; import { throwIfActionForbiddenAsync } from "../../integration/integration-access";
@@ -26,7 +26,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, true], ["use" as const, true],
])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: true, hasFullAccess: true,
@@ -56,7 +56,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, true], ["use" as const, true],
])("with permission %s should return %s when hasInteractAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasInteractAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -87,7 +87,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, true], ["use" as const, true],
])("with permission %s should return %s when hasUseAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasUseAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -118,7 +118,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, false], ["use" as const, false],
])("with permission %s should return %s when hasUseAccess is false", async (permission, expectedResult) => { ])("with permission %s should return %s when hasUseAccess is false", async (permission, expectedResult) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -145,7 +145,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
test("should throw when integration is not found", async () => { test("should throw when integration is not found", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
// Act // Act
const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(integrations.id, createId()), "full"); const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(integrations.id, createId()), "full");
@@ -5,7 +5,7 @@ import type { Session } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { encryptSecret } from "@homarr/common/server"; import { encryptSecret } from "@homarr/common/server";
import { apps, integrations, integrationSecrets } from "@homarr/db/schema"; import { apps, integrations, integrationSecrets } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import type { GroupPermissionKey } from "@homarr/definitions"; import type { GroupPermissionKey } from "@homarr/definitions";
import { integrationRouter } from "../../integration/integration-router"; import { integrationRouter } from "../../integration/integration-router";
@@ -30,7 +30,7 @@ vi.mock("../../integration/integration-test-connection", () => ({
describe("all should return all integrations", () => { describe("all should return all integrations", () => {
test("with any session should return all integrations", async () => { test("with any session should return all integrations", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -61,7 +61,7 @@ describe("all should return all integrations", () => {
describe("byId should return an integration by id", () => { describe("byId should return an integration by id", () => {
test("with full access should return an integration by id", async () => { test("with full access should return an integration by id", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -88,7 +88,7 @@ describe("byId should return an integration by id", () => {
}); });
test("with full access should throw an error if the integration does not exist", async () => { test("with full access should throw an error if the integration does not exist", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -100,7 +100,7 @@ describe("byId should return an integration by id", () => {
}); });
test("with full access should only return the public secret values", async () => { test("with full access should only return the public secret values", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -148,7 +148,7 @@ describe("byId should return an integration by id", () => {
test("without full access should throw integration not found error", async () => { test("without full access should throw integration not found error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -174,7 +174,7 @@ describe("byId should return an integration by id", () => {
describe("create should create a new integration", () => { describe("create should create a new integration", () => {
test("with create integration access should create a new integration", async () => { test("with create integration access should create a new integration", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -209,7 +209,7 @@ describe("create should create a new integration", () => {
}); });
test("with create integration access should create a new integration when creating search engine", async () => { test("with create integration access should create a new integration when creating search engine", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -252,7 +252,7 @@ describe("create should create a new integration", () => {
}); });
test("with create integration access should create a new integration with new linked app", async () => { test("with create integration access should create a new integration with new linked app", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -302,7 +302,7 @@ describe("create should create a new integration", () => {
}); });
test("with create integration access should create a new integration with existing linked app", async () => { test("with create integration access should create a new integration with existing linked app", async () => {
const db = await createDbAsync(); const db = createDb();
const appId = createId(); const appId = createId();
await db.insert(apps).values({ await db.insert(apps).values({
id: appId, id: appId,
@@ -349,7 +349,7 @@ describe("create should create a new integration", () => {
test("without create integration access should throw permission error", async () => { test("without create integration access should throw permission error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -372,7 +372,7 @@ describe("create should create a new integration", () => {
test("without create app access should throw permission error with new linked app", async () => { test("without create app access should throw permission error with new linked app", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -403,7 +403,7 @@ describe("create should create a new integration", () => {
describe("update should update an integration", () => { describe("update should update an integration", () => {
test("with full access should update an integration", async () => { test("with full access should update an integration", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -486,7 +486,7 @@ describe("update should update an integration", () => {
}); });
test("with full access should throw an error if the integration does not exist", async () => { test("with full access should throw an error if the integration does not exist", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -506,7 +506,7 @@ describe("update should update an integration", () => {
test("without full access should throw permission error", async () => { test("without full access should throw permission error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -530,7 +530,7 @@ describe("update should update an integration", () => {
describe("delete should delete an integration", () => { describe("delete should delete an integration", () => {
test("with full access should delete an integration", async () => { test("with full access should delete an integration", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -564,7 +564,7 @@ describe("delete should delete an integration", () => {
test("without full access should throw permission error", async () => { test("without full access should throw permission error", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+6 -6
View File
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { invites, users } from "@homarr/db/schema"; import { invites, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { inviteRouter } from "../invite"; import { inviteRouter } from "../invite";
@@ -35,7 +35,7 @@ vi.mock("@homarr/auth/env", () => {
describe("all should return all existing invites without sensitive informations", () => { describe("all should return all existing invites without sensitive informations", () => {
test("invites should not contain sensitive informations", async () => { test("invites should not contain sensitive informations", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -70,7 +70,7 @@ describe("all should return all existing invites without sensitive informations"
test("invites should be sorted ascending by expiration date", async () => { test("invites should be sorted ascending by expiration date", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -110,7 +110,7 @@ describe("all should return all existing invites without sensitive informations"
describe("create should create a new invite expiring on the specified date with a token and id returned to generate url", () => { describe("create should create a new invite expiring on the specified date with a token and id returned to generate url", () => {
test("creation should work with a date in the future, but less than 6 months.", async () => { test("creation should work with a date in the future, but less than 6 months.", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -142,7 +142,7 @@ describe("create should create a new invite expiring on the specified date with
describe("delete should remove invite by id", () => { describe("delete should remove invite by id", () => {
test("deletion should remove present invite", async () => { test("deletion should remove present invite", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -180,7 +180,7 @@ describe("delete should remove invite by id", () => {
test("deletion should throw with NOT_FOUND code when specified invite not present", async () => { test("deletion should throw with NOT_FOUND code when specified invite not present", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { serverSettings } from "@homarr/db/schema"; import { serverSettings } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings"; import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";
import { serverSettingsRouter } from "../serverSettings"; import { serverSettingsRouter } from "../serverSettings";
@@ -23,7 +23,7 @@ const defaultSession = {
describe("getAll server settings", () => { describe("getAll server settings", () => {
test("getAll should throw error when unauthorized", async () => { test("getAll should throw error when unauthorized", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = serverSettingsRouter.createCaller({ const caller = serverSettingsRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -42,7 +42,7 @@ describe("getAll server settings", () => {
await expect(actAsync()).rejects.toThrow(); await expect(actAsync()).rejects.toThrow();
}); });
test("getAll should return default server settings when nothing in database", async () => { test("getAll should return default server settings when nothing in database", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = serverSettingsRouter.createCaller({ const caller = serverSettingsRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -57,7 +57,7 @@ describe("getAll server settings", () => {
describe("saveSettings", () => { describe("saveSettings", () => {
test("saveSettings should update settings and return true when it updated only one", async () => { test("saveSettings should update settings and return true when it updated only one", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = serverSettingsRouter.createCaller({ const caller = serverSettingsRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+10 -10
View File
@@ -1,11 +1,11 @@
import { eq } from "drizzle-orm";
import { describe, expect, it, test, vi } from "vitest"; import { describe, expect, it, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { eq } from "@homarr/db";
import { invites, onboarding, users } from "@homarr/db/schema"; import { invites, onboarding, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions"; import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions";
import { userRouter } from "../user"; import { userRouter } from "../user";
@@ -39,7 +39,7 @@ vi.mock("@homarr/auth/env", () => {
describe("initUser should initialize the first user", () => { describe("initUser should initialize the first user", () => {
it("should create a user if none exists", async () => { it("should create a user if none exists", async () => {
const db = await createDbAsync(); const db = createDb();
await createOnboardingStepAsync(db, "user"); await createOnboardingStepAsync(db, "user");
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
@@ -63,7 +63,7 @@ describe("initUser should initialize the first user", () => {
}); });
it("should not create a user if the password and confirmPassword do not match", async () => { it("should not create a user if the password and confirmPassword do not match", async () => {
const db = await createDbAsync(); const db = createDb();
await createOnboardingStepAsync(db, "user"); await createOnboardingStepAsync(db, "user");
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
@@ -88,7 +88,7 @@ describe("initUser should initialize the first user", () => {
["ABC123+/-"], // does not contain lowercase ["ABC123+/-"], // does not contain lowercase
["abc123+/-"], // does not contain uppercase ["abc123+/-"], // does not contain uppercase
])("should throw error that password requirements do not match for '%s' as password", async (password) => { ])("should throw error that password requirements do not match for '%s' as password", async (password) => {
const db = await createDbAsync(); const db = createDb();
await createOnboardingStepAsync(db, "user"); await createOnboardingStepAsync(db, "user");
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
@@ -110,7 +110,7 @@ describe("initUser should initialize the first user", () => {
describe("register should create a user with valid invitation", () => { describe("register should create a user with valid invitation", () => {
test("register should create a user with valid invitation", async () => { test("register should create a user with valid invitation", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -166,7 +166,7 @@ describe("register should create a user with valid invitation", () => {
"register should throw an error with input %s and date %s if the invitation is invalid", "register should throw an error with input %s and date %s if the invitation is invalid",
async (partialInput, systemTime) => { async (partialInput, systemTime) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -209,7 +209,7 @@ describe("register should create a user with valid invitation", () => {
describe("editProfile shoud update user", () => { describe("editProfile shoud update user", () => {
test("editProfile should update users and not update emailVerified when email not dirty", async () => { test("editProfile should update users and not update emailVerified when email not dirty", async () => {
// arrange // arrange
const db = await createDbAsync(); const db = createDb();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -246,7 +246,7 @@ describe("editProfile shoud update user", () => {
test("editProfile should update users and update emailVerified when email dirty", async () => { test("editProfile should update users and update emailVerified when email dirty", async () => {
// arrange // arrange
const db = await createDbAsync(); const db = createDb();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -282,7 +282,7 @@ describe("editProfile shoud update user", () => {
describe("delete should delete user", () => { describe("delete should delete user", () => {
test("delete should delete user", async () => { test("delete should delete user", async () => {
const db = await createDbAsync(); const db = createDb();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -1,7 +1,7 @@
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import * as ping from "@homarr/ping"; import * as ping from "@homarr/ping";
import { appRouter } from "../../widgets/app"; import { appRouter } from "../../widgets/app";
@@ -15,7 +15,7 @@ describe("ping should call sendPingRequestAsync with url and return result", ()
// Arrange // Arrange
const spy = vi.spyOn(ping, "sendPingRequestAsync"); const spy = vi.spyOn(ping, "sendPingRequestAsync");
const url = "http://localhost"; const url = "http://localhost";
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -35,7 +35,7 @@ describe("ping should call sendPingRequestAsync with url and return result", ()
// Arrange // Arrange
const spy = vi.spyOn(ping, "sendPingRequestAsync"); const spy = vi.spyOn(ping, "sendPingRequestAsync");
const url = "http://localhost"; const url = "http://localhost";
const db = await createDbAsync(); const db = createDb();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+3 -6
View File
@@ -1,11 +1,11 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, eq, like } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth"; import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq, like } from "@homarr/db";
import { getMaxGroupPositionAsync } from "@homarr/db/queries"; import { getMaxGroupPositionAsync } from "@homarr/db/queries";
import { boards, groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema"; import { boards, groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema";
import { selectUserSchema } from "@homarr/db/validationSchemas"; import { selectUserSchema } from "@homarr/db/validationSchemas";
@@ -174,7 +174,7 @@ export const userRouter = createTRPCRouter({
// Is protected because also used in board access / integration access forms // Is protected because also used in board access / integration access forms
selectable: protectedProcedure selectable: protectedProcedure
.input(z.object({ excludeExternalProviders: z.boolean().default(false) }).optional()) .input(z.object({ excludeExternalProviders: z.boolean().default(false) }).optional())
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true, email: true }))) .output(z.array(selectUserSchema.pick({ id: true, name: true, image: true })))
.meta({ openapi: { method: "GET", path: "/api/users/selectable", tags: ["users"], protect: true } }) .meta({ openapi: { method: "GET", path: "/api/users/selectable", tags: ["users"], protect: true } })
.query(({ ctx, input }) => { .query(({ ctx, input }) => {
return ctx.db.query.users.findMany({ return ctx.db.query.users.findMany({
@@ -182,7 +182,6 @@ export const userRouter = createTRPCRouter({
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
where: input?.excludeExternalProviders ? eq(users.provider, "credentials") : undefined, where: input?.excludeExternalProviders ? eq(users.provider, "credentials") : undefined,
}); });
@@ -195,7 +194,7 @@ export const userRouter = createTRPCRouter({
limit: z.number().min(1).max(100).default(10), limit: z.number().min(1).max(100).default(10),
}), }),
) )
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true, email: true }))) .output(z.array(selectUserSchema.pick({ id: true, name: true, image: true })))
.meta({ openapi: { method: "POST", path: "/api/users/search", tags: ["users"], protect: true } }) .meta({ openapi: { method: "POST", path: "/api/users/search", tags: ["users"], protect: true } })
.query(async ({ input, ctx }) => { .query(async ({ input, ctx }) => {
const dbUsers = await ctx.db.query.users.findMany({ const dbUsers = await ctx.db.query.users.findMany({
@@ -203,7 +202,6 @@ export const userRouter = createTRPCRouter({
id: true, id: true,
name: true, name: true,
image: true, image: true,
email: true,
}, },
where: like(users.name, `%${input.query}%`), where: like(users.name, `%${input.query}%`),
limit: input.limit, limit: input.limit,
@@ -212,7 +210,6 @@ export const userRouter = createTRPCRouter({
id: user.id, id: user.id,
name: user.name ?? "", name: user.name ?? "",
image: user.image, image: user.image,
email: user.email,
})); }));
}), }),
getById: protectedProcedure getById: protectedProcedure
@@ -1,9 +1,9 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import type { Modify } from "@homarr/common/types"; import type { Modify } from "@homarr/common/types";
import { eq } from "@homarr/db";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
import { userChangeSearchPreferencesSchema } from "@homarr/validation/user"; import { userChangeSearchPreferencesSchema } from "@homarr/validation/user";
@@ -9,7 +9,7 @@ import { createTRPCRouter, publicProcedure } from "../../trpc";
export const healthMonitoringRouter = createTRPCRouter({ export const healthMonitoringRouter = createTRPCRouter({
getSystemHealthStatus: publicProcedure getSystemHealthStatus: publicProcedure
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "unraid", "mock")) .concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "mock"))
.query(async ({ ctx }) => { .query(async ({ ctx }) => {
return await Promise.all( return await Promise.all(
ctx.integrations.map(async (integration) => { ctx.integrations.map(async (integration) => {
@@ -26,7 +26,7 @@ export const healthMonitoringRouter = createTRPCRouter({
); );
}), }),
subscribeSystemHealthStatus: publicProcedure subscribeSystemHealthStatus: publicProcedure
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "unraid", "mock")) .concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "mock"))
.subscription(({ ctx }) => { .subscription(({ ctx }) => {
return observable<{ integrationId: string; healthInfo: SystemHealthMonitoring; timestamp: Date }>((emit) => { return observable<{ integrationId: string; healthInfo: SystemHealthMonitoring; timestamp: Date }>((emit) => {
const unsubscribes: (() => void)[] = []; const unsubscribes: (() => void)[] = [];
+2 -2
View File
@@ -1,8 +1,8 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import SuperJSON from "superjson"; import SuperJSON from "superjson";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { eq } from "@homarr/db";
import { boards, items } from "@homarr/db/schema"; import { boards, items } from "@homarr/db/schema";
import { createTRPCRouter, protectedProcedure } from "../../trpc"; import { createTRPCRouter, protectedProcedure } from "../../trpc";
@@ -24,7 +24,7 @@ export const notebookRouter = createTRPCRouter({
where: eq(items.id, input.itemId), where: eq(items.id, input.itemId),
}); });
if (item?.boardId !== input.boardId) { if (!item || item.boardId !== input.boardId) {
throw new TRPCError({ throw new TRPCError({
code: "NOT_FOUND", code: "NOT_FOUND",
message: "Specified item was not found", message: "Specified item was not found",
+1 -1
View File
@@ -1,8 +1,8 @@
import type { Adapter } from "@auth/core/adapters"; import type { Adapter } from "@auth/core/adapters";
import { DrizzleAdapter } from "@auth/drizzle-adapter"; import { DrizzleAdapter } from "@auth/drizzle-adapter";
import { and, eq } from "drizzle-orm";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq } from "@homarr/db";
import { accounts, sessions, users } from "@homarr/db/schema"; import { accounts, sessions, users } from "@homarr/db/schema";
import type { SupportedAuthProvider } from "@homarr/definitions"; import type { SupportedAuthProvider } from "@homarr/definitions";
-1
View File
@@ -1 +0,0 @@
export const API_KEY_HEADER_NAME = "ApiKey";
@@ -1,76 +0,0 @@
import type { Session } from "next-auth";
import { createLogger } from "@homarr/core/infrastructure/logs";
import type { Database } from "@homarr/db";
import { eq } from "@homarr/db";
import { apiKeys } from "@homarr/db/schema";
import { hashPasswordAsync } from "../security";
import { createSessionAsync } from "../server";
const logger = createLogger({ module: "apiKeyAuth" });
/**
* Validate an API key from the request header and return a session if valid.
*
* @param db - The database instance
* @param apiKeyHeaderValue - The value of the ApiKey header (format: "id.token")
* @param ipAddress - The IP address of the request (for logging)
* @param userAgent - The user agent of the request (for logging)
* @returns A session if the API key is valid, null otherwise
*/
export const getSessionFromApiKeyAsync = async (
db: Database,
apiKeyHeaderValue: string | null,
ipAddress: string | null,
userAgent: string,
): Promise<Session | null> => {
if (apiKeyHeaderValue === null) {
return null;
}
const [apiKeyId, apiKey] = apiKeyHeaderValue.split(".");
if (!apiKeyId || !apiKey) {
logger.warn("Failed to authenticate with api-key", { ipAddress, userAgent, reason: "API_KEY_INVALID_FORMAT" });
return null;
}
const apiKeyFromDb = await db.query.apiKeys.findFirst({
where: eq(apiKeys.id, apiKeyId),
columns: {
id: true,
apiKey: true,
salt: true,
},
with: {
user: {
columns: {
id: true,
name: true,
email: true,
emailVerified: true,
},
},
},
});
if (!apiKeyFromDb) {
logger.warn("Failed to authenticate with api-key", { ipAddress, userAgent, reason: "API_KEY_NOT_FOUND" });
return null;
}
const hashedApiKey = await hashPasswordAsync(apiKey, apiKeyFromDb.salt);
if (apiKeyFromDb.apiKey !== hashedApiKey) {
logger.warn("Failed to authenticate with api-key", { ipAddress, userAgent, reason: "API_KEY_MISMATCH" });
return null;
}
logger.info("Successfully authenticated with api-key", {
name: apiKeyFromDb.user.name,
id: apiKeyFromDb.user.id,
});
return await createSessionAsync(db, apiKeyFromDb.user);
};
-2
View File
@@ -1,2 +0,0 @@
export { getSessionFromApiKeyAsync } from "./get-api-key-session";
export { API_KEY_HEADER_NAME } from "./constants";
@@ -1,133 +0,0 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
import { describe, expect, test, vi } from "vitest";
import { createId } from "@homarr/common";
import { apiKeys, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test";
import { createSaltAsync, hashPasswordAsync } from "../../security";
import { getSessionFromApiKeyAsync } from "../get-api-key-session";
// Mock the logger to avoid console output during tests
vi.mock("@homarr/core/infrastructure/logs", () => ({
createLogger: () => ({
warn: vi.fn(),
info: vi.fn(),
}),
}));
const defaultUserId = createId();
const defaultUsername = "testuser";
const defaultApiKeyId = createId();
const defaultIpAddress = "127.0.0.1";
const defaultUserAgent = "test-agent";
const defaultLogParams = [defaultIpAddress, defaultUserAgent] as const;
describe("getSessionFromApiKeyAsync", () => {
test("should return null when api key header is null", async () => {
// Arrange
const { db } = await setupAsync();
const apiKey = null;
// Act
const result = await getSessionFromApiKeyAsync(db, apiKey, ...defaultLogParams);
// Assert
expect(result).toBeNull();
});
test.each([
["invalidformat", "no dot"],
["keyid.", "missing token"],
[".token", "missing id"],
])("should return null when api key format is invalid key=%s reason=%s", async (apiKey) => {
// Arrange
const { db } = await setupAsync();
// Act
const result = await getSessionFromApiKeyAsync(db, apiKey, ...defaultLogParams);
// Assert
expect(result).toBeNull();
});
test("should return null when api key is not found in database", async () => {
// Arrange
const { db } = await setupAsync();
// Act
const result = await getSessionFromApiKeyAsync(db, "nonexistent.token", ...defaultLogParams);
// Assert
expect(result).toBeNull();
});
test("should return null when api key token does not match", async () => {
// Arrange
const { db } = await setupAsync({ token: "correcttoken" });
// Act
const result = await getSessionFromApiKeyAsync(db, `${defaultApiKeyId}.wrongtoken`, ...defaultLogParams);
// Assert
expect(result).toBeNull();
});
test("should return session when api key is valid", async () => {
// Arrange
const token = "validtesttoken123";
const { db } = await setupAsync({ token });
// Act
const result = await getSessionFromApiKeyAsync(db, `${defaultApiKeyId}.${token}`, ...defaultLogParams);
// Assert
expect(result).not.toBeNull();
expect(result!.user.id).toEqual(defaultUserId);
expect(result!.user.name).toEqual(defaultUsername);
});
test("should work with null ip address", async () => {
// Arrange
const token = "validtesttoken456";
const { db } = await setupAsync({ token });
// Act
const result = await getSessionFromApiKeyAsync(db, `${defaultApiKeyId}.${token}`, null, defaultUserAgent);
// Assert
expect(result).not.toBeNull();
expect(result!.user.id).toEqual(defaultUserId);
});
});
interface SetupOptions {
/**
* If provided, inserts an API key into the database for testing.
*/
token?: string;
}
const setupAsync = async (options?: SetupOptions) => {
const db = createDb();
await db.insert(users).values({
id: defaultUserId,
name: defaultUsername,
email: "test@example.com",
});
if (options?.token) {
const salt = await createSaltAsync();
await db.insert(apiKeys).values({
id: defaultApiKeyId,
apiKey: await hashPasswordAsync(options.token, salt),
salt,
userId: defaultUserId,
});
}
return {
db,
};
};
+1 -1
View File
@@ -1,9 +1,9 @@
import dayjs from "dayjs"; import dayjs from "dayjs";
import { eq, inArray } from "drizzle-orm";
import type { NextAuthConfig } from "next-auth"; import type { NextAuthConfig } from "next-auth";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { eq, inArray } from "@homarr/db";
import { groupMembers, groupPermissions, users } from "@homarr/db/schema"; import { groupMembers, groupPermissions, users } from "@homarr/db/schema";
import { getPermissionsWithChildren } from "@homarr/definitions"; import { getPermissionsWithChildren } from "@homarr/definitions";
+1 -1
View File
@@ -1,9 +1,9 @@
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { and, eq, inArray } from "drizzle-orm";
import type { NextAuthConfig } from "next-auth"; import type { NextAuthConfig } from "next-auth";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { and, eq, inArray } from "@homarr/db";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { groupMembers, groups, users } from "@homarr/db/schema"; import { groupMembers, groups, users } from "@homarr/db/schema";
import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions"; import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions";
+4 -4
View File
@@ -8,7 +8,6 @@
".": "./index.ts", ".": "./index.ts",
"./next": "./next.ts", "./next": "./next.ts",
"./security": "./security.ts", "./security": "./security.ts",
"./api-key": "./api-key/index.ts",
"./client": "./client.ts", "./client": "./client.ts",
"./server": "./server.ts", "./server": "./server.ts",
"./shared": "./shared.ts", "./shared": "./shared.ts",
@@ -33,12 +32,13 @@
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"bcrypt": "^6.0.0", "bcrypt": "^6.0.0",
"cookies": "^0.9.1", "cookies": "^0.9.1",
"ldapts": "8.1.3", "drizzle-orm": "^0.45.1",
"next": "16.1.1", "ldapts": "8.0.24",
"next": "16.0.10",
"next-auth": "5.0.0-beta.30", "next-auth": "5.0.0-beta.30",
"react": "19.2.3", "react": "19.2.3",
"react-dom": "19.2.3", "react-dom": "19.2.3",
"zod": "^4.2.1" "zod": "^4.2.0"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
@@ -1,7 +1,7 @@
import { and, eq, inArray, or } from "drizzle-orm";
import type { Session } from "next-auth"; import type { Session } from "next-auth";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq, inArray, or } from "@homarr/db";
import { boards, boardUserPermissions, groupMembers } from "@homarr/db/schema"; import { boards, boardUserPermissions, groupMembers } from "@homarr/db/schema";
import type { IntegrationPermission } from "@homarr/definitions"; import type { IntegrationPermission } from "@homarr/definitions";
@@ -1,6 +1,7 @@
import { eq, inArray } from "drizzle-orm";
import type { Session } from "next-auth"; import type { Session } from "next-auth";
import { db, eq, inArray } from "@homarr/db"; import { db } from "@homarr/db";
import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema"; import { groupMembers, integrationGroupPermissions, integrationUserPermissions } from "@homarr/db/schema";
import { constructIntegrationPermissions } from "./integration-permissions"; import { constructIntegrationPermissions } from "./integration-permissions";
@@ -1,10 +1,10 @@
import type { InferInsertModel } from "drizzle-orm";
import type { Session } from "next-auth"; import type { Session } from "next-auth";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { InferInsertModel } from "@homarr/db";
import { boardGroupPermissions, boards, boardUserPermissions, groupMembers, groups, users } from "@homarr/db/schema"; import { boardGroupPermissions, boards, boardUserPermissions, groupMembers, groups, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import * as integrationPermissions from "../integration-permissions"; import * as integrationPermissions from "../integration-permissions";
import { hasQueryAccessToIntegrationsAsync } from "../integration-query-permissions"; import { hasQueryAccessToIntegrationsAsync } from "../integration-query-permissions";
@@ -22,7 +22,7 @@ const createSession = (user: Partial<Session["user"]>): Session => ({
describe("hasQueryAccessToIntegrationsAsync should check if the user has query access to the specified integrations", () => { describe("hasQueryAccessToIntegrationsAsync should check if the user has query access to the specified integrations", () => {
test("should return true if the user has the board-view-all permission and the integrations are used anywhere", async () => { test("should return true if the user has the board-view-all permission and the integrations are used anywhere", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({ const session = createSession({
permissions: ["board-view-all"], permissions: ["board-view-all"],
}); });
@@ -50,7 +50,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has the board-view-all permission, the first integration is used and the second one he has use access", async () => { test("should return true if the user has the board-view-all permission, the first integration is used and the second one he has use access", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({ const session = createSession({
permissions: ["board-view-all"], permissions: ["board-view-all"],
}); });
@@ -84,7 +84,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has use access to all integrations", async () => { test("should return true if the user has use access to all integrations", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
@@ -116,7 +116,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has user permission to access to at least one board of each integration", async () => { test("should return true if the user has user permission to access to at least one board of each integration", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -168,7 +168,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user has user permission to access board of first integration but not of second one", async () => { test("should return false if the user has user permission to access board of first integration but not of second one", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -215,7 +215,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has group permission to access to at least one board of each integration", async () => { test("should return true if the user has group permission to access to at least one board of each integration", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -269,7 +269,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user has group permission to access board of first integration but not of second one", async () => { test("should return false if the user has group permission to access board of first integration but not of second one", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -318,7 +318,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has user permission to access first board and group permission to access second one", async () => { test("should return true if the user has user permission to access first board and group permission to access second one", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -369,7 +369,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if one of the boards the integration is used is public", async () => { test("should return true if one of the boards the integration is used is public", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
const integrations = [ const integrations = [
{ {
@@ -413,7 +413,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user is creator of the board the integration is used", async () => { test("should return true if the user is creator of the board the integration is used", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const integrations = [ const integrations = [
@@ -458,7 +458,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user has no access to any of the integrations", async () => { test("should return false if the user has no access to any of the integrations", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const session = createSession({}); const session = createSession({});
const integrations = [ const integrations = [
{ {
@@ -496,7 +496,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user is anonymous and the board is not public", async () => { test("should return false if the user is anonymous and the board is not public", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const integrations = [ const integrations = [
{ {
id: "1", id: "1",
@@ -534,7 +534,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user is anonymous and the board is public", async () => { test("should return true if the user is anonymous and the board is public", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const integrations = [ const integrations = [
{ {
id: "1", id: "1",
@@ -1,9 +1,9 @@
import bcrypt from "bcrypt"; import bcrypt from "bcrypt";
import { and, eq } from "drizzle-orm";
import type { z } from "zod/v4"; import type { z } from "zod/v4";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq } from "@homarr/db";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
import type { userSignInSchema } from "@homarr/validation/user"; import type { userSignInSchema } from "@homarr/validation/user";
@@ -1,10 +1,11 @@
import { CredentialsSignin } from "@auth/core/errors"; import { CredentialsSignin } from "@auth/core/errors";
import { and, eq } from "drizzle-orm";
import type { InferInsertModel } from "drizzle-orm";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import type { Database, InferInsertModel } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq } from "@homarr/db";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
import type { ldapSignInSchema } from "@homarr/validation/user"; import type { ldapSignInSchema } from "@homarr/validation/user";
@@ -2,7 +2,7 @@ import { describe, expect, test } from "vitest";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { createSaltAsync, hashPasswordAsync } from "../../security"; import { createSaltAsync, hashPasswordAsync } from "../../security";
import { authorizeWithBasicCredentialsAsync } from "../credentials/authorization/basic-authorization"; import { authorizeWithBasicCredentialsAsync } from "../credentials/authorization/basic-authorization";
@@ -12,7 +12,7 @@ const defaultUserId = createId();
describe("authorizeWithBasicCredentials", () => { describe("authorizeWithBasicCredentials", () => {
test("should authorize user with correct credentials", async () => { test("should authorize user with correct credentials", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const salt = await createSaltAsync(); const salt = await createSaltAsync();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
@@ -33,7 +33,7 @@ describe("authorizeWithBasicCredentials", () => {
test("should not authorize user with incorrect credentials", async () => { test("should not authorize user with incorrect credentials", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const salt = await createSaltAsync(); const salt = await createSaltAsync();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
@@ -54,7 +54,7 @@ describe("authorizeWithBasicCredentials", () => {
test("should not authorize user with incorrect username", async () => { test("should not authorize user with incorrect username", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const salt = await createSaltAsync(); const salt = await createSaltAsync();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
@@ -75,7 +75,7 @@ describe("authorizeWithBasicCredentials", () => {
test("should not authorize user when password is not set", async () => { test("should not authorize user when password is not set", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
name: "test", name: "test",
@@ -1,11 +1,11 @@
import { CredentialsSignin } from "@auth/core/errors"; import { CredentialsSignin } from "@auth/core/errors";
import { and, eq } from "drizzle-orm";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq } from "@homarr/db";
import { groups, users } from "@homarr/db/schema"; import { groups, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization"; import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization";
import * as ldapClient from "../credentials/ldap-client"; import * as ldapClient from "../credentials/ldap-client";
@@ -123,7 +123,7 @@ describe("authorizeWithLdapCredentials", () => {
test("should authorize user with correct credentials and create user", async () => { test("should authorize user with correct credentials and create user", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(ldapClient, "LdapClient"); const spy = vi.spyOn(ldapClient, "LdapClient");
spy.mockImplementation(function () { spy.mockImplementation(function () {
return { return {
@@ -161,7 +161,7 @@ describe("authorizeWithLdapCredentials", () => {
test("should authorize user with correct credentials and create user with same email when credentials user already exists", async () => { test("should authorize user with correct credentials and create user with same email when credentials user already exists", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const spy = vi.spyOn(ldapClient, "LdapClient"); const spy = vi.spyOn(ldapClient, "LdapClient");
spy.mockImplementation(function () { spy.mockImplementation(function () {
return { return {
@@ -230,7 +230,7 @@ describe("authorizeWithLdapCredentials", () => {
}); });
const userId = createId(); const userId = createId();
const db = await createDbAsync(); const db = createDb();
await db.insert(users).values({ await db.insert(users).values({
id: userId, id: userId,
name: "test-old", name: "test-old",
@@ -281,7 +281,7 @@ describe("authorizeWithLdapCredentials", () => {
disconnectAsync: vi.fn(), disconnectAsync: vi.fn(),
} as unknown as ldapClient.LdapClient; } as unknown as ldapClient.LdapClient;
}); });
const db = await createDbAsync(); const db = createDb();
const userId = createId(); const userId = createId();
await db.insert(users).values({ await db.insert(users).values({
id: userId, id: userId,
+4 -4
View File
@@ -1,7 +1,7 @@
import { describe, expect, test } from "vitest"; import { describe, expect, test } from "vitest";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { createAdapter } from "../adapter"; import { createAdapter } from "../adapter";
@@ -10,7 +10,7 @@ describe("createAdapter should create drizzle adapter", () => {
"createAdapter getUserByEmail should return user for provider %s when this provider provided", "createAdapter getUserByEmail should return user for provider %s when this provider provided",
async (provider) => { async (provider) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const adapter = createAdapter(db, provider); const adapter = createAdapter(db, provider);
const email = "test@example.com"; const email = "test@example.com";
await db.insert(users).values({ id: "1", name: "test", email, provider }); await db.insert(users).values({ id: "1", name: "test", email, provider });
@@ -37,7 +37,7 @@ describe("createAdapter should create drizzle adapter", () => {
"createAdapter getUserByEmail should return null if only for other providers than %s exist", "createAdapter getUserByEmail should return null if only for other providers than %s exist",
async (requestedProvider, existingProviders) => { async (requestedProvider, existingProviders) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const adapter = createAdapter(db, requestedProvider); const adapter = createAdapter(db, requestedProvider);
const email = "test@example.com"; const email = "test@example.com";
for (const provider of existingProviders) { for (const provider of existingProviders) {
@@ -54,7 +54,7 @@ describe("createAdapter should create drizzle adapter", () => {
test("createAdapter getUserByEmail should throw error if provider is unknown", async () => { test("createAdapter getUserByEmail should throw error if provider is unknown", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const adapter = createAdapter(db, "unknown"); const adapter = createAdapter(db, "unknown");
const email = "test@example.com"; const email = "test@example.com";
+5 -5
View File
@@ -4,7 +4,7 @@ import type { JWT } from "next-auth/jwt";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema"; import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import * as definitions from "@homarr/definitions"; import * as definitions from "@homarr/definitions";
import { createSessionCallback, getCurrentUserPermissionsAsync } from "../callbacks"; import { createSessionCallback, getCurrentUserPermissionsAsync } from "../callbacks";
@@ -20,7 +20,7 @@ vi.mock("next/headers", () => ({
describe("getCurrentUserPermissions", () => { describe("getCurrentUserPermissions", () => {
test("should return empty permissions when non existing user requested", async () => { test("should return empty permissions when non existing user requested", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await db.insert(groups).values({ await db.insert(groups).values({
id: "2", id: "2",
@@ -46,7 +46,7 @@ describe("getCurrentUserPermissions", () => {
test("should return empty permissions when user has no groups", async () => { test("should return empty permissions when user has no groups", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const userId = "1"; const userId = "1";
await db.insert(groups).values({ await db.insert(groups).values({
@@ -71,7 +71,7 @@ describe("getCurrentUserPermissions", () => {
test("should return permissions for user", async () => { test("should return permissions for user", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
const getPermissionsWithChildrenMock = vi const getPermissionsWithChildrenMock = vi
.spyOn(definitions, "getPermissionsWithChildren") .spyOn(definitions, "getPermissionsWithChildren")
.mockReturnValue(["board-create"]); .mockReturnValue(["board-create"]);
@@ -113,7 +113,7 @@ describe("session callback", () => {
emailVerified: new Date("2023-01-13"), emailVerified: new Date("2023-01-13"),
}; };
const token: JWT = {}; const token: JWT = {};
const db = await createDbAsync(); const db = createDb();
const callback = createSessionCallback(db); const callback = createSessionCallback(db);
// Act // Act
+11 -11
View File
@@ -1,12 +1,12 @@
import type { ResponseCookie } from "next/dist/compiled/@edge-runtime/cookies"; import type { ResponseCookie } from "next/dist/compiled/@edge-runtime/cookies";
import type { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies"; import type { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import { eq } from "drizzle-orm";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import { eq } from "@homarr/db";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { groupMembers, groups, users } from "@homarr/db/schema"; import { groupMembers, groups, users } from "@homarr/db/schema";
import { createDbAsync } from "@homarr/db/test"; import { createDb } from "@homarr/db/test";
import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions"; import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions";
import { createSignInEventHandler } from "../events"; import { createSignInEventHandler } from "../events";
@@ -39,7 +39,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
describe("signInEventHandler should add users to everyone group", () => { describe("signInEventHandler should add users to everyone group", () => {
test("should add user to everyone group if he isn't already", async () => { test("should add user to everyone group if he isn't already", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db, everyoneGroup); await createGroupAsync(db, everyoneGroup);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -62,7 +62,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
describe("signInEventHandler should synchronize ldap groups", () => { describe("signInEventHandler should synchronize ldap groups", () => {
test("should add missing group membership", async () => { test("should add missing group membership", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -82,7 +82,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should remove group membership", async () => { test("should remove group membership", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -106,7 +106,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should not remove group membership for everyone group", async () => { test("should not remove group membership for everyone group", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db, everyoneGroup); await createGroupAsync(db, everyoneGroup);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -132,7 +132,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
describe("signInEventHandler should synchronize oidc groups", () => { describe("signInEventHandler should synchronize oidc groups", () => {
test("should add missing group membership", async () => { test("should add missing group membership", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -152,7 +152,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should remove group membership", async () => { test("should remove group membership", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -176,7 +176,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should not remove group membership for everyone group", async () => { test("should not remove group membership for everyone group", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db, everyoneGroup); await createGroupAsync(db, everyoneGroup);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -205,7 +205,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
["oidc" as const, { name: "test" }, { preferred_username: "test@example.com", name: "test-new" }], ["oidc" as const, { name: "test" }, { preferred_username: "test@example.com", name: "test-new" }],
])("signInEventHandler should update username for %s provider", async (_provider, user, profile) => { ])("signInEventHandler should update username for %s provider", async (_provider, user, profile) => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -227,7 +227,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("signInEventHandler should set color-scheme cookie", async () => { test("signInEventHandler should set color-scheme cookie", async () => {
// Arrange // Arrange
const db = await createDbAsync(); const db = createDb();
await createUserAsync(db); await createUserAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
+3 -2
View File
@@ -28,13 +28,14 @@
"@homarr/common": "workspace:^0.1.0", "@homarr/common": "workspace:^0.1.0",
"@homarr/db": "workspace:^0.1.0", "@homarr/db": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"dotenv": "^17.2.3" "dotenv": "^17.2.3",
"drizzle-orm": "^0.45.1"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"esbuild": "^0.27.2", "esbuild": "^0.27.1",
"eslint": "^9.39.2", "eslint": "^9.39.2",
"typescript": "^5.9.3" "typescript": "^5.9.3"
} }
+2 -1
View File
@@ -1,6 +1,7 @@
import { command } from "@drizzle-team/brocli"; import { command } from "@drizzle-team/brocli";
import { eq } from "drizzle-orm";
import { db, eq } from "@homarr/db"; import { db } from "@homarr/db";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
export const fixUsernames = command({ export const fixUsernames = command({
+2 -1
View File
@@ -1,9 +1,10 @@
import { command, string } from "@drizzle-team/brocli"; import { command, string } from "@drizzle-team/brocli";
import { and, count, eq } from "drizzle-orm";
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth"; import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { generateSecureRandomToken } from "@homarr/common/server"; import { generateSecureRandomToken } from "@homarr/common/server";
import { and, count, db, eq } from "@homarr/db"; import { db } from "@homarr/db";
import { getMaxGroupPositionAsync } from "@homarr/db/queries"; import { getMaxGroupPositionAsync } from "@homarr/db/queries";
import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema"; import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
import { usernameSchema } from "@homarr/validation/user"; import { usernameSchema } from "@homarr/validation/user";
+2 -1
View File
@@ -1,8 +1,9 @@
import { command, string } from "@drizzle-team/brocli"; import { command, string } from "@drizzle-team/brocli";
import { and, eq } from "drizzle-orm";
import { hashPasswordAsync } from "@homarr/auth"; import { hashPasswordAsync } from "@homarr/auth";
import { generateSecureRandomToken } from "@homarr/common/server"; import { generateSecureRandomToken } from "@homarr/common/server";
import { and, db, eq } from "@homarr/db"; import { db } from "@homarr/db";
import { sessions, users } from "@homarr/db/schema"; import { sessions, users } from "@homarr/db/schema";
export const resetPassword = command({ export const resetPassword = command({
+3 -3
View File
@@ -29,12 +29,12 @@
"@homarr/core": "workspace:^0.1.0", "@homarr/core": "workspace:^0.1.0",
"@paralleldrive/cuid2": "^3.1.0", "@paralleldrive/cuid2": "^3.1.0",
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
"next": "16.1.1", "next": "16.0.10",
"octokit": "^5.0.5", "octokit": "^5.0.5",
"react": "19.2.3", "react": "19.2.3",
"react-dom": "19.2.3", "react-dom": "19.2.3",
"undici": "7.18.2", "undici": "7.16.0",
"zod": "^4.2.1", "zod": "^4.2.0",
"zod-validation-error": "^5.0.0" "zod-validation-error": "^5.0.0"
}, },
"devDependencies": { "devDependencies": {
+1 -1
View File
@@ -1,4 +1,4 @@
export * from "./security"; export * from "./security";
export * from "./encryption"; export * from "./encryption";
export * from "./request"; export * from "./user-agent";
export * from "./errors"; export * from "./errors";
@@ -9,7 +9,3 @@ export const userAgent = (headers: Headers) => {
}; };
export type DeviceType = "console" | "mobile" | "tablet" | "smarttv" | "wearable" | "embedded" | undefined; export type DeviceType = "console" | "mobile" | "tablet" | "smarttv" | "wearable" | "embedded" | undefined;
export const ipAddressFromHeaders = (headers: Headers): string | null => {
return headers.get("x-forwarded-for");
};
+5 -4
View File
@@ -37,21 +37,22 @@
}, },
"prettier": "@homarr/prettier-config", "prettier": "@homarr/prettier-config",
"dependencies": { "dependencies": {
"@libsql/client": "0.15.15",
"@t3-oss/env-nextjs": "^0.13.10", "@t3-oss/env-nextjs": "^0.13.10",
"better-sqlite3": "^12.5.0",
"dns-caching": "^0.2.9", "dns-caching": "^0.2.9",
"drizzle-orm": "^0.45.1", "drizzle-orm": "^0.45.1",
"ioredis": "5.9.1", "ioredis": "5.8.2",
"mysql2": "3.16.0", "mysql2": "3.15.3",
"pg": "^8.16.3", "pg": "^8.16.3",
"superjson": "2.2.6", "superjson": "2.2.6",
"winston": "3.19.0", "winston": "3.19.0",
"zod": "^4.2.1" "zod": "^4.2.0"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/better-sqlite3": "7.6.13",
"@types/pg": "^8.16.0", "@types/pg": "^8.16.0",
"eslint": "^9.39.2", "eslint": "^9.39.2",
"typescript": "^5.9.3" "typescript": "^5.9.3"
Loaded 100 of 233 files, more files were not shown because too many files have changed in this diff. Show more