Compare commits
173
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0e89116a52 | ||
|
|
939996f41e | ||
|
|
fbad058712 | ||
|
|
0c38e2f290 | ||
|
|
31c68f43d5 | ||
|
|
f096476fc2 | ||
|
|
e9020e68ec | ||
|
|
be75c320f9 | ||
|
|
05ce9cf7a6 | ||
|
|
a4a5d0ac51 | ||
|
|
11c92929b1 | ||
|
|
70f3ab21c1 | ||
|
|
c3dc3f2eef | ||
|
|
4f8b530294 | ||
|
|
c54d3498f3 | ||
|
|
275a346afa | ||
|
|
c24006dca6 | ||
|
|
5d00642268 | ||
|
|
b2798d7aca | ||
|
|
b26cf0e65f | ||
|
|
55c2666f9d | ||
|
|
7fa990712b | ||
|
|
21db9618c6 | ||
|
|
07ba53165c | ||
|
|
16733c2a0e | ||
|
|
33a3c857a6 | ||
|
|
d479b63a80 | ||
|
|
9043d8e4b8 | ||
|
|
629359e3e4 | ||
|
|
50410fedb3 | ||
|
|
ab3ee4f78a | ||
|
|
fe615755c7 | ||
|
|
b76ab2961d | ||
|
|
ab2703b32a | ||
|
|
f67a915174 | ||
|
|
fa8af6a453 | ||
|
|
155d4f2270 | ||
|
|
21a91b1489 | ||
|
|
0d8695feae | ||
|
|
0364e102cd | ||
|
|
e9ba102cf6 | ||
|
|
830e84d546 | ||
|
|
5b5aa3caac | ||
|
|
69fb4c6856 | ||
|
|
a2a34124ae | ||
|
|
717e17c9f8 | ||
|
|
dabb2bb782 | ||
|
|
35042a783c | ||
|
|
9e63e3443a | ||
|
|
0dc61a88b8 | ||
|
|
c8ecf5f0a1 | ||
|
|
413e846133 | ||
|
|
6e572e3fc5 | ||
|
|
d2b24452e8 | ||
|
|
6dd7e23a97 | ||
|
|
3fbc5013c3 | ||
|
|
96e2f4fcca | ||
|
|
ea848bdd0b | ||
|
|
f0a2551fdf | ||
|
|
35e0198b5d | ||
|
|
c13e3a1d0a | ||
|
|
0270dae3d6 | ||
|
|
19a4bee334 | ||
|
|
60f9d4e6e6 | ||
|
|
7d3322576c | ||
|
|
1842e5fff5 | ||
|
|
1b70973084 | ||
|
|
b4ac3fc346 | ||
|
|
4904f5c270 | ||
|
|
15b4dfed0f | ||
|
|
a853463ade | ||
|
|
9dd00370ff | ||
|
|
fad478c549 | ||
|
|
9b0dd6d6ce | ||
|
|
acb0bc68d2 | ||
|
|
45d2102d38 | ||
|
|
72baf965b4 | ||
|
|
808ace3983 | ||
|
|
1e5d38fd3c | ||
|
|
bf44a8ecb1 | ||
|
|
236fa35f7e | ||
|
|
a004bfbb9e | ||
|
|
e574dd70f1 | ||
|
|
249d929435 | ||
|
|
e40a11608c | ||
|
|
1f1a5f2583 | ||
|
|
d00270046a | ||
|
|
809bf559fe | ||
|
|
67600ff687 | ||
|
|
9191430229 | ||
|
|
49afb82446 | ||
|
|
f04f53759b | ||
|
|
7712ab410b | ||
|
|
1c727e59af | ||
|
|
8b096939e4 | ||
|
|
adaa8039dd | ||
|
|
5463402f5c | ||
|
|
5baa183718 | ||
|
|
93bf9ab84b | ||
|
|
4ff98e3803 | ||
|
|
d8db0169a1 | ||
|
|
96c2c0d604 | ||
|
|
5a57115ca0 | ||
|
|
707a4dad83 | ||
|
|
5dd7400684 | ||
|
|
6b774f47d0 | ||
|
|
adbe707c73 | ||
|
|
75c545344a | ||
|
|
7c399f4073 | ||
|
|
5d659a3ebb | ||
|
|
99f2842a5a | ||
|
|
f34bdce644 | ||
|
|
8891ac4239 | ||
|
|
602c37574e | ||
|
|
f4d782abef | ||
|
|
a20b479a42 | ||
|
|
68dc6844fd | ||
|
|
88baad8143 | ||
|
|
ef12b2b5c2 | ||
|
|
551a7ea469 | ||
|
|
fbb5298cb0 | ||
|
|
2dc8feae7e | ||
|
|
6e39524f9d | ||
|
|
b699f28177 | ||
|
|
de39c7e85b | ||
|
|
e9c33cdd5a | ||
|
|
648f7e2c77 | ||
|
|
41f40149b3 | ||
|
|
689523a194 | ||
|
|
2ea0437a97 | ||
|
|
df3a3f94c8 | ||
|
|
47d7458143 | ||
|
|
6f0dbae121 | ||
|
|
a0a11e3570 | ||
|
|
f4bb90013a | ||
|
|
2b971b9392 | ||
|
|
949a006b35 | ||
|
|
5011e5299e | ||
|
|
db337b2525 | ||
|
|
7710c09f0d | ||
|
|
391d725191 | ||
|
|
1f44845df4 | ||
|
|
b005cf045f | ||
|
|
7f6eaa0b1f | ||
|
|
8afe7014e7 | ||
|
|
f1da25d204 | ||
|
|
36901e80ab | ||
|
|
266aefd980 | ||
|
|
ac6fed9946 | ||
|
|
611b65e8bd | ||
|
|
08e9f7d8d8 | ||
|
|
1ff6fac71b | ||
|
|
298a96054e | ||
|
|
e954ea861c | ||
|
|
703c8ccc06 | ||
|
|
9adf113042 | ||
|
|
4c7185646d | ||
|
|
d348abfe4a | ||
|
|
d86af072bf | ||
|
|
423da9eeb8 | ||
|
|
17fc7a043b | ||
|
|
82e79f2627 | ||
|
|
8ed771d300 | ||
|
|
bdfc150115 | ||
|
|
4d593f5b9d | ||
|
|
369dc898d0 | ||
|
|
7445c826b8 | ||
|
|
cf5aabd49f | ||
|
|
f63500961f | ||
|
|
e327c660b2 | ||
|
|
c880ce9bd9 | ||
|
|
b932a8dae3 | ||
|
|
4aef85ba60 |
No files matched your search
@@ -33,6 +33,12 @@ 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.45.3
|
||||||
|
- 1.45.2
|
||||||
- 1.45.1
|
- 1.45.1
|
||||||
- 1.45.0
|
- 1.45.0
|
||||||
- 1.44.0
|
- 1.44.0
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ inputs:
|
|||||||
description: Digest of Docker image to use
|
description: Digest of Docker image to use
|
||||||
required: true
|
required: true
|
||||||
architecture:
|
architecture:
|
||||||
description: Name of architecture, will be used to create directories (e.g. amd64, arm64)
|
description: Name of architecture, will be used to build artifact content (amd64 or arm64)
|
||||||
required: true
|
required: true
|
||||||
release-tag:
|
release-tag:
|
||||||
description: Tag of the release to which the artifact will be attached
|
description: Tag of the release to which the artifact will be attached
|
||||||
@@ -25,19 +25,32 @@ runs:
|
|||||||
-e "SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000" \
|
-e "SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000" \
|
||||||
--detach --rm ${{ inputs.digest }}
|
--detach --rm ${{ inputs.digest }}
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: Extract build from ${{ inputs.architecture }} container
|
- name: Prepare extraction
|
||||||
run: |
|
run: |
|
||||||
docker exec homarr cp /etc/nginx/templates/nginx.conf /app && \
|
docker exec homarr cp /etc/nginx/templates/nginx.conf /app && \
|
||||||
docker exec homarr tar -czf extraction.tar.gz -C /app . && \
|
mkdir -p ${{ runner.temp }}/extraction/${{ inputs.architecture }}
|
||||||
mkdir -p ${{ runner.temp }}/extraction/${{ inputs.architecture }} && \
|
shell: bash
|
||||||
docker cp homarr:/app/extraction.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-${{ inputs.architecture }}.tar.gz
|
- name: Extract source from ${{ inputs.architecture }} container (alpine)
|
||||||
|
run: |
|
||||||
|
docker exec homarr tar -czf extraction-alpine.tar.gz -C /app . && \
|
||||||
|
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
|
||||||
|
shell: bash
|
||||||
|
- name: Copy source for debian build artifact
|
||||||
|
run: |
|
||||||
|
cp ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.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()
|
||||||
run: docker container remove --force --volumes homarr
|
run: docker container remove --force --volumes homarr
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: Add build archive to release
|
- name: Add build archive to release (alpine)
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ inputs.token }}
|
GH_TOKEN: ${{ inputs.token }}
|
||||||
run: gh release upload --repo ${{ inputs.repository }} ${{ inputs.release-tag }} ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-${{ inputs.architecture }}.tar.gz --clobber
|
run: gh release upload --repo ${{ inputs.repository }} ${{ inputs.release-tag }} ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz --clobber
|
||||||
|
shell: bash
|
||||||
|
- name: Add build archive to release (debian)
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ inputs.token }}
|
||||||
|
run: gh release upload --repo ${{ inputs.repository }} ${{ inputs.release-tag }} ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz --clobber
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -20,7 +20,6 @@
|
|||||||
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",
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ permissions: {}
|
|||||||
jobs:
|
jobs:
|
||||||
approve-automatic-prs:
|
approve-automatic-prs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 2
|
||||||
if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D and https://api.github.com/users/homarr-update-contributors%5Bbot%5D
|
if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D and https://api.github.com/users/homarr-update-contributors%5Bbot%5D
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ env:
|
|||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 10
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
@@ -38,6 +39,7 @@ jobs:
|
|||||||
|
|
||||||
format:
|
format:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 10
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
@@ -49,6 +51,7 @@ jobs:
|
|||||||
|
|
||||||
typecheck:
|
typecheck:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 10
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
@@ -60,6 +63,7 @@ jobs:
|
|||||||
|
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 10
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
@@ -77,6 +81,7 @@ jobs:
|
|||||||
|
|
||||||
e2e:
|
e2e:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 15
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
@@ -101,6 +106,7 @@ jobs:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 10
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- name: Setup
|
- name: Setup
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
validate-pull-request-title:
|
validate-pull-request-title:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 1
|
||||||
steps:
|
steps:
|
||||||
- uses: amannn/action-semantic-pull-request@v6
|
- uses: amannn/action-semantic-pull-request@v6
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
download-crowdin-translations:
|
download-crowdin-translations:
|
||||||
|
timeout-minutes: 5
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ jobs:
|
|||||||
# Don't run this action if the downloaded translations are being pushed
|
# Don't run this action if the downloaded translations are being pushed
|
||||||
if: "!contains(github.event.head_commit.message, 'chore(lang)')"
|
if: "!contains(github.event.head_commit.message, 'chore(lang)')"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ jobs:
|
|||||||
release:
|
release:
|
||||||
name: Create tag and release
|
name: Create tag and release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
env:
|
env:
|
||||||
SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' }}
|
SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' }}
|
||||||
outputs:
|
outputs:
|
||||||
@@ -64,7 +65,7 @@ jobs:
|
|||||||
- uses: actions/setup-node@v6
|
- uses: actions/setup-node@v6
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
with:
|
with:
|
||||||
node-version: 24.11.1
|
node-version: 24.12.0
|
||||||
cache: "pnpm"
|
cache: "pnpm"
|
||||||
- run: npm i -g pnpm
|
- run: npm i -g pnpm
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
@@ -112,6 +113,7 @@ jobs:
|
|||||||
name: Build docker image for amd64
|
name: Build docker image for amd64
|
||||||
needs: release
|
needs: release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 15
|
||||||
outputs:
|
outputs:
|
||||||
digest: ${{ steps.build.outputs.digest }}
|
digest: ${{ steps.build.outputs.digest }}
|
||||||
steps:
|
steps:
|
||||||
@@ -150,6 +152,7 @@ jobs:
|
|||||||
name: Build docker image for arm64
|
name: Build docker image for arm64
|
||||||
needs: release
|
needs: release
|
||||||
runs-on: ubuntu-24.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
|
timeout-minutes: 20
|
||||||
outputs:
|
outputs:
|
||||||
digest: ${{ steps.build.outputs.digest }}
|
digest: ${{ steps.build.outputs.digest }}
|
||||||
steps:
|
steps:
|
||||||
@@ -188,6 +191,7 @@ jobs:
|
|||||||
name: Extract amd64 asset from docker image
|
name: Extract amd64 asset from docker image
|
||||||
needs: [release, build-amd64]
|
needs: [release, build-amd64]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 2
|
||||||
steps:
|
steps:
|
||||||
- name: Extract amd64
|
- name: Extract amd64
|
||||||
if: needs.release.outputs.skipped == 'false'
|
if: needs.release.outputs.skipped == 'false'
|
||||||
@@ -203,6 +207,7 @@ jobs:
|
|||||||
name: Extract arm64 asset from docker image
|
name: Extract arm64 asset from docker image
|
||||||
needs: [release, build-arm64]
|
needs: [release, build-arm64]
|
||||||
runs-on: ubuntu-24.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
|
timeout-minutes: 2
|
||||||
steps:
|
steps:
|
||||||
- name: Extract arm64
|
- name: Extract arm64
|
||||||
if: needs.release.outputs.skipped == 'false'
|
if: needs.release.outputs.skipped == 'false'
|
||||||
@@ -217,6 +222,7 @@ jobs:
|
|||||||
name: Complete deployment and notify
|
name: Complete deployment and notify
|
||||||
needs: [release, build-amd64, build-arm64, extract-asset-amd64, extract-asset-arm64]
|
needs: [release, build-amd64, build-arm64, extract-asset-amd64, extract-asset-arm64]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
env:
|
env:
|
||||||
NEXT_VERSION: ${{ needs.release.outputs.version }}
|
NEXT_VERSION: ${{ needs.release.outputs.version }}
|
||||||
DEPLOY_LATEST: ${{ github.ref_name == 'main' }}
|
DEPLOY_LATEST: ${{ github.ref_name == 'main' }}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
create-and-merge-pr:
|
create-and-merge-pr:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 2
|
||||||
steps:
|
steps:
|
||||||
- name: Discord notification
|
- name: Discord notification
|
||||||
if: ${{ github.events.inputs.send-notifications }}
|
if: ${{ github.events.inputs.send-notifications }}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
renovate-validate:
|
renovate-validate:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 2
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- run: |
|
- run: |
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ jobs:
|
|||||||
trigger-docs-release:
|
trigger-docs-release:
|
||||||
name: Trigger Documentation Release
|
name: Trigger Documentation Release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 2
|
||||||
steps:
|
steps:
|
||||||
- name: Obtain token
|
- name: Obtain token
|
||||||
id: obtainToken
|
id: obtainToken
|
||||||
@@ -39,6 +40,7 @@ jobs:
|
|||||||
update-bug-report-template:
|
update-bug-report-template:
|
||||||
name: Update Bug Report Template
|
name: Update Bug Report Template
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
steps:
|
steps:
|
||||||
- name: Obtain token
|
- name: Obtain token
|
||||||
id: obtainToken
|
id: obtainToken
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ jobs:
|
|||||||
if: ${{ !startsWith(github.head_ref, 'renovate/') }}
|
if: ${{ !startsWith(github.head_ref, 'renovate/') }}
|
||||||
name: Skip Stability Days
|
name: Skip Stability Days
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 1
|
||||||
steps:
|
steps:
|
||||||
- name: Add status check
|
- name: Add status check
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
update-contributors:
|
update-contributors:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 2
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [22]
|
node-version: [22]
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ jobs:
|
|||||||
group: update-integration
|
group: update-integration
|
||||||
cancel-in-progress: false
|
cancel-in-progress: false
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
steps:
|
steps:
|
||||||
- name: Obtain token
|
- name: Obtain token
|
||||||
id: obtainToken
|
id: obtainToken
|
||||||
|
|||||||
+143
@@ -1,3 +1,146 @@
|
|||||||
|
## [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)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* [#4452](https://github.com/homarr-labs/homarr/issues/4452) improve calendar design ([#4461](https://github.com/homarr-labs/homarr/issues/4461)) ([08e9f7d](https://github.com/homarr-labs/homarr/commit/08e9f7d8d85475788534b46e6cceb40a7231c09d))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **boards:** selection menu not shown to users without change access ([#4689](https://github.com/homarr-labs/homarr/issues/4689)) ([a0a11e3](https://github.com/homarr-labs/homarr/commit/a0a11e35707513fee45551e09c26ff633f636c32))
|
||||||
|
* **deps:** update dependency dns-caching to ^0.2.9 ([#4648](https://github.com/homarr-labs/homarr/issues/4648)) ([6deab2e](https://github.com/homarr-labs/homarr/commit/6deab2ecec2dc4f5192b53213cb755a9853eb7c0))
|
||||||
|
* **deps:** update dependency drizzle-orm to ^0.45.1 ([#4663](https://github.com/homarr-labs/homarr/issues/4663)) ([f635009](https://github.com/homarr-labs/homarr/commit/f63500961f11589a972a41dde9e4117b1f25141c))
|
||||||
|
* **deps:** update dependency fast-xml-parser to ^5.3.3 ([#4683](https://github.com/homarr-labs/homarr/issues/4683)) ([611b65e](https://github.com/homarr-labs/homarr/commit/611b65e8bd420aaad580bf35071b651093623c95))
|
||||||
|
* **deps:** update dependency isomorphic-dompurify to ^2.34.0 ([#4650](https://github.com/homarr-labs/homarr/issues/4650)) ([5d5c18b](https://github.com/homarr-labs/homarr/commit/5d5c18b3649d5fa1b2b933d443ccd5abcbb84e3a))
|
||||||
|
* **deps:** update dependency jotai to ^2.16.0 ([#4655](https://github.com/homarr-labs/homarr/issues/4655)) ([4aef85b](https://github.com/homarr-labs/homarr/commit/4aef85ba60f4978da5a0b13c08e1799949fe4497))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.16 ([#4640](https://github.com/homarr-labs/homarr/issues/4640)) ([ada5597](https://github.com/homarr-labs/homarr/commit/ada5597cf3ab0bafb04e9176b431d257b36d1dc8))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.17 ([#4642](https://github.com/homarr-labs/homarr/issues/4642)) ([c09da85](https://github.com/homarr-labs/homarr/commit/c09da85f3a8450a70991ff0656228a9aa1364f89))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.18 ([#4653](https://github.com/homarr-labs/homarr/issues/4653)) ([4bd142e](https://github.com/homarr-labs/homarr/commit/4bd142e09c666cc84c67c93e2202e571565b766c))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.19 ([#4669](https://github.com/homarr-labs/homarr/issues/4669)) ([8ed771d](https://github.com/homarr-labs/homarr/commit/8ed771d30073809b08a6ace2c29b3de2675e37d1))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.20 ([#4684](https://github.com/homarr-labs/homarr/issues/4684)) ([703c8cc](https://github.com/homarr-labs/homarr/commit/703c8ccc060bb1775a72f405da1e169926b1ce5d))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.21 ([#4695](https://github.com/homarr-labs/homarr/issues/4695)) ([7f6eaa0](https://github.com/homarr-labs/homarr/commit/7f6eaa0b1f397a37b6acd15e0ccfea75ee2e0161))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.22 ([#4700](https://github.com/homarr-labs/homarr/issues/4700)) ([391d725](https://github.com/homarr-labs/homarr/commit/391d725191563ba5048593c14baf077a924cea44))
|
||||||
|
* **deps:** update dependency ldapts to v8.0.23 ([#4701](https://github.com/homarr-labs/homarr/issues/4701)) ([db337b2](https://github.com/homarr-labs/homarr/commit/db337b2525762c96acd815bd4fdacfaabff5f0cf))
|
||||||
|
* **deps:** update dependency next-intl to v4.6.0 ([#4691](https://github.com/homarr-labs/homarr/issues/4691)) ([1ff6fac](https://github.com/homarr-labs/homarr/commit/1ff6fac71bb9187d0eb703a7b6543daf8861efe8))
|
||||||
|
* **deps:** update dependency sass to ^1.94.3 ([#4646](https://github.com/homarr-labs/homarr/issues/4646)) ([7e91d12](https://github.com/homarr-labs/homarr/commit/7e91d12439826eee76f118448c583294c3c46b42))
|
||||||
|
* **deps:** update dependency sass to ^1.95.0 ([#4647](https://github.com/homarr-labs/homarr/issues/4647)) ([eb760da](https://github.com/homarr-labs/homarr/commit/eb760da8b30583575fb638995fc2f2acbd5b2961))
|
||||||
|
* **deps:** update dependency sass to ^1.95.1 ([#4661](https://github.com/homarr-labs/homarr/issues/4661)) ([e327c66](https://github.com/homarr-labs/homarr/commit/e327c660b239840c4929f536eff3096342cc3433))
|
||||||
|
* **deps:** update dependency sass to ^1.96.0 ([#4668](https://github.com/homarr-labs/homarr/issues/4668)) ([bdfc150](https://github.com/homarr-labs/homarr/commit/bdfc1501152450a1546962331037a6fc1c782e4e))
|
||||||
|
* **deps:** update dependency swagger-ui-react to ^5.31.0 ([#4672](https://github.com/homarr-labs/homarr/issues/4672)) ([4d593f5](https://github.com/homarr-labs/homarr/commit/4d593f5b9d1f47ae2368f42131e8ef8d32f73fc9))
|
||||||
|
* **deps:** update dependency typescript-eslint to ^8.49.0 ([#4645](https://github.com/homarr-labs/homarr/issues/4645)) ([220cb66](https://github.com/homarr-labs/homarr/commit/220cb669a13fead953ff42040b39e06d1dcc1fe2))
|
||||||
|
* **deps:** update mantine monorepo to ^8.3.10 ([#4651](https://github.com/homarr-labs/homarr/issues/4651)) ([d0652f7](https://github.com/homarr-labs/homarr/commit/d0652f7cf5ac0e63a61adcfe43e53c4ed130e8fc))
|
||||||
|
* **deps:** update react monorepo to v19.2.2 ([#4676](https://github.com/homarr-labs/homarr/issues/4676)) ([82e79f2](https://github.com/homarr-labs/homarr/commit/82e79f26274a289e1ce4f9331b6ba16f00f5a86c))
|
||||||
|
* **deps:** update react monorepo to v19.2.3 ([#4680](https://github.com/homarr-labs/homarr/issues/4680)) ([4c71856](https://github.com/homarr-labs/homarr/commit/4c7185646d9d061d1aebf9194f9ef2f810fc3384))
|
||||||
|
* **deps:** update testcontainers-node monorepo to ^11.10.0 ([#4659](https://github.com/homarr-labs/homarr/issues/4659)) ([c880ce9](https://github.com/homarr-labs/homarr/commit/c880ce9bd99a7056f20d450275fcbc37f9372f63))
|
||||||
|
* **deps:** update trpc monorepo to ^11.8.0 ([#4697](https://github.com/homarr-labs/homarr/issues/4697)) ([1f44845](https://github.com/homarr-labs/homarr/commit/1f44845df489bb33bcfe943c6a05c0f157037ed6))
|
||||||
|
* **downloads:** improve progress to only show 100 percent if fully completed ([#4621](https://github.com/homarr-labs/homarr/issues/4621)) ([1062745](https://github.com/homarr-labs/homarr/commit/10627453d5b5a17991bbe9b8d4bc23981b366c39))
|
||||||
|
* **iframe-widget:** permission selection not applying to any origin ([#4616](https://github.com/homarr-labs/homarr/issues/4616)) ([479f083](https://github.com/homarr-labs/homarr/commit/479f083ab8ec405d1b8296b32a20262f6192a1f9))
|
||||||
|
* **invites:** creation with custom expiration not working ([#4677](https://github.com/homarr-labs/homarr/issues/4677)) ([423da9e](https://github.com/homarr-labs/homarr/commit/423da9eeb88510a123bdd2447dc97b54c5f1dec4))
|
||||||
|
* reference to prebuilt-debian action does not work ([47d7458](https://github.com/homarr-labs/homarr/commit/47d7458143d8801947cae1985745fa827b247dd1))
|
||||||
|
* **stock-price:** use previous-close for change calculation ([#4674](https://github.com/homarr-labs/homarr/issues/4674)) ([17fc7a0](https://github.com/homarr-labs/homarr/commit/17fc7a043b4adbed9f14408e23c95ec5fba0c8b8))
|
||||||
|
* **tdarr:** array parse error ([#4678](https://github.com/homarr-labs/homarr/issues/4678)) ([d86af07](https://github.com/homarr-labs/homarr/commit/d86af072bf136d76b02f3efa2c15520a4f63974e))
|
||||||
|
|
||||||
## [1.46.0](https://github.com/homarr-labs/homarr/compare/v1.45.3...v1.46.0) (2025-12-12)
|
## [1.46.0](https://github.com/homarr-labs/homarr/compare/v1.45.3...v1.46.0) (2025-12-12)
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
@@ -1 +1,9 @@
|
|||||||
|
# ── CODEOWNERS ───────────────────────────────────────
|
||||||
* @homarr-labs/maintainers
|
* @homarr-labs/maintainers
|
||||||
|
|
||||||
|
# Exempt Renovate‑managed files (no owners)
|
||||||
|
package.json
|
||||||
|
package-lock.json
|
||||||
|
pnpm-lock.yaml
|
||||||
|
Dockerfile
|
||||||
|
docker-compose.yml
|
||||||
+1
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24.11.1-alpine AS base
|
FROM node:24.12.0-alpine AS base
|
||||||
|
|
||||||
FROM base AS builder
|
FROM base AS builder
|
||||||
RUN apk add --no-cache libc6-compat
|
RUN apk add --no-cache libc6-compat
|
||||||
@@ -45,7 +45,6 @@ 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
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
// Importing env files here to validate on build
|
// Importing env files here to validate on build
|
||||||
import "@homarr/auth/env";
|
import "@homarr/auth/env";
|
||||||
import "@homarr/db/env";
|
import "@homarr/core/infrastructure/db/env";
|
||||||
import "@homarr/common/env";
|
import "@homarr/common/env";
|
||||||
import "@homarr/log/env";
|
import "@homarr/core/infrastructure/logs/env";
|
||||||
import "@homarr/docker/env";
|
import "@homarr/docker/env";
|
||||||
|
|
||||||
import type { NextConfig } from "next";
|
import type { NextConfig } from "next";
|
||||||
|
|||||||
+27
-29
@@ -23,7 +23,6 @@
|
|||||||
"@homarr/api": "workspace:^0.1.0",
|
"@homarr/api": "workspace:^0.1.0",
|
||||||
"@homarr/auth": "workspace:^0.1.0",
|
"@homarr/auth": "workspace:^0.1.0",
|
||||||
"@homarr/boards": "workspace:^0.1.0",
|
"@homarr/boards": "workspace:^0.1.0",
|
||||||
"@homarr/certificates": "workspace:^0.1.0",
|
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/core": "workspace:^0.1.0",
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"@homarr/cron-job-status": "workspace:^0.1.0",
|
"@homarr/cron-job-status": "workspace:^0.1.0",
|
||||||
@@ -36,7 +35,6 @@
|
|||||||
"@homarr/icons": "workspace:^0.1.0",
|
"@homarr/icons": "workspace:^0.1.0",
|
||||||
"@homarr/image-proxy": "workspace:^0.1.0",
|
"@homarr/image-proxy": "workspace:^0.1.0",
|
||||||
"@homarr/integrations": "workspace:^0.1.0",
|
"@homarr/integrations": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^",
|
|
||||||
"@homarr/modals": "workspace:^0.1.0",
|
"@homarr/modals": "workspace:^0.1.0",
|
||||||
"@homarr/modals-collection": "workspace:^0.1.0",
|
"@homarr/modals-collection": "workspace:^0.1.0",
|
||||||
"@homarr/notifications": "workspace:^0.1.0",
|
"@homarr/notifications": "workspace:^0.1.0",
|
||||||
@@ -50,24 +48,24 @@
|
|||||||
"@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.10",
|
"@mantine/colors-generator": "^8.3.12",
|
||||||
"@mantine/core": "^8.3.10",
|
"@mantine/core": "^8.3.12",
|
||||||
"@mantine/dropzone": "^8.3.10",
|
"@mantine/dropzone": "^8.3.12",
|
||||||
"@mantine/hooks": "^8.3.10",
|
"@mantine/hooks": "^8.3.12",
|
||||||
"@mantine/modals": "^8.3.10",
|
"@mantine/modals": "^8.3.12",
|
||||||
"@mantine/tiptap": "^8.3.10",
|
"@mantine/tiptap": "^8.3.12",
|
||||||
"@million/lint": "1.0.14",
|
"@million/lint": "1.0.14",
|
||||||
"@tabler/icons-react": "^3.35.0",
|
"@tabler/icons-react": "^3.36.1",
|
||||||
"@tanstack/react-query": "^5.90.12",
|
"@tanstack/react-query": "^5.90.16",
|
||||||
"@tanstack/react-query-devtools": "^5.91.1",
|
"@tanstack/react-query-devtools": "^5.91.2",
|
||||||
"@tanstack/react-query-next-experimental": "^5.91.0",
|
"@tanstack/react-query-next-experimental": "^5.91.0",
|
||||||
"@trpc/client": "^11.7.2",
|
"@trpc/client": "^11.8.1",
|
||||||
"@trpc/next": "^11.7.2",
|
"@trpc/next": "^11.8.1",
|
||||||
"@trpc/react-query": "^11.7.2",
|
"@trpc/react-query": "^11.8.1",
|
||||||
"@trpc/server": "^11.7.2",
|
"@trpc/server": "^11.8.1",
|
||||||
"@xterm/addon-canvas": "^0.7.0",
|
"@xterm/addon-canvas": "^0.7.0",
|
||||||
"@xterm/addon-fit": "0.10.0",
|
"@xterm/addon-fit": "0.11.0",
|
||||||
"@xterm/xterm": "^5.5.0",
|
"@xterm/xterm": "^6.0.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",
|
||||||
@@ -75,34 +73,34 @@
|
|||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
"glob": "^13.0.0",
|
"glob": "^13.0.0",
|
||||||
"isomorphic-dompurify": "^2.34.0",
|
"isomorphic-dompurify": "^2.35.0",
|
||||||
"jotai": "^2.15.2",
|
"jotai": "^2.16.1",
|
||||||
"mantine-react-table": "2.0.0-beta.9",
|
"mantine-react-table": "2.0.0-beta.9",
|
||||||
"next": "16.0.10",
|
"next": "16.1.1",
|
||||||
"postcss-preset-mantine": "^1.18.0",
|
"postcss-preset-mantine": "^1.18.0",
|
||||||
"prismjs": "^1.30.0",
|
"prismjs": "^1.30.0",
|
||||||
"react": "19.2.1",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.1",
|
"react-dom": "19.2.3",
|
||||||
"react-error-boundary": "^6.0.0",
|
"react-error-boundary": "^6.0.3",
|
||||||
"react-simple-code-editor": "^0.14.1",
|
"react-simple-code-editor": "^0.14.1",
|
||||||
"sass": "^1.95.0",
|
"sass": "^1.97.2",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"swagger-ui-react": "^5.30.3",
|
"swagger-ui-react": "^5.31.0",
|
||||||
"use-deep-compare-effect": "^1.8.1",
|
"use-deep-compare-effect": "^1.8.1",
|
||||||
"zod": "^4.1.13"
|
"zod": "^4.2.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",
|
||||||
"@types/chroma-js": "3.1.2",
|
"@types/chroma-js": "3.1.2",
|
||||||
"@types/node": "^24.10.2",
|
"@types/node": "^24.10.7",
|
||||||
"@types/prismjs": "^1.26.5",
|
"@types/prismjs": "^1.26.5",
|
||||||
"@types/react": "19.2.7",
|
"@types/react": "19.2.8",
|
||||||
"@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",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.2",
|
||||||
"node-loader": "^2.1.0",
|
"node-loader": "^2.1.0",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.7.4",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
|
|||||||
@@ -11,8 +11,9 @@ import { IntegrationProvider } from "@homarr/auth/client";
|
|||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { getIntegrationsWithPermissionsAsync } from "@homarr/auth/server";
|
import { getIntegrationsWithPermissionsAsync } from "@homarr/auth/server";
|
||||||
import { isNullOrWhitespace } from "@homarr/common";
|
import { isNullOrWhitespace } from "@homarr/common";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
import type { WidgetKind } from "@homarr/definitions";
|
import type { WidgetKind } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
import { getI18n } from "@homarr/translation/server";
|
import { getI18n } from "@homarr/translation/server";
|
||||||
import { prefetchForKindAsync } from "@homarr/widgets/prefetch";
|
import { prefetchForKindAsync } from "@homarr/widgets/prefetch";
|
||||||
|
|
||||||
@@ -22,6 +23,8 @@ import type { Board, Item } from "../_types";
|
|||||||
import { DynamicClientBoard } from "./_dynamic-client";
|
import { DynamicClientBoard } from "./_dynamic-client";
|
||||||
import { BoardContentHeaderActions } from "./_header-actions";
|
import { BoardContentHeaderActions } from "./_header-actions";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "createBoardContentPage" });
|
||||||
|
|
||||||
export type Params = Record<string, unknown>;
|
export type Params = Record<string, unknown>;
|
||||||
|
|
||||||
interface Props<TParams extends Params> {
|
interface Props<TParams extends Params> {
|
||||||
@@ -57,7 +60,13 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
|
|||||||
|
|
||||||
for (const [kind, items] of itemsMap) {
|
for (const [kind, items] of itemsMap) {
|
||||||
await prefetchForKindAsync(kind, queryClient, items).catch((error) => {
|
await prefetchForKindAsync(kind, queryClient, items).catch((error) => {
|
||||||
logger.error(new Error("Failed to prefetch widget", { cause: error }));
|
logger.error(
|
||||||
|
new ErrorWithMetadata(
|
||||||
|
"Failed to prefetch widget",
|
||||||
|
{ widgetKind: kind, itemCount: items.length },
|
||||||
|
{ cause: error },
|
||||||
|
),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export const BoardContentHeaderActions = () => {
|
|||||||
const { hasChangeAccess } = useBoardPermissions(board);
|
const { hasChangeAccess } = useBoardPermissions(board);
|
||||||
|
|
||||||
if (!hasChangeAccess) {
|
if (!hasChangeAccess) {
|
||||||
return null; // Hide actions for user without access
|
return <SelectBoardsMenu />;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { TRPCError } from "@trpc/server";
|
|||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { BoardProvider } from "@homarr/boards/context";
|
import { BoardProvider } from "@homarr/boards/context";
|
||||||
import { EditModeProvider } from "@homarr/boards/edit-mode";
|
import { EditModeProvider } from "@homarr/boards/edit-mode";
|
||||||
import { logger } from "@homarr/log";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
|
||||||
import { MainHeader } from "~/components/layout/header";
|
import { MainHeader } from "~/components/layout/header";
|
||||||
import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
|
import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
|
||||||
@@ -18,6 +18,8 @@ import { CustomCss } from "./(content)/_custom-css";
|
|||||||
import { BoardReadyProvider } from "./(content)/_ready-context";
|
import { BoardReadyProvider } from "./(content)/_ready-context";
|
||||||
import { BoardMantineProvider } from "./(content)/_theme";
|
import { BoardMantineProvider } from "./(content)/_theme";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "createBoardLayout" });
|
||||||
|
|
||||||
interface CreateBoardLayoutProps<TParams extends Params> {
|
interface CreateBoardLayoutProps<TParams extends Params> {
|
||||||
headerActions: JSX.Element;
|
headerActions: JSX.Element;
|
||||||
getInitialBoardAsync: (params: TParams) => Promise<Board>;
|
getInitialBoardAsync: (params: TParams) => Promise<Board>;
|
||||||
|
|||||||
@@ -106,6 +106,7 @@ 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}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
"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,6 +12,7 @@ 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");
|
||||||
@@ -42,6 +43,10 @@ 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} />
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import {
|
|||||||
import { IconCertificateOff } from "@tabler/icons-react";
|
import { IconCertificateOff } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { getTrustedCertificateHostnamesAsync } from "@homarr/certificates/server";
|
import { getTrustedCertificateHostnamesAsync } from "@homarr/core/infrastructure/certificates";
|
||||||
import { getI18n } from "@homarr/translation/server";
|
import { getI18n } from "@homarr/translation/server";
|
||||||
import { Link } from "@homarr/ui";
|
import { Link } from "@homarr/ui";
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import { IconAlertTriangle, IconCertificate, IconCertificateOff } from "@tabler/
|
|||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { loadCustomRootCertificatesAsync } from "@homarr/certificates/server";
|
|
||||||
import { getMantineColor } from "@homarr/common";
|
import { getMantineColor } from "@homarr/common";
|
||||||
|
import { loadCustomRootCertificatesAsync } from "@homarr/core/infrastructure/certificates";
|
||||||
import type { SupportedLanguage } from "@homarr/translation";
|
import type { SupportedLanguage } from "@homarr/translation";
|
||||||
import { getI18n } from "@homarr/translation/server";
|
import { getI18n } from "@homarr/translation/server";
|
||||||
import { Link } from "@homarr/ui";
|
import { Link } from "@homarr/ui";
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ 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())} />
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
import { Select } from "@mantine/core";
|
import { Select } from "@mantine/core";
|
||||||
|
|
||||||
import type { LogLevel } from "@homarr/log/constants";
|
import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
|
||||||
import { logLevelConfiguration, logLevels } from "@homarr/log/constants";
|
import { logLevelConfiguration, logLevels } from "@homarr/core/infrastructure/logs/constants";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
import { useLogContext } from "./log-context";
|
import { useLogContext } from "./log-context";
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
import type { PropsWithChildren } from "react";
|
import type { PropsWithChildren } from "react";
|
||||||
import { createContext, useContext, useMemo, useState } from "react";
|
import { createContext, useContext, useMemo, useState } from "react";
|
||||||
|
|
||||||
import type { LogLevel } from "@homarr/log/constants";
|
import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
|
||||||
import { logLevels } from "@homarr/log/constants";
|
import { logLevels } from "@homarr/core/infrastructure/logs/constants";
|
||||||
|
|
||||||
const LogContext = createContext<{
|
const LogContext = createContext<{
|
||||||
level: LogLevel;
|
level: LogLevel;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import "@xterm/xterm/css/xterm.css";
|
|||||||
import { notFound } from "next/navigation";
|
import { notFound } from "next/navigation";
|
||||||
|
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { env } from "@homarr/log/env";
|
import { logsEnv } from "@homarr/core/infrastructure/logs/env";
|
||||||
|
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
||||||
import { fullHeightWithoutHeaderAndFooter } from "~/constants";
|
import { fullHeightWithoutHeaderAndFooter } from "~/constants";
|
||||||
@@ -35,7 +35,7 @@ export default async function LogsManagementPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<LogContextProvider defaultLevel={env.LOG_LEVEL}>
|
<LogContextProvider defaultLevel={logsEnv.LEVEL}>
|
||||||
<Group justify="space-between" align="center" wrap="nowrap">
|
<Group justify="space-between" align="center" wrap="nowrap">
|
||||||
<DynamicBreadcrumb />
|
<DynamicBreadcrumb />
|
||||||
<LogLevelSelection />
|
<LogLevelSelection />
|
||||||
|
|||||||
+4
-1
@@ -200,7 +200,10 @@ 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 size="xl" user={{ name: generalForm.values.username, image: null }} />
|
<UserAvatar
|
||||||
|
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>
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export default async function GroupsDetailPage(props: GroupsDetailPageProps) {
|
|||||||
<Card>
|
<Card>
|
||||||
{group.owner ? (
|
{group.owner ? (
|
||||||
<Group>
|
<Group>
|
||||||
<UserAvatar user={{ name: group.owner.name, image: group.owner.image }} size={"lg"} />
|
<UserAvatar user={group.owner} 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>
|
||||||
|
|||||||
@@ -3,18 +3,24 @@ import { userAgent } from "next/server";
|
|||||||
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 type { Session } from "@homarr/auth";
|
import { API_KEY_HEADER_NAME, getSessionFromApiKeyAsync } from "@homarr/auth/api-key";
|
||||||
import { hashPasswordAsync } from "@homarr/auth";
|
import { ipAddressFromHeaders } from "@homarr/common/server";
|
||||||
import { createSessionAsync } from "@homarr/auth/server";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { db, eq } from "@homarr/db";
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
import { apiKeys } from "@homarr/db/schema";
|
import { db } from "@homarr/db";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
const logger = createLogger({ module: "trpcOpenApiRoute" });
|
||||||
|
|
||||||
const handlerAsync = async (req: NextRequest) => {
|
const handlerAsync = async (req: NextRequest) => {
|
||||||
const apiKeyHeaderValue = req.headers.get("ApiKey");
|
const apiKeyHeaderValue = req.headers.get(API_KEY_HEADER_NAME);
|
||||||
const ipAddress = req.headers.get("x-forwarded-for");
|
const ipAddress = ipAddressFromHeaders(req.headers);
|
||||||
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")) {
|
||||||
@@ -27,68 +33,11 @@ const handlerAsync = async (req: NextRequest) => {
|
|||||||
router: appRouter,
|
router: appRouter,
|
||||||
createContext: () => createTRPCContext({ session, headers: req.headers }),
|
createContext: () => createTRPCContext({ session, headers: req.headers }),
|
||||||
onError({ error, path, type }) {
|
onError({ error, path, type }) {
|
||||||
logger.error(new Error(`tRPC Error with ${type} on '${path}'`, { cause: error.cause }));
|
logger.error(new ErrorWithMetadata("tRPC Error occured", { path, type }, { cause: error }));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
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 ip='${ipAdress}' userAgent='${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 ip='${ipAdress}' userAgent='${userAgent}'`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const hashedApiKey = await hashPasswordAsync(apiKey, apiKeyFromDb.salt);
|
|
||||||
|
|
||||||
if (apiKeyFromDb.apiKey !== hashedApiKey) {
|
|
||||||
logger.warn(`An attempt to authenticate over API has failed ip='${ipAdress}' userAgent='${userAgent}'`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(`Read session from API request and found user ${apiKeyFromDb.user.name} (${apiKeyFromDb.user.id})`);
|
|
||||||
return await createSessionAsync(db, apiKeyFromDb.user);
|
|
||||||
};
|
|
||||||
|
|
||||||
export {
|
export {
|
||||||
handlerAsync as DELETE,
|
handlerAsync as DELETE,
|
||||||
handlerAsync as GET,
|
handlerAsync as GET,
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import { NextRequest } from "next/server";
|
import { NextRequest } from "next/server";
|
||||||
|
|
||||||
import { createHandlersAsync } from "@homarr/auth";
|
import { createHandlersAsync } from "@homarr/auth";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import type { SupportedAuthProvider } from "@homarr/definitions";
|
import type { SupportedAuthProvider } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
const logger = createLogger({ module: "nextAuthRoute" });
|
||||||
|
|
||||||
export const GET = async (req: NextRequest) => {
|
export const GET = async (req: NextRequest) => {
|
||||||
const { handlers } = await createHandlersAsync(extractProvider(req), isSecureCookieEnabled(req));
|
const { handlers } = await createHandlersAsync(extractProvider(req), isSecureCookieEnabled(req));
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
import { performance } from "perf_hooks";
|
import { performance } from "perf_hooks";
|
||||||
|
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
import { db } from "@homarr/db";
|
import { db } from "@homarr/db";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
import { handshakeAsync } from "@homarr/redis";
|
import { handshakeAsync } from "@homarr/redis";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "healthLiveRoute" });
|
||||||
|
|
||||||
export async function GET() {
|
export async function GET() {
|
||||||
const timeBeforeHealthCheck = performance.now();
|
const timeBeforeHealthCheck = performance.now();
|
||||||
const response = await executeAndAggregateAllHealthChecksAsync();
|
const response = await executeAndAggregateAllHealthChecksAsync();
|
||||||
logger.info(`Completed healthcheck after ${performance.now() - timeBeforeHealthCheck}ms`);
|
logger.info("Completed healthcheck", { elapsed: `${performance.now() - timeBeforeHealthCheck}ms` });
|
||||||
|
|
||||||
if (response.status === "healthy") {
|
if (response.status === "healthy") {
|
||||||
return new Response(JSON.stringify(response), {
|
return new Response(JSON.stringify(response), {
|
||||||
@@ -73,7 +76,7 @@ const executeHealthCheckSafelyAsync = async (
|
|||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
||||||
logger.error(`Healthcheck '${name}' has failed: ${error}`);
|
logger.error(new ErrorWithMetadata("Healthcheck failed", { name }, { cause: error }));
|
||||||
return {
|
return {
|
||||||
status: "unhealthy",
|
status: "unhealthy",
|
||||||
values: {
|
values: {
|
||||||
|
|||||||
@@ -1,9 +1,16 @@
|
|||||||
|
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 { logger } from "@homarr/log";
|
import { ipAddressFromHeaders } from "@homarr/common/server";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
|
import { db } from "@homarr/db";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "trpcRoute" });
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configure basic CORS headers
|
* Configure basic CORS headers
|
||||||
@@ -25,13 +32,22 @@ 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: req.auth, headers: req.headers }),
|
createContext: () => createTRPCContext({ session, headers: req.headers }),
|
||||||
onError({ error, path, type }) {
|
onError({ error, path, type }) {
|
||||||
logger.error(new Error(`tRPC Error with ${type} on '${path}'`, { cause: error.cause }));
|
logger.error(new ErrorWithMetadata("tRPC Error occured", { path, type }, { cause: error }));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ 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;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -66,6 +67,7 @@ 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,5 +1,6 @@
|
|||||||
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,6 +21,7 @@ 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>;
|
||||||
@@ -118,6 +119,7 @@ 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 }) => void | Promise<void>;
|
onSelect: (props: { id: string; name: string; image: string; email: string | null }) => void | Promise<void>;
|
||||||
confirmLabel?: string;
|
confirmLabel?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,6 +36,7 @@ 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,6 +34,7 @@ export class BoardMockBuilder {
|
|||||||
id: createId(),
|
id: createId(),
|
||||||
image: null,
|
image: null,
|
||||||
name: "User",
|
name: "User",
|
||||||
|
email: null,
|
||||||
},
|
},
|
||||||
groupPermissions: [],
|
groupPermissions: [],
|
||||||
userPermissions: [],
|
userPermissions: [],
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
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;
|
||||||
|
|||||||
@@ -3,17 +3,21 @@ 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 UserAvatarProps {
|
interface CurrentUserAvatarProps {
|
||||||
size: MantineSize;
|
size: MantineSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const CurrentUserAvatar = async ({ size }: UserAvatarProps) => {
|
export const CurrentUserAvatar = async ({ size }: CurrentUserAvatarProps) => {
|
||||||
const currentSession = await auth();
|
const currentSession = await auth();
|
||||||
|
|
||||||
const user = {
|
return (
|
||||||
name: currentSession?.user.name ?? null,
|
<UserAvatar
|
||||||
image: currentSession?.user.image ?? null,
|
user={{
|
||||||
};
|
name: currentSession?.user.name ?? null,
|
||||||
|
image: currentSession?.user.image ?? null,
|
||||||
return <UserAvatar user={user} size={size} />;
|
email: currentSession?.user.email ?? null,
|
||||||
|
}}
|
||||||
|
size={size}
|
||||||
|
/>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
@@ -3,7 +3,9 @@ import "server-only";
|
|||||||
import { notFound, redirect } from "next/navigation";
|
import { notFound, redirect } from "next/navigation";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import { logger } from "@homarr/log";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "trpcCatchError" });
|
||||||
|
|
||||||
export const catchTrpcNotFound = (err: unknown) => {
|
export const catchTrpcNotFound = (err: unknown) => {
|
||||||
if (err instanceof TRPCError && err.code === "NOT_FOUND") {
|
if (err instanceof TRPCError && err.code === "NOT_FOUND") {
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
"@homarr/analytics": "workspace:^0.1.0",
|
"@homarr/analytics": "workspace:^0.1.0",
|
||||||
"@homarr/auth": "workspace:^0.1.0",
|
"@homarr/auth": "workspace:^0.1.0",
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
|
"@homarr/core": "workspace:^",
|
||||||
"@homarr/cron-job-api": "workspace:^0.1.0",
|
"@homarr/cron-job-api": "workspace:^0.1.0",
|
||||||
"@homarr/cron-jobs": "workspace:^0.1.0",
|
"@homarr/cron-jobs": "workspace:^0.1.0",
|
||||||
"@homarr/cron-jobs-core": "workspace:^0.1.0",
|
"@homarr/cron-jobs-core": "workspace:^0.1.0",
|
||||||
@@ -30,7 +31,6 @@
|
|||||||
"@homarr/definitions": "workspace:^0.1.0",
|
"@homarr/definitions": "workspace:^0.1.0",
|
||||||
"@homarr/icons": "workspace:^0.1.0",
|
"@homarr/icons": "workspace:^0.1.0",
|
||||||
"@homarr/integrations": "workspace:^0.1.0",
|
"@homarr/integrations": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^",
|
|
||||||
"@homarr/ping": "workspace:^0.1.0",
|
"@homarr/ping": "workspace:^0.1.0",
|
||||||
"@homarr/redis": "workspace:^0.1.0",
|
"@homarr/redis": "workspace:^0.1.0",
|
||||||
"@homarr/request-handler": "workspace:^0.1.0",
|
"@homarr/request-handler": "workspace:^0.1.0",
|
||||||
@@ -41,16 +41,16 @@
|
|||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"fastify": "^5.6.2",
|
"fastify": "^5.6.2",
|
||||||
"superjson": "2.2.6",
|
"superjson": "2.2.6",
|
||||||
"undici": "7.16.0"
|
"undici": "7.18.2"
|
||||||
},
|
},
|
||||||
"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.2",
|
"@types/node": "^24.10.7",
|
||||||
"dotenv-cli": "^11.0.0",
|
"dotenv-cli": "^11.0.0",
|
||||||
"esbuild": "^0.27.1",
|
"esbuild": "^0.27.2",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.7.4",
|
||||||
"tsx": "4.20.4",
|
"tsx": "4.20.4",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import { schedule, validate as validateCron } from "node-cron";
|
import { schedule, validate as validateCron } from "node-cron";
|
||||||
|
|
||||||
|
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, InferInsertModel } from "@homarr/db";
|
||||||
import { eq } from "@homarr/db";
|
import { eq } from "@homarr/db";
|
||||||
import { cronJobConfigurations } from "@homarr/db/schema";
|
import { cronJobConfigurations } from "@homarr/db/schema";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
const logger = createLogger({ module: "jobManager" });
|
||||||
|
|
||||||
export class JobManager implements IJobManager {
|
export class JobManager implements IJobManager {
|
||||||
constructor(
|
constructor(
|
||||||
@@ -23,7 +25,7 @@ export class JobManager implements IJobManager {
|
|||||||
await this.jobGroup.stopAsync(name);
|
await this.jobGroup.stopAsync(name);
|
||||||
}
|
}
|
||||||
public async updateIntervalAsync(name: JobGroupKeys, cron: string): Promise<void> {
|
public async updateIntervalAsync(name: JobGroupKeys, cron: string): Promise<void> {
|
||||||
logger.info(`Updating cron job interval name="${name}" expression="${cron}"`);
|
logger.info("Updating cron job interval", { name, expression: cron });
|
||||||
const job = this.jobGroup.getJobRegistry().get(name);
|
const job = this.jobGroup.getJobRegistry().get(name);
|
||||||
if (!job) throw new Error(`Job ${name} not found`);
|
if (!job) throw new Error(`Job ${name} not found`);
|
||||||
if (!validateCron(cron)) {
|
if (!validateCron(cron)) {
|
||||||
@@ -38,22 +40,22 @@ export class JobManager implements IJobManager {
|
|||||||
name,
|
name,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
logger.info(`Cron job interval updated name="${name}" expression="${cron}"`);
|
logger.info("Cron job interval updated", { name, expression: cron });
|
||||||
}
|
}
|
||||||
public async disableAsync(name: JobGroupKeys): Promise<void> {
|
public async disableAsync(name: JobGroupKeys): Promise<void> {
|
||||||
logger.info(`Disabling cron job name="${name}"`);
|
logger.info("Disabling cron job", { name });
|
||||||
const job = this.jobGroup.getJobRegistry().get(name);
|
const job = this.jobGroup.getJobRegistry().get(name);
|
||||||
if (!job) throw new Error(`Job ${name} not found`);
|
if (!job) throw new Error(`Job ${name} not found`);
|
||||||
|
|
||||||
await this.updateConfigurationAsync(name, { isEnabled: false });
|
await this.updateConfigurationAsync(name, { isEnabled: false });
|
||||||
await this.jobGroup.stopAsync(name);
|
await this.jobGroup.stopAsync(name);
|
||||||
logger.info(`Cron job disabled name="${name}"`);
|
logger.info("Cron job disabled", { name });
|
||||||
}
|
}
|
||||||
public async enableAsync(name: JobGroupKeys): Promise<void> {
|
public async enableAsync(name: JobGroupKeys): Promise<void> {
|
||||||
logger.info(`Enabling cron job name="${name}"`);
|
logger.info("Enabling cron job", { name });
|
||||||
await this.updateConfigurationAsync(name, { isEnabled: true });
|
await this.updateConfigurationAsync(name, { isEnabled: true });
|
||||||
await this.jobGroup.startAsync(name);
|
await this.jobGroup.startAsync(name);
|
||||||
logger.info(`Cron job enabled name="${name}"`);
|
logger.info("Cron job enabled", { name });
|
||||||
}
|
}
|
||||||
|
|
||||||
private async updateConfigurationAsync(
|
private async updateConfigurationAsync(
|
||||||
@@ -64,9 +66,11 @@ export class JobManager implements IJobManager {
|
|||||||
where: (table, { eq }) => eq(table.name, name),
|
where: (table, { eq }) => eq(table.name, name),
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.debug(
|
logger.debug("Updating cron job configuration", {
|
||||||
`Updating cron job configuration name="${name}" configuration="${JSON.stringify(configuration)}" exists="${Boolean(existingConfig)}"`,
|
name,
|
||||||
);
|
configuration: JSON.stringify(configuration),
|
||||||
|
exists: Boolean(existingConfig),
|
||||||
|
});
|
||||||
|
|
||||||
if (existingConfig) {
|
if (existingConfig) {
|
||||||
await this.db
|
await this.db
|
||||||
@@ -74,7 +78,10 @@ export class JobManager implements IJobManager {
|
|||||||
// prevent updating the name, as it is the primary key
|
// prevent updating the name, as it is the primary key
|
||||||
.set({ ...configuration, name: undefined })
|
.set({ ...configuration, name: undefined })
|
||||||
.where(eq(cronJobConfigurations.name, name));
|
.where(eq(cronJobConfigurations.name, name));
|
||||||
logger.debug(`Cron job configuration updated name="${name}" configuration="${JSON.stringify(configuration)}"`);
|
logger.debug("Cron job configuration updated", {
|
||||||
|
name,
|
||||||
|
configuration: JSON.stringify(configuration),
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,7 +93,10 @@ export class JobManager implements IJobManager {
|
|||||||
cronExpression: configuration.cronExpression ?? job.cronExpression,
|
cronExpression: configuration.cronExpression ?? job.cronExpression,
|
||||||
isEnabled: configuration.isEnabled ?? true,
|
isEnabled: configuration.isEnabled ?? true,
|
||||||
});
|
});
|
||||||
logger.debug(`Cron job configuration updated name="${name}" configuration="${JSON.stringify(configuration)}"`);
|
logger.debug("Cron job configuration updated", {
|
||||||
|
name,
|
||||||
|
configuration: JSON.stringify(configuration),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getAllAsync(): Promise<
|
public async getAllAsync(): Promise<
|
||||||
|
|||||||
@@ -5,16 +5,19 @@ import type { FastifyTRPCPluginOptions } from "@trpc/server/adapters/fastify";
|
|||||||
import { fastifyTRPCPlugin } from "@trpc/server/adapters/fastify";
|
import { fastifyTRPCPlugin } from "@trpc/server/adapters/fastify";
|
||||||
import fastify from "fastify";
|
import fastify from "fastify";
|
||||||
|
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
import type { JobRouter } from "@homarr/cron-job-api";
|
import type { JobRouter } from "@homarr/cron-job-api";
|
||||||
import { jobRouter } from "@homarr/cron-job-api";
|
import { jobRouter } from "@homarr/cron-job-api";
|
||||||
import { CRON_JOB_API_KEY_HEADER, CRON_JOB_API_PATH, CRON_JOB_API_PORT } from "@homarr/cron-job-api/constants";
|
import { CRON_JOB_API_KEY_HEADER, CRON_JOB_API_PATH, CRON_JOB_API_PORT } from "@homarr/cron-job-api/constants";
|
||||||
import { jobGroup } from "@homarr/cron-jobs";
|
import { jobGroup } from "@homarr/cron-jobs";
|
||||||
import { db } from "@homarr/db";
|
import { db } from "@homarr/db";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { JobManager } from "./job-manager";
|
import { JobManager } from "./job-manager";
|
||||||
import { onStartAsync } from "./on-start";
|
import { onStartAsync } from "./on-start";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "tasksMain" });
|
||||||
|
|
||||||
const server = fastify({
|
const server = fastify({
|
||||||
maxParamLength: 5000,
|
maxParamLength: 5000,
|
||||||
});
|
});
|
||||||
@@ -27,7 +30,7 @@ server.register(fastifyTRPCPlugin, {
|
|||||||
apiKey: req.headers[CRON_JOB_API_KEY_HEADER] as string | undefined,
|
apiKey: req.headers[CRON_JOB_API_KEY_HEADER] as string | undefined,
|
||||||
}),
|
}),
|
||||||
onError({ path, error }) {
|
onError({ path, error }) {
|
||||||
logger.error(new Error(`Error in tasks tRPC handler path="${path}"`, { cause: error }));
|
logger.error(new ErrorWithMetadata("Error in tasks tRPC handler", { path }, { cause: error }));
|
||||||
},
|
},
|
||||||
} satisfies FastifyTRPCPluginOptions<JobRouter>["trpcOptions"],
|
} satisfies FastifyTRPCPluginOptions<JobRouter>["trpcOptions"],
|
||||||
});
|
});
|
||||||
@@ -39,9 +42,11 @@ void (async () => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await server.listen({ port: CRON_JOB_API_PORT });
|
await server.listen({ port: CRON_JOB_API_PORT });
|
||||||
logger.info(`Tasks web server started successfully port="${CRON_JOB_API_PORT}"`);
|
logger.info("Tasks web server started successfully", { port: CRON_JOB_API_PORT });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error(new Error(`Failed to start tasks web server port="${CRON_JOB_API_PORT}"`, { cause: err }));
|
logger.error(
|
||||||
|
new ErrorWithMetadata("Failed to start tasks web server", { port: CRON_JOB_API_PORT }, { cause: err }),
|
||||||
|
);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { logger } from "@homarr/log";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
|
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
|
||||||
|
|
||||||
const localLogger = logger.child({ module: "invalidateUpdateCheckerCache" });
|
const logger = createLogger({ module: "invalidateUpdateCheckerCache" });
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Invalidates the update checker cache on startup to ensure fresh data.
|
* Invalidates the update checker cache on startup to ensure fresh data.
|
||||||
@@ -11,8 +11,8 @@ export async function invalidateUpdateCheckerCacheAsync() {
|
|||||||
try {
|
try {
|
||||||
const handler = updateCheckerRequestHandler.handler({});
|
const handler = updateCheckerRequestHandler.handler({});
|
||||||
await handler.invalidateAsync();
|
await handler.invalidateAsync();
|
||||||
localLogger.debug("Update checker cache invalidated");
|
logger.debug("Update checker cache invalidated");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
localLogger.error(new Error("Failed to invalidate update checker cache", { cause: error }));
|
logger.error(new Error("Failed to invalidate update checker cache", { cause: error }));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
import { env } from "@homarr/auth/env";
|
import { env } from "@homarr/auth/env";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { db, eq, inArray } from "@homarr/db";
|
import { db, eq, inArray } 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";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
const localLogger = logger.child({ module: "sessionCleanup" });
|
const logger = createLogger({ module: "sessionCleanup" });
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deletes sessions for users that have inactive auth providers.
|
* Deletes sessions for users that have inactive auth providers.
|
||||||
@@ -29,11 +29,13 @@ export async function cleanupSessionsAsync() {
|
|||||||
await db.delete(sessions).where(inArray(sessions.userId, userIds));
|
await db.delete(sessions).where(inArray(sessions.userId, userIds));
|
||||||
|
|
||||||
if (sessionsWithInactiveProviders.length > 0) {
|
if (sessionsWithInactiveProviders.length > 0) {
|
||||||
localLogger.info(`Deleted sessions for inactive providers count=${userIds.length}`);
|
logger.info("Deleted sessions for inactive providers", {
|
||||||
|
count: userIds.length,
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
localLogger.debug("No sessions to delete");
|
logger.debug("No sessions to delete");
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
localLogger.error(new Error("Failed to clean up sessions", { cause: error }));
|
logger.error(new Error("Failed to clean up sessions", { cause: error }));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import { setGlobalDispatcher } from "undici";
|
import { setGlobalDispatcher } from "undici";
|
||||||
|
|
||||||
import { LoggingAgent } from "@homarr/common/server";
|
import { UndiciHttpAgent } from "@homarr/core/infrastructure/http";
|
||||||
|
|
||||||
const agent = new LoggingAgent();
|
setGlobalDispatcher(new UndiciHttpAgent());
|
||||||
setGlobalDispatcher(agent);
|
|
||||||
@@ -20,22 +20,22 @@
|
|||||||
"@homarr/api": "workspace:^0.1.0",
|
"@homarr/api": "workspace:^0.1.0",
|
||||||
"@homarr/auth": "workspace:^0.1.0",
|
"@homarr/auth": "workspace:^0.1.0",
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
|
"@homarr/core": "workspace:^",
|
||||||
"@homarr/db": "workspace:^0.1.0",
|
"@homarr/db": "workspace:^0.1.0",
|
||||||
"@homarr/definitions": "workspace:^0.1.0",
|
"@homarr/definitions": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^",
|
|
||||||
"@homarr/redis": "workspace:^0.1.0",
|
"@homarr/redis": "workspace:^0.1.0",
|
||||||
"@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.18.3"
|
"ws": "^8.19.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/ws": "^8.18.1",
|
"@types/ws": "^8.18.1",
|
||||||
"esbuild": "^0.27.1",
|
"esbuild": "^0.27.2",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.7.4",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,10 @@ import { WebSocketServer } from "ws";
|
|||||||
import { appRouter, createTRPCContext } from "@homarr/api/websocket";
|
import { appRouter, createTRPCContext } from "@homarr/api/websocket";
|
||||||
import { getSessionFromToken, sessionTokenCookieName } from "@homarr/auth";
|
import { getSessionFromToken, sessionTokenCookieName } from "@homarr/auth";
|
||||||
import { parseCookies } from "@homarr/common";
|
import { parseCookies } from "@homarr/common";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { db } from "@homarr/db";
|
import { db } from "@homarr/db";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
const logger = createLogger({ module: "websocketMain" });
|
||||||
|
|
||||||
const wss = new WebSocketServer({
|
const wss = new WebSocketServer({
|
||||||
port: 3001,
|
port: 3001,
|
||||||
|
|||||||
@@ -314,6 +314,13 @@
|
|||||||
<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>
|
||||||
|
|||||||
+10
-6
@@ -1,10 +1,11 @@
|
|||||||
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 Database from "better-sqlite3";
|
import { drizzle, LibSQLDatabase } from "drizzle-orm/libsql";
|
||||||
import { BetterSQLite3Database, drizzle } from "drizzle-orm/better-sqlite3";
|
import { migrate } from "drizzle-orm/libsql/migrator";
|
||||||
import { migrate } from "drizzle-orm/better-sqlite3/migrator";
|
|
||||||
|
|
||||||
|
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";
|
||||||
|
|
||||||
export const createSqliteDbFileAsync = async () => {
|
export const createSqliteDbFileAsync = async () => {
|
||||||
@@ -13,10 +14,13 @@ export const createSqliteDbFileAsync = async () => {
|
|||||||
|
|
||||||
const localDbUrl = path.join(localMountPath, "db", "db.sqlite");
|
const localDbUrl = path.join(localMountPath, "db", "db.sqlite");
|
||||||
|
|
||||||
const connection = new Database(localDbUrl);
|
const connection = createClient({
|
||||||
|
url: `file:${localDbUrl}`,
|
||||||
|
});
|
||||||
|
|
||||||
const db = drizzle(connection, {
|
const db = drizzle(connection, {
|
||||||
schema: sqliteSchema,
|
schema: sqliteSchema,
|
||||||
casing: "snake_case",
|
casing: DB_CASING,
|
||||||
});
|
});
|
||||||
|
|
||||||
await migrate(db, {
|
await migrate(db, {
|
||||||
@@ -29,4 +33,4 @@ export const createSqliteDbFileAsync = async () => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type SqliteDatabase = BetterSQLite3Database<typeof sqliteSchema>;
|
export type SqliteDatabase = LibSQLDatabase<typeof sqliteSchema>;
|
||||||
+22
-23
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "homarr",
|
"name": "homarr",
|
||||||
"version": "1.46.0",
|
"version": "1.50.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "cross-env CI=true turbo build",
|
"build": "cross-env CI=true turbo build",
|
||||||
@@ -40,35 +40,34 @@
|
|||||||
"@semantic-release/commit-analyzer": "^13.0.1",
|
"@semantic-release/commit-analyzer": "^13.0.1",
|
||||||
"@semantic-release/git": "^10.0.1",
|
"@semantic-release/git": "^10.0.1",
|
||||||
"@semantic-release/github": "^12.0.2",
|
"@semantic-release/github": "^12.0.2",
|
||||||
"@semantic-release/npm": "^13.1.2",
|
"@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.9.0",
|
"@testcontainers/redis": "^11.11.0",
|
||||||
"@turbo/gen": "^2.6.3",
|
"@turbo/gen": "^2.7.4",
|
||||||
"@vitejs/plugin-react": "^5.1.2",
|
"@vitejs/plugin-react": "^5.1.2",
|
||||||
"@vitest/coverage-v8": "^4.0.15",
|
"@vitest/coverage-v8": "^4.0.17",
|
||||||
"@vitest/ui": "^4.0.15",
|
"@vitest/ui": "^4.0.17",
|
||||||
"conventional-changelog-conventionalcommits": "^9.1.0",
|
"conventional-changelog-conventionalcommits": "^9.1.0",
|
||||||
"cross-env": "^10.1.0",
|
"cross-env": "^10.1.0",
|
||||||
"jsdom": "^27.3.0",
|
"jsdom": "^27.4.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.9.0",
|
"testcontainers": "^11.11.0",
|
||||||
"turbo": "^2.6.3",
|
"turbo": "^2.7.4",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^5.9.3",
|
||||||
"vite-tsconfig-paths": "^5.1.4",
|
"vite-tsconfig-paths": "^6.0.4",
|
||||||
"vitest": "^4.0.15"
|
"vitest": "^4.0.17"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@10.25.0",
|
"packageManager": "pnpm@10.28.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24.11.1",
|
"node": ">=24.12.0",
|
||||||
"pnpm": ">=10.25.0"
|
"pnpm": ">=10.28.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",
|
||||||
@@ -77,25 +76,25 @@
|
|||||||
"tree-sitter-json"
|
"tree-sitter-json"
|
||||||
],
|
],
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"@babel/helpers@<7.26.10": ">=7.28.4",
|
"@babel/helpers@<7.26.10": ">=7.28.6",
|
||||||
"@babel/runtime@<7.26.10": ">=7.28.4",
|
"@babel/runtime@<7.26.10": ">=7.28.6",
|
||||||
"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.1",
|
"esbuild@<=0.24.2": ">=0.27.2",
|
||||||
"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.10.8",
|
"hono@<4.6.5": ">=4.11.4",
|
||||||
"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.16.0",
|
"proxmox-api>undici": "7.18.2",
|
||||||
"react-is": "^19.2.1",
|
"react-is": "^19.2.3",
|
||||||
"rollup@>=4.0.0 <4.22.4": ">=4.53.3",
|
"rollup@>=4.0.0 <4.22.4": ">=4.55.1",
|
||||||
"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.2.7"
|
"vite@>=5.0.0 <=5.4.18": ">=7.3.1"
|
||||||
},
|
},
|
||||||
"patchedDependencies": {
|
"patchedDependencies": {
|
||||||
"@types/node-unifi": "patches/@types__node-unifi.patch",
|
"@types/node-unifi": "patches/@types__node-unifi.patch",
|
||||||
|
|||||||
@@ -22,8 +22,8 @@
|
|||||||
},
|
},
|
||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"@homarr/db": "workspace:^0.1.0",
|
"@homarr/db": "workspace:^0.1.0",
|
||||||
"@homarr/log": "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",
|
||||||
"superjson": "2.2.6"
|
"superjson": "2.2.6"
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
"@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",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.2",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,17 @@
|
|||||||
import type { UmamiEventData } from "@umami/node";
|
import type { UmamiEventData } from "@umami/node";
|
||||||
import { Umami } from "@umami/node";
|
import { Umami } from "@umami/node";
|
||||||
|
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { count, db } from "@homarr/db";
|
import { count, 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 { logger } from "@homarr/log";
|
|
||||||
import type { defaultServerSettings } from "@homarr/server-settings";
|
import type { defaultServerSettings } from "@homarr/server-settings";
|
||||||
|
|
||||||
import { Stopwatch } from "../../common/src";
|
import { Stopwatch } from "../../common/src";
|
||||||
import { UMAMI_HOST_URL, UMAMI_WEBSITE_ID } from "./constants";
|
import { UMAMI_HOST_URL, UMAMI_WEBSITE_ID } from "./constants";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "analytics" });
|
||||||
|
|
||||||
export const sendServerAnalyticsAsync = async () => {
|
export const sendServerAnalyticsAsync = async () => {
|
||||||
const stopWatch = new Stopwatch();
|
const stopWatch = new Stopwatch();
|
||||||
const analyticsSettings = await getServerSettingByKeyAsync(db, "analytics");
|
const analyticsSettings = await getServerSettingByKeyAsync(db, "analytics");
|
||||||
|
|||||||
+10
-12
@@ -22,7 +22,6 @@
|
|||||||
"prettier": "@homarr/prettier-config",
|
"prettier": "@homarr/prettier-config",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/auth": "workspace:^0.1.0",
|
"@homarr/auth": "workspace:^0.1.0",
|
||||||
"@homarr/certificates": "workspace:^0.1.0",
|
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/core": "workspace:^0.1.0",
|
"@homarr/core": "workspace:^0.1.0",
|
||||||
"@homarr/cron-job-api": "workspace:^0.1.0",
|
"@homarr/cron-job-api": "workspace:^0.1.0",
|
||||||
@@ -33,7 +32,6 @@
|
|||||||
"@homarr/docker": "workspace:^0.1.0",
|
"@homarr/docker": "workspace:^0.1.0",
|
||||||
"@homarr/icons": "workspace:^0.1.0",
|
"@homarr/icons": "workspace:^0.1.0",
|
||||||
"@homarr/integrations": "workspace:^0.1.0",
|
"@homarr/integrations": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^",
|
|
||||||
"@homarr/old-import": "workspace:^0.1.0",
|
"@homarr/old-import": "workspace:^0.1.0",
|
||||||
"@homarr/old-schema": "workspace:^0.1.0",
|
"@homarr/old-schema": "workspace:^0.1.0",
|
||||||
"@homarr/ping": "workspace:^0.1.0",
|
"@homarr/ping": "workspace:^0.1.0",
|
||||||
@@ -43,24 +41,24 @@
|
|||||||
"@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.12",
|
"@tanstack/react-query": "^5.90.16",
|
||||||
"@trpc/client": "^11.7.2",
|
"@trpc/client": "^11.8.1",
|
||||||
"@trpc/react-query": "^11.7.2",
|
"@trpc/react-query": "^11.8.1",
|
||||||
"@trpc/server": "^11.7.2",
|
"@trpc/server": "^11.8.1",
|
||||||
"@trpc/tanstack-react-query": "^11.7.2",
|
"@trpc/tanstack-react-query": "^11.8.1",
|
||||||
"lodash.clonedeep": "^4.5.0",
|
"lodash.clonedeep": "^4.5.0",
|
||||||
"next": "16.0.10",
|
"next": "16.1.1",
|
||||||
"react": "19.2.1",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.1",
|
"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.1.13"
|
"zod": "^4.2.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",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.2",
|
||||||
"prettier": "^3.7.4",
|
"prettier": "^3.7.4",
|
||||||
"typescript": "^5.9.3"
|
"typescript": "^5.9.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
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) =>
|
||||||
@@ -11,7 +13,7 @@ export const openApiDocument = (base: string) =>
|
|||||||
securitySchemes: {
|
securitySchemes: {
|
||||||
apikey: {
|
apikey: {
|
||||||
type: "apiKey",
|
type: "apiKey",
|
||||||
name: "ApiKey",
|
name: API_KEY_HEADER_NAME,
|
||||||
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",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export const apiKeysRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -141,13 +141,15 @@ 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(
|
||||||
input.map((app) => ({
|
await Promise.all(
|
||||||
id: createId(),
|
input.map(async (app) => ({
|
||||||
name: app.name,
|
id: createId(),
|
||||||
description: app.description,
|
name: app.name,
|
||||||
iconUrl: app.iconUrl ?? getIconForName(ctx.db, app.name).sync()?.url ?? defaultIcon,
|
description: app.description,
|
||||||
href: app.href,
|
iconUrl: app.iconUrl ?? (await getIconForName(ctx.db, app.name))?.url ?? defaultIcon,
|
||||||
})),
|
href: app.href,
|
||||||
|
})),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
update: permissionRequiredProcedure
|
update: permissionRequiredProcedure
|
||||||
|
|||||||
+216
-530
@@ -6,8 +6,8 @@ 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, InferInsertModel, InferSelectModel, SQL } from "@homarr/db";
|
||||||
import { and, asc, eq, handleTransactionsAsync, inArray, isNull, like, not, or, sql } from "@homarr/db";
|
import { and, asc, eq, inArray, isNull, like, not, or, sql } from "@homarr/db";
|
||||||
import { createDbInsertCollectionWithoutTransaction } from "@homarr/db/collection";
|
import { createDbInsertCollection } from "@homarr/db/collection";
|
||||||
import { getServerSettingByKeyAsync } from "@homarr/db/queries";
|
import { getServerSettingByKeyAsync } from "@homarr/db/queries";
|
||||||
import {
|
import {
|
||||||
boardGroupPermissions,
|
boardGroupPermissions,
|
||||||
@@ -155,6 +155,7 @@ export const boardRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
userPermissions: {
|
userPermissions: {
|
||||||
@@ -272,7 +273,7 @@ export const boardRouter = createTRPCRouter({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const createBoardCollection = createDbInsertCollectionWithoutTransaction(["boards", "sections", "layouts"]);
|
const createBoardCollection = createDbInsertCollection(["boards", "sections", "layouts"]);
|
||||||
|
|
||||||
createBoardCollection.boards.push({
|
createBoardCollection.boards.push({
|
||||||
id: boardId,
|
id: boardId,
|
||||||
@@ -438,86 +439,41 @@ export const boardRouter = createTRPCRouter({
|
|||||||
})),
|
})),
|
||||||
);
|
);
|
||||||
|
|
||||||
await handleTransactionsAsync(ctx.db, {
|
await ctx.db.transaction(async (transaction) => {
|
||||||
async handleAsync(db, schema) {
|
transaction.insert(boards).values({
|
||||||
await db.transaction(async (transaction) => {
|
...boardProps,
|
||||||
transaction.insert(schema.boards).values({
|
id: newBoardId,
|
||||||
...boardProps,
|
name: input.name,
|
||||||
id: newBoardId,
|
creatorId: ctx.session.user.id,
|
||||||
name: input.name,
|
});
|
||||||
creatorId: ctx.session.user.id,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (layoutsToInsert.length > 0) {
|
if (layoutsToInsert.length > 0) {
|
||||||
await transaction.insert(schema.layouts).values(layoutsToInsert);
|
await transaction.insert(layouts).values(layoutsToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sectionsToInsert.length > 0) {
|
if (sectionsToInsert.length > 0) {
|
||||||
await transaction.insert(schema.sections).values(sectionsToInsert);
|
await transaction.insert(sections).values(sectionsToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sectionLayoutsToInsert.length > 0) {
|
if (sectionLayoutsToInsert.length > 0) {
|
||||||
await transaction.insert(schema.sectionLayouts).values(sectionLayoutsToInsert);
|
await transaction.insert(sectionLayouts).values(sectionLayoutsToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sectionCollapseStatesToInsert.length > 0) {
|
if (sectionCollapseStatesToInsert.length > 0) {
|
||||||
await transaction.insert(schema.sectionCollapseStates).values(sectionCollapseStatesToInsert);
|
await transaction.insert(sectionCollapseStates).values(sectionCollapseStatesToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (itemsToInsert.length > 0) {
|
if (itemsToInsert.length > 0) {
|
||||||
await transaction.insert(schema.items).values(itemsToInsert);
|
await transaction.insert(items).values(itemsToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (itemLayoutsToInsert.length > 0) {
|
if (itemLayoutsToInsert.length > 0) {
|
||||||
await transaction.insert(schema.itemLayouts).values(itemLayoutsToInsert);
|
await transaction.insert(itemLayouts).values(itemLayoutsToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (itemIntegrationsToInsert.length > 0) {
|
if (itemIntegrationsToInsert.length > 0) {
|
||||||
await transaction.insert(schema.integrationItems).values(itemIntegrationsToInsert);
|
await transaction.insert(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 }) => {
|
||||||
@@ -755,415 +711,189 @@ 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 handleTransactionsAsync(ctx.db, {
|
await ctx.db.transaction(async (transaction) => {
|
||||||
async handleAsync(db, schema) {
|
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
|
||||||
await db.transaction(async (transaction) => {
|
|
||||||
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
|
|
||||||
|
|
||||||
if (addedSections.length > 0) {
|
if (addedSections.length > 0) {
|
||||||
await transaction.insert(schema.sections).values(
|
await transaction.insert(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(schema.sectionLayouts).values(
|
await transaction.insert(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 schema.sectionLayouts> => ({
|
(sectionLayout): InferInsertModel<typeof 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,
|
|
||||||
itemId,
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
const addedIntegrationRelations = inputIntegrationRelations.filter(
|
|
||||||
(inputRelation) =>
|
|
||||||
!dbIntegrationRelations.some(
|
|
||||||
(dbRelation) =>
|
|
||||||
dbRelation.itemId === inputRelation.itemId &&
|
|
||||||
dbRelation.integrationId === inputRelation.integrationId,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (addedIntegrationRelations.length > 0) {
|
const addedItems = filterAddedItems(input.items, dbBoard.items);
|
||||||
await transaction.insert(schema.integrationItems).values(
|
|
||||||
addedIntegrationRelations.map((relation) => ({
|
|
||||||
itemId: relation.itemId,
|
|
||||||
integrationId: relation.integrationId,
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
|
if (addedItems.length > 0) {
|
||||||
|
await 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,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
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,
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
for (const item of updatedItems) {
|
const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
|
||||||
await transaction
|
integrationIds.map((integrationId) => ({
|
||||||
.update(schema.items)
|
integrationId,
|
||||||
.set({
|
itemId,
|
||||||
kind: item.kind,
|
})),
|
||||||
options: superjson.stringify(item.options),
|
);
|
||||||
advancedOptions: superjson.stringify(item.advancedOptions),
|
const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
|
||||||
})
|
integrationIds.map((integrationId) => ({
|
||||||
.where(eq(schema.items.id, item.id));
|
integrationId,
|
||||||
|
itemId,
|
||||||
for (const itemSectionLayout of item.layouts) {
|
})),
|
||||||
await transaction
|
);
|
||||||
.update(schema.itemLayouts)
|
const addedIntegrationRelations = inputIntegrationRelations.filter(
|
||||||
.set({
|
(inputRelation) =>
|
||||||
height: itemSectionLayout.height,
|
!dbIntegrationRelations.some(
|
||||||
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) =>
|
(dbRelation) =>
|
||||||
!inputIntegrationRelations.some(
|
dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
|
||||||
(inputRelation) =>
|
),
|
||||||
dbRelation.itemId === inputRelation.itemId &&
|
);
|
||||||
dbRelation.integrationId === inputRelation.integrationId,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
for (const relation of removedIntegrationRelations) {
|
if (addedIntegrationRelations.length > 0) {
|
||||||
await transaction
|
await transaction.insert(integrationItems).values(
|
||||||
.delete(schema.integrationItems)
|
addedIntegrationRelations.map((relation) => ({
|
||||||
.where(
|
itemId: relation.itemId,
|
||||||
and(
|
integrationId: relation.integrationId,
|
||||||
eq(integrationItems.itemId, relation.itemId),
|
})),
|
||||||
eq(integrationItems.integrationId, relation.integrationId),
|
);
|
||||||
),
|
}
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const removedItems = filterRemovedItems(input.items, dbBoard.items);
|
const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
|
||||||
|
|
||||||
const itemIds = removedItems.map((item) => item.id);
|
for (const item of updatedItems) {
|
||||||
if (itemIds.length > 0) {
|
await transaction
|
||||||
await transaction.delete(schema.items).where(inArray(schema.items.id, itemIds));
|
.update(items)
|
||||||
}
|
.set({
|
||||||
|
kind: item.kind,
|
||||||
|
options: superjson.stringify(item.options),
|
||||||
|
advancedOptions: superjson.stringify(item.advancedOptions),
|
||||||
|
})
|
||||||
|
.where(eq(items.id, item.id));
|
||||||
|
|
||||||
const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
|
for (const itemSectionLayout of item.layouts) {
|
||||||
const sectionIds = removedSections.map((section) => section.id);
|
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)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (sectionIds.length > 0) {
|
const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
|
||||||
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) {
|
for (const section of updatedSections) {
|
||||||
transaction
|
const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
|
||||||
.insert(sections)
|
await transaction
|
||||||
.values(
|
.update(sections)
|
||||||
addedSections.map((section) => ({
|
.set({
|
||||||
id: section.id,
|
yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
|
||||||
kind: section.kind,
|
xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
|
||||||
yOffset: section.kind !== "dynamic" ? section.yOffset : null,
|
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
|
||||||
xOffset: section.kind === "dynamic" ? null : 0,
|
name: prev?.kind === "category" && "name" in section ? section.name : null,
|
||||||
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
|
})
|
||||||
name: "name" in section ? section.name : null,
|
.where(eq(sections.id, section.id));
|
||||||
boardId: dbBoard.id,
|
|
||||||
})),
|
|
||||||
)
|
|
||||||
.run();
|
|
||||||
|
|
||||||
if (addedSections.some((section) => section.kind === "dynamic")) {
|
if (section.kind !== "dynamic") continue;
|
||||||
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);
|
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)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (addedItems.length > 0) {
|
const removedIntegrationRelations = dbIntegrationRelations.filter(
|
||||||
transaction
|
(dbRelation) =>
|
||||||
.insert(items)
|
!inputIntegrationRelations.some(
|
||||||
.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) =>
|
(inputRelation) =>
|
||||||
!dbIntegrationRelations.some(
|
dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
|
||||||
(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),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (addedIntegrationRelations.length > 0) {
|
const removedItems = filterRemovedItems(input.items, dbBoard.items);
|
||||||
transaction
|
|
||||||
.insert(integrationItems)
|
|
||||||
.values(
|
|
||||||
addedIntegrationRelations.map((relation) => ({
|
|
||||||
itemId: relation.itemId,
|
|
||||||
integrationId: relation.integrationId,
|
|
||||||
})),
|
|
||||||
)
|
|
||||||
.run();
|
|
||||||
}
|
|
||||||
|
|
||||||
const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
|
const itemIds = removedItems.map((item) => item.id);
|
||||||
|
if (itemIds.length > 0) {
|
||||||
|
await transaction.delete(items).where(inArray(items.id, itemIds));
|
||||||
|
}
|
||||||
|
|
||||||
for (const item of updatedItems) {
|
const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
|
||||||
transaction
|
const sectionIds = removedSections.map((section) => section.id);
|
||||||
.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) {
|
if (sectionIds.length > 0) {
|
||||||
transaction
|
await transaction.delete(sections).where(inArray(sections.id, sectionIds));
|
||||||
.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 }) => {
|
||||||
@@ -1195,6 +925,7 @@ export const boardRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -1240,81 +971,35 @@ 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 handleTransactionsAsync(ctx.db, {
|
await ctx.db.transaction(async (transaction) => {
|
||||||
async handleAsync(db, schema) {
|
await transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId));
|
||||||
await db.transaction(async (transaction) => {
|
if (input.permissions.length === 0) {
|
||||||
await transaction.delete(schema.boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId));
|
return;
|
||||||
if (input.permissions.length === 0) {
|
}
|
||||||
return;
|
await transaction.insert(boardUserPermissions).values(
|
||||||
}
|
input.permissions.map((permission) => ({
|
||||||
await transaction.insert(schema.boardUserPermissions).values(
|
userId: permission.principalId,
|
||||||
input.permissions.map((permission) => ({
|
permission: permission.permission,
|
||||||
userId: permission.principalId,
|
boardId: input.entityId,
|
||||||
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 handleTransactionsAsync(ctx.db, {
|
await ctx.db.transaction(async (transaction) => {
|
||||||
async handleAsync(db, schema) {
|
await transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId));
|
||||||
await db.transaction(async (transaction) => {
|
if (input.permissions.length === 0) {
|
||||||
await transaction
|
return;
|
||||||
.delete(schema.boardGroupPermissions)
|
}
|
||||||
.where(eq(boardGroupPermissions.boardId, input.entityId));
|
await transaction.insert(boardGroupPermissions).values(
|
||||||
if (input.permissions.length === 0) {
|
input.permissions.map((permission) => ({
|
||||||
return;
|
groupId: permission.principalId,
|
||||||
}
|
permission: permission.permission,
|
||||||
await transaction.insert(schema.boardGroupPermissions).values(
|
boardId: input.entityId,
|
||||||
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
|
||||||
@@ -1537,6 +1222,7 @@ 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: {
|
||||||
|
|||||||
@@ -3,14 +3,19 @@ import { TRPCError } from "@trpc/server";
|
|||||||
import { zfd } from "zod-form-data";
|
import { zfd } from "zod-form-data";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { addCustomRootCertificateAsync, removeCustomRootCertificateAsync } from "@homarr/certificates/server";
|
import {
|
||||||
|
addCustomRootCertificateAsync,
|
||||||
|
removeCustomRootCertificateAsync,
|
||||||
|
} from "@homarr/core/infrastructure/certificates";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { and, eq } from "@homarr/db";
|
import { and, eq } from "@homarr/db";
|
||||||
import { trustedCertificateHostnames } from "@homarr/db/schema";
|
import { trustedCertificateHostnames } from "@homarr/db/schema";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
import { certificateValidFileNameSchema, checkCertificateFile } from "@homarr/validation/certificates";
|
import { certificateValidFileNameSchema, checkCertificateFile } from "@homarr/validation/certificates";
|
||||||
|
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../trpc";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "certificateRouter" });
|
||||||
|
|
||||||
export const certificateRouter = createTRPCRouter({
|
export const certificateRouter = createTRPCRouter({
|
||||||
addCertificate: permissionRequiredProcedure
|
addCertificate: permissionRequiredProcedure
|
||||||
.requiresPermission("admin")
|
.requiresPermission("admin")
|
||||||
@@ -86,7 +91,7 @@ export const certificateRouter = createTRPCRouter({
|
|||||||
hostname: input.hostname,
|
hostname: input.hostname,
|
||||||
thumbprint: input.thumbprint,
|
thumbprint: input.thumbprint,
|
||||||
});
|
});
|
||||||
const dbResult = await ctx.db
|
await ctx.db
|
||||||
.delete(trustedCertificateHostnames)
|
.delete(trustedCertificateHostnames)
|
||||||
.where(
|
.where(
|
||||||
and(
|
and(
|
||||||
@@ -98,7 +103,6 @@ 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
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
import { observable } from "@trpc/server/observable";
|
import { observable } from "@trpc/server/observable";
|
||||||
import z from "zod/v4";
|
import z from "zod/v4";
|
||||||
|
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { cronExpressionSchema, jobGroupKeys, jobNameSchema } from "@homarr/cron-job-api";
|
import { cronExpressionSchema, jobGroupKeys, jobNameSchema } from "@homarr/cron-job-api";
|
||||||
import { cronJobApi } from "@homarr/cron-job-api/client";
|
import { cronJobApi } from "@homarr/cron-job-api/client";
|
||||||
import type { TaskStatus } from "@homarr/cron-job-status";
|
import type { TaskStatus } from "@homarr/cron-job-status";
|
||||||
import { createCronJobStatusChannel } from "@homarr/cron-job-status";
|
import { createCronJobStatusChannel } from "@homarr/cron-job-status";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "cronJobsRouter" });
|
||||||
|
|
||||||
export const cronJobsRouter = createTRPCRouter({
|
export const cronJobsRouter = createTRPCRouter({
|
||||||
triggerJob: permissionRequiredProcedure
|
triggerJob: permissionRequiredProcedure
|
||||||
.requiresPermission("admin")
|
.requiresPermission("admin")
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ 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, handleTransactionsAsync, like, not } from "@homarr/db";
|
import { and, eq, like, not } 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,21 +252,10 @@ 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 handleTransactionsAsync(ctx.db, {
|
await ctx.db.transaction(async (trx) => {
|
||||||
handleAsync: async (db, schema) => {
|
for (const { id, position } of positions) {
|
||||||
await db.transaction(async (trx) => {
|
await trx.update(groups).set({ position }).where(eq(groups.id, id));
|
||||||
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,8 +3,9 @@ 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 type { Database } from "@homarr/db";
|
import type { Database } from "@homarr/db";
|
||||||
import { and, asc, eq, handleTransactionsAsync, inArray, like, or } from "@homarr/db";
|
import { and, asc, eq, inArray, like, or } from "@homarr/db";
|
||||||
import {
|
import {
|
||||||
apps,
|
apps,
|
||||||
groupMembers,
|
groupMembers,
|
||||||
@@ -26,7 +27,6 @@ import {
|
|||||||
integrationSecretKindObject,
|
integrationSecretKindObject,
|
||||||
} from "@homarr/definitions";
|
} from "@homarr/definitions";
|
||||||
import { createIntegrationAsync } from "@homarr/integrations";
|
import { createIntegrationAsync } from "@homarr/integrations";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
import { byIdSchema } from "@homarr/validation/common";
|
import { byIdSchema } from "@homarr/validation/common";
|
||||||
import {
|
import {
|
||||||
integrationCreateSchema,
|
integrationCreateSchema,
|
||||||
@@ -40,6 +40,8 @@ import { throwIfActionForbiddenAsync } from "./integration-access";
|
|||||||
import { MissingSecretError, testConnectionAsync } from "./integration-test-connection";
|
import { MissingSecretError, testConnectionAsync } from "./integration-test-connection";
|
||||||
import { mapTestConnectionError } from "./map-test-connection-error";
|
import { mapTestConnectionError } from "./map-test-connection-error";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "integrationRouter" });
|
||||||
|
|
||||||
export const integrationRouter = createTRPCRouter({
|
export const integrationRouter = createTRPCRouter({
|
||||||
all: publicProcedure.query(async ({ ctx }) => {
|
all: publicProcedure.query(async ({ ctx }) => {
|
||||||
const groupsOfCurrentUser = await ctx.db.query.groupMembers.findMany({
|
const groupsOfCurrentUser = await ctx.db.query.groupMembers.findMany({
|
||||||
@@ -474,6 +476,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -521,45 +524,20 @@ 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 handleTransactionsAsync(ctx.db, {
|
await ctx.db.transaction(async (transaction) => {
|
||||||
async handleAsync(db, schema) {
|
await transaction
|
||||||
await ctx.db.transaction(async (transaction) => {
|
.delete(integrationUserPermissions)
|
||||||
await transaction
|
.where(eq(integrationUserPermissions.integrationId, input.entityId));
|
||||||
.delete(schema.integrationUserPermissions)
|
if (input.permissions.length === 0) {
|
||||||
.where(eq(schema.integrationUserPermissions.integrationId, input.entityId));
|
return;
|
||||||
if (input.permissions.length === 0) {
|
}
|
||||||
return;
|
await transaction.insert(integrationUserPermissions).values(
|
||||||
}
|
input.permissions.map((permission) => ({
|
||||||
await transaction.insert(schema.integrationUserPermissions).values(
|
userId: permission.principalId,
|
||||||
input.permissions.map((permission) => ({
|
permission: permission.permission,
|
||||||
userId: permission.principalId,
|
integrationId: input.entityId,
|
||||||
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
|
||||||
@@ -567,45 +545,20 @@ 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 handleTransactionsAsync(ctx.db, {
|
await ctx.db.transaction(async (transaction) => {
|
||||||
async handleAsync(db, schema) {
|
await transaction
|
||||||
await db.transaction(async (transaction) => {
|
.delete(integrationGroupPermissions)
|
||||||
await transaction
|
.where(eq(integrationGroupPermissions.integrationId, input.entityId));
|
||||||
.delete(schema.integrationGroupPermissions)
|
if (input.permissions.length === 0) {
|
||||||
.where(eq(schema.integrationGroupPermissions.integrationId, input.entityId));
|
return;
|
||||||
if (input.permissions.length === 0) {
|
}
|
||||||
return;
|
await transaction.insert(integrationGroupPermissions).values(
|
||||||
}
|
input.permissions.map((permission) => ({
|
||||||
await transaction.insert(schema.integrationGroupPermissions).values(
|
groupId: permission.principalId,
|
||||||
input.permissions.map((permission) => ({
|
permission: permission.permission,
|
||||||
groupId: permission.principalId,
|
integrationId: input.entityId,
|
||||||
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,9 +1,12 @@
|
|||||||
import { decryptSecret } from "@homarr/common/server";
|
import { decryptSecret } from "@homarr/common/server";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
import type { Integration } from "@homarr/db/schema";
|
import type { Integration } from "@homarr/db/schema";
|
||||||
import type { IntegrationKind, IntegrationSecretKind } from "@homarr/definitions";
|
import type { IntegrationKind, IntegrationSecretKind } from "@homarr/definitions";
|
||||||
import { getAllSecretKindOptions } from "@homarr/definitions";
|
import { getAllSecretKindOptions } from "@homarr/definitions";
|
||||||
import { createIntegrationAsync } from "@homarr/integrations";
|
import { createIntegrationAsync } from "@homarr/integrations";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
const logger = createLogger({ module: "integrationTestConnection" });
|
||||||
|
|
||||||
type FormIntegration = Omit<Integration, "appId"> & {
|
type FormIntegration = Omit<Integration, "appId"> & {
|
||||||
secrets: {
|
secrets: {
|
||||||
@@ -35,8 +38,13 @@ export const testConnectionAsync = async (
|
|||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
new Error(
|
new ErrorWithMetadata(
|
||||||
`Failed to decrypt secret from database integration="${integration.name}" secretKind="${secret.kind}"`,
|
"Failed to decrypt secret from database",
|
||||||
|
{
|
||||||
|
integrationName: integration.name,
|
||||||
|
integrationKind: integration.kind,
|
||||||
|
secretKind: secret.kind,
|
||||||
|
},
|
||||||
{ cause: error },
|
{ cause: error },
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import type { V1NodeList, VersionInfo } from "@kubernetes/client-node";
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { ClusterResourceCount, KubernetesCluster } from "@homarr/definitions";
|
import type { ClusterResourceCount, KubernetesCluster } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -129,7 +128,6 @@ export const clusterRouter = createTRPCRouter({
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve cluster", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes cluster",
|
message: "An error occurred while fetching Kubernetes cluster",
|
||||||
@@ -165,7 +163,6 @@ export const clusterRouter = createTRPCRouter({
|
|||||||
{ label: "volumes", count: volumes.items.length },
|
{ label: "volumes", count: volumes.items.length },
|
||||||
];
|
];
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve cluster resource counts", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes resources count",
|
message: "An error occurred while fetching Kubernetes resources count",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { KubernetesBaseResource } from "@homarr/definitions";
|
import type { KubernetesBaseResource } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -25,7 +24,6 @@ export const configMapsRouter = createTRPCRouter({
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve configMaps", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes ConfigMaps",
|
message: "An error occurred while fetching Kubernetes ConfigMaps",
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import type { V1HTTPIngressPath, V1Ingress, V1IngressRule } from "@kubernetes/cl
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { KubernetesIngress, KubernetesIngressPath, KubernetesIngressRuleAndPath } from "@homarr/definitions";
|
import type { KubernetesIngress, KubernetesIngressPath, KubernetesIngressRuleAndPath } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -43,7 +42,6 @@ export const ingressesRouter = createTRPCRouter({
|
|||||||
|
|
||||||
return ingresses.items.map(mapIngress);
|
return ingresses.items.map(mapIngress);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve ingresses", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes ingresses",
|
message: "An error occurred while fetching Kubernetes ingresses",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { KubernetesNamespace, KubernetesNamespaceState } from "@homarr/definitions";
|
import type { KubernetesNamespace, KubernetesNamespaceState } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -25,7 +24,6 @@ export const namespacesRouter = createTRPCRouter({
|
|||||||
} satisfies KubernetesNamespace;
|
} satisfies KubernetesNamespace;
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve namespaces", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes namespaces",
|
message: "An error occurred while fetching Kubernetes namespaces",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { KubernetesNode, KubernetesNodeState } from "@homarr/definitions";
|
import type { KubernetesNode, KubernetesNodeState } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -57,7 +56,6 @@ export const nodesRouter = createTRPCRouter({
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve nodes", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes nodes",
|
message: "An error occurred while fetching Kubernetes nodes",
|
||||||
|
|||||||
@@ -2,13 +2,15 @@ import type { KubeConfig, V1OwnerReference } from "@kubernetes/client-node";
|
|||||||
import { AppsV1Api } from "@kubernetes/client-node";
|
import { AppsV1Api } from "@kubernetes/client-node";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import type { KubernetesPod } from "@homarr/definitions";
|
import type { KubernetesPod } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
import { KubernetesClient } from "../kubernetes-client";
|
import { KubernetesClient } from "../kubernetes-client";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "podsRouter" });
|
||||||
|
|
||||||
export const podsRouter = createTRPCRouter({
|
export const podsRouter = createTRPCRouter({
|
||||||
getPods: permissionRequiredProcedure
|
getPods: permissionRequiredProcedure
|
||||||
.requiresPermission("admin")
|
.requiresPermission("admin")
|
||||||
@@ -55,7 +57,6 @@ export const podsRouter = createTRPCRouter({
|
|||||||
|
|
||||||
return pods;
|
return pods;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve pods", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes pods",
|
message: "An error occurred while fetching Kubernetes pods",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { KubernetesSecret } from "@homarr/definitions";
|
import type { KubernetesSecret } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -25,7 +24,6 @@ export const secretsRouter = createTRPCRouter({
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve secrets", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes secrets",
|
message: "An error occurred while fetching Kubernetes secrets",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { KubernetesService } from "@homarr/definitions";
|
import type { KubernetesService } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -29,7 +28,6 @@ export const servicesRouter = createTRPCRouter({
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve services", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes services",
|
message: "An error occurred while fetching Kubernetes services",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import type { KubernetesVolume } from "@homarr/definitions";
|
import type { KubernetesVolume } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
import { kubernetesMiddleware } from "../../../middlewares/kubernetes";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../../trpc";
|
||||||
@@ -31,7 +30,6 @@ export const volumesRouter = createTRPCRouter({
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("Unable to retrieve volumes", error);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: "An error occurred while fetching Kubernetes Volumes",
|
message: "An error occurred while fetching Kubernetes Volumes",
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { fetchWithTimeout } from "@homarr/common";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
|
import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
||||||
|
|
||||||
import { createTRPCRouter, publicProcedure } from "../trpc";
|
import { createTRPCRouter, publicProcedure } from "../trpc";
|
||||||
|
|
||||||
@@ -36,7 +37,12 @@ export const locationRouter = createTRPCRouter({
|
|||||||
.input(locationSearchCityInput)
|
.input(locationSearchCityInput)
|
||||||
.output(locationSearchCityOutput)
|
.output(locationSearchCityOutput)
|
||||||
.query(async ({ input }) => {
|
.query(async ({ input }) => {
|
||||||
const res = await fetchWithTimeout(`https://geocoding-api.open-meteo.com/v1/search?name=${input.query}`);
|
const res = await withTimeoutAsync(async (signal) => {
|
||||||
|
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,14 +1,16 @@
|
|||||||
import { observable } from "@trpc/server/observable";
|
import { observable } from "@trpc/server/observable";
|
||||||
import z from "zod/v4";
|
import z from "zod/v4";
|
||||||
|
|
||||||
import { logger } from "@homarr/log";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { logLevels } from "@homarr/log/constants";
|
import { logLevels } from "@homarr/core/infrastructure/logs/constants";
|
||||||
import type { LoggerMessage } from "@homarr/redis";
|
import type { LoggerMessage } from "@homarr/redis";
|
||||||
import { loggingChannel } from "@homarr/redis";
|
import { loggingChannel } from "@homarr/redis";
|
||||||
import { zodEnumFromArray } from "@homarr/validation/enums";
|
import { zodEnumFromArray } from "@homarr/validation/enums";
|
||||||
|
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "logRouter" });
|
||||||
|
|
||||||
export const logRouter = createTRPCRouter({
|
export const logRouter = createTRPCRouter({
|
||||||
subscribe: permissionRequiredProcedure
|
subscribe: permissionRequiredProcedure
|
||||||
.requiresPermission("other-view-logs")
|
.requiresPermission("other-view-logs")
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ export const mediaRouter = createTRPCRouter({
|
|||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
image: true,
|
image: true,
|
||||||
|
email: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2,11 +2,11 @@ import { TRPCError } from "@trpc/server";
|
|||||||
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 { asc, eq, like } from "@homarr/db";
|
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";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
import { byIdSchema, paginatedSchema, searchSchema } from "@homarr/validation/common";
|
import { byIdSchema, paginatedSchema, searchSchema } from "@homarr/validation/common";
|
||||||
import { searchEngineEditSchema, searchEngineManageSchema } from "@homarr/validation/search-engine";
|
import { searchEngineEditSchema, searchEngineManageSchema } from "@homarr/validation/search-engine";
|
||||||
import { mediaRequestOptionsSchema, mediaRequestRequestSchema } from "@homarr/validation/widgets/media-request";
|
import { mediaRequestOptionsSchema, mediaRequestRequestSchema } from "@homarr/validation/widgets/media-request";
|
||||||
@@ -14,6 +14,8 @@ import { mediaRequestOptionsSchema, mediaRequestRequestSchema } from "@homarr/va
|
|||||||
import { createOneIntegrationMiddleware } from "../../middlewares/integration";
|
import { createOneIntegrationMiddleware } from "../../middlewares/integration";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "searchEngineRouter" });
|
||||||
|
|
||||||
export const searchEngineRouter = createTRPCRouter({
|
export const searchEngineRouter = createTRPCRouter({
|
||||||
getPaginated: protectedProcedure.input(paginatedSchema).query(async ({ input, ctx }) => {
|
getPaginated: protectedProcedure.input(paginatedSchema).query(async ({ input, ctx }) => {
|
||||||
const whereQuery = input.search ? like(searchEngines.name, `%${input.search.trim()}%`) : undefined;
|
const whereQuery = input.search ? like(searchEngines.name, `%${input.search.trim()}%`) : 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 { apps } from "@homarr/db/schema";
|
import { apps } from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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: createDb(),
|
db: await createDbAsync(),
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import {
|
|||||||
serverSettings,
|
serverSettings,
|
||||||
users,
|
users,
|
||||||
} from "@homarr/db/schema";
|
} from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 +55,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +86,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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = boardRouter.createCaller({
|
const caller = boardRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
@@ -128,7 +128,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +170,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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = boardRouter.createCaller({
|
const caller = boardRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
@@ -236,7 +236,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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = boardRouter.createCaller({
|
const caller = boardRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
@@ -290,7 +290,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 = createDb();
|
const db = await createDbAsync();
|
||||||
const session = {
|
const session = {
|
||||||
...defaultSession,
|
...defaultSession,
|
||||||
user: {
|
user: {
|
||||||
@@ -333,7 +333,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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
@@ -347,7 +347,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +375,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +402,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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
@@ -418,7 +418,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +453,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +480,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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
@@ -495,7 +495,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +519,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +540,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +556,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +574,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +590,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +647,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +666,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +703,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +760,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +832,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +884,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +956,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1024,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1083,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1147,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1164,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1220,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 },
|
user: { id: user1, name: null, image: null, email: null },
|
||||||
permission: "view",
|
permission: "view",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
user: { id: user2, name: null, image: null },
|
user: { id: user2, name: null, image: null, email: null },
|
||||||
permission: "modify",
|
permission: "modify",
|
||||||
},
|
},
|
||||||
]),
|
]),
|
||||||
@@ -1239,7 +1239,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1281,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1339,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1363,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1394,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1420,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1447,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 +1466,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 = createDb();
|
const db = await createDbAsync();
|
||||||
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");
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import * as authShared from "@homarr/auth/shared";
|
|||||||
import { createId } from "@homarr/common";
|
import { createId } from "@homarr/common";
|
||||||
import { eq } from "@homarr/db";
|
import { eq } from "@homarr/db";
|
||||||
import { boards, users } from "@homarr/db/schema";
|
import { boards, users } from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(boards.id, createId()), "full");
|
const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(boards.id, createId()), "full");
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import * as env from "@homarr/auth/env";
|
|||||||
import { createId } from "@homarr/common";
|
import { createId } from "@homarr/common";
|
||||||
import { eq } from "@homarr/db";
|
import { eq } from "@homarr/db";
|
||||||
import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
|
import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 });
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import * as authShared from "@homarr/auth/shared";
|
|||||||
import { createId } from "@homarr/common";
|
import { createId } from "@homarr/common";
|
||||||
import { eq } from "@homarr/db";
|
import { eq } from "@homarr/db";
|
||||||
import { integrations, users } from "@homarr/db/schema";
|
import { integrations, users } from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
|
|
||||||
// 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 { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.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 { invites, users } from "@homarr/db/schema";
|
import { invites, users } from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = serverSettingsRouter.createCaller({
|
const caller = serverSettingsRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { createId } from "@homarr/common";
|
|||||||
import type { Database } from "@homarr/db";
|
import type { Database } from "@homarr/db";
|
||||||
import { eq } 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 { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 { createDb } from "@homarr/db/test";
|
import { createDbAsync } 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 = createDb();
|
const db = await createDbAsync();
|
||||||
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 = createDb();
|
const db = await createDbAsync();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import { logger } from "@homarr/log";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
|
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
|
||||||
|
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "updateCheckerRouter" });
|
||||||
|
|
||||||
export const updateCheckerRouter = createTRPCRouter({
|
export const updateCheckerRouter = createTRPCRouter({
|
||||||
getAvailableUpdates: permissionRequiredProcedure.requiresPermission("admin").query(async () => {
|
getAvailableUpdates: permissionRequiredProcedure.requiresPermission("admin").query(async () => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ 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 type { Database } from "@homarr/db";
|
import type { Database } from "@homarr/db";
|
||||||
import { and, eq, like } from "@homarr/db";
|
import { and, eq, like } from "@homarr/db";
|
||||||
import { getMaxGroupPositionAsync } from "@homarr/db/queries";
|
import { getMaxGroupPositionAsync } from "@homarr/db/queries";
|
||||||
@@ -10,7 +11,6 @@ import { boards, groupMembers, groupPermissions, groups, invites, users } from "
|
|||||||
import { selectUserSchema } from "@homarr/db/validationSchemas";
|
import { selectUserSchema } from "@homarr/db/validationSchemas";
|
||||||
import { credentialsAdminGroup } from "@homarr/definitions";
|
import { credentialsAdminGroup } from "@homarr/definitions";
|
||||||
import type { SupportedAuthProvider } from "@homarr/definitions";
|
import type { SupportedAuthProvider } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
import { byIdSchema } from "@homarr/validation/common";
|
import { byIdSchema } from "@homarr/validation/common";
|
||||||
import type { userBaseCreateSchema } from "@homarr/validation/user";
|
import type { userBaseCreateSchema } from "@homarr/validation/user";
|
||||||
import {
|
import {
|
||||||
@@ -39,6 +39,8 @@ import { throwIfCredentialsDisabled } from "./invite/checks";
|
|||||||
import { nextOnboardingStepAsync } from "./onboard/onboard-queries";
|
import { nextOnboardingStepAsync } from "./onboard/onboard-queries";
|
||||||
import { changeSearchPreferencesAsync, changeSearchPreferencesInputSchema } from "./user/change-search-preferences";
|
import { changeSearchPreferencesAsync, changeSearchPreferencesInputSchema } from "./user/change-search-preferences";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "userRouter" });
|
||||||
|
|
||||||
export const userRouter = createTRPCRouter({
|
export const userRouter = createTRPCRouter({
|
||||||
initUser: onboardingProcedure
|
initUser: onboardingProcedure
|
||||||
.requiresStep("user")
|
.requiresStep("user")
|
||||||
@@ -172,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 })))
|
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true, email: 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({
|
||||||
@@ -180,6 +182,7 @@ 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,
|
||||||
});
|
});
|
||||||
@@ -192,7 +195,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 })))
|
.output(z.array(selectUserSchema.pick({ id: true, name: true, image: true, email: 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({
|
||||||
@@ -200,6 +203,7 @@ 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,
|
||||||
@@ -208,6 +212,7 @@ 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
|
||||||
@@ -364,9 +369,11 @@ export const userRouter = createTRPCRouter({
|
|||||||
// Admins can change the password of other users without providing the previous password
|
// Admins can change the password of other users without providing the previous password
|
||||||
const isPreviousPasswordRequired = ctx.session.user.id === input.userId;
|
const isPreviousPasswordRequired = ctx.session.user.id === input.userId;
|
||||||
|
|
||||||
logger.info(
|
logger.info("Changing user password", {
|
||||||
`User ${user.id} is changing password for user ${input.userId}, previous password is required: ${isPreviousPasswordRequired}`,
|
actorId: ctx.session.user.id,
|
||||||
);
|
targetUserId: input.userId,
|
||||||
|
previousPasswordRequired: isPreviousPasswordRequired,
|
||||||
|
});
|
||||||
|
|
||||||
if (isPreviousPasswordRequired) {
|
if (isPreviousPasswordRequired) {
|
||||||
const previousPasswordHash = await hashPasswordAsync(input.previousPassword, dbUser.salt ?? "");
|
const previousPasswordHash = await hashPasswordAsync(input.previousPassword, dbUser.salt ?? "");
|
||||||
|
|||||||
@@ -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", "mock"))
|
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "unraid", "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", "mock"))
|
.concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot", "truenas", "unraid", "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)[] = [];
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { observable } from "@trpc/server/observable";
|
|||||||
import { getIntegrationKindsByCategory } from "@homarr/definitions";
|
import { getIntegrationKindsByCategory } from "@homarr/definitions";
|
||||||
import { createIntegrationAsync } from "@homarr/integrations";
|
import { createIntegrationAsync } from "@homarr/integrations";
|
||||||
import type { Indexer } from "@homarr/integrations/types";
|
import type { Indexer } from "@homarr/integrations/types";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
import { indexerManagerRequestHandler } from "@homarr/request-handler/indexer-manager";
|
import { indexerManagerRequestHandler } from "@homarr/request-handler/indexer-manager";
|
||||||
|
|
||||||
import type { IntegrationAction } from "../../middlewares/integration";
|
import type { IntegrationAction } from "../../middlewares/integration";
|
||||||
@@ -61,10 +60,10 @@ export const indexerManagerRouter = createTRPCRouter({
|
|||||||
ctx.integrations.map(async (integration) => {
|
ctx.integrations.map(async (integration) => {
|
||||||
const client = await createIntegrationAsync(integration);
|
const client = await createIntegrationAsync(integration);
|
||||||
await client.testAllAsync().catch((err) => {
|
await client.testAllAsync().catch((err) => {
|
||||||
logger.error("indexer-manager router - ", err);
|
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
message: `Failed to test all indexers for ${integration.name} (${integration.id})`,
|
message: `Failed to test all indexers for ${integration.name} (${integration.id})`,
|
||||||
|
cause: err,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export const notebookRouter = createTRPCRouter({
|
|||||||
where: eq(items.id, input.itemId),
|
where: eq(items.id, input.itemId),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!item || item.boardId !== input.boardId) {
|
if (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,3 +1,4 @@
|
|||||||
|
import { escapeForRegEx } from "@tiptap/react";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { getIntegrationKindsByCategory } from "@homarr/definitions";
|
import { getIntegrationKindsByCategory } from "@homarr/definitions";
|
||||||
@@ -9,9 +10,9 @@ import { createTRPCRouter, publicProcedure } from "../../trpc";
|
|||||||
const formatVersionFilterRegex = (versionFilter: z.infer<typeof releaseVersionFilterSchema> | undefined) => {
|
const formatVersionFilterRegex = (versionFilter: z.infer<typeof releaseVersionFilterSchema> | undefined) => {
|
||||||
if (!versionFilter) return undefined;
|
if (!versionFilter) return undefined;
|
||||||
|
|
||||||
const escapedPrefix = versionFilter.prefix ? RegExp.escape(versionFilter.prefix) : "";
|
const escapedPrefix = versionFilter.prefix ? escapeForRegEx(versionFilter.prefix) : "";
|
||||||
const precision = "[0-9]+\\.".repeat(versionFilter.precision).slice(0, -2);
|
const precision = "[0-9]+\\.".repeat(versionFilter.precision).slice(0, -2);
|
||||||
const escapedSuffix = versionFilter.suffix ? RegExp.escape(versionFilter.suffix) : "";
|
const escapedSuffix = versionFilter.suffix ? escapeForRegEx(versionFilter.suffix) : "";
|
||||||
|
|
||||||
return `^${escapedPrefix}${precision}${escapedSuffix}$`;
|
return `^${escapedPrefix}${precision}${escapedSuffix}$`;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,12 +14,14 @@ import { ZodError } from "zod/v4";
|
|||||||
import type { Session } from "@homarr/auth";
|
import type { Session } from "@homarr/auth";
|
||||||
import { FlattenError } from "@homarr/common";
|
import { FlattenError } from "@homarr/common";
|
||||||
import { userAgent } from "@homarr/common/server";
|
import { userAgent } from "@homarr/common/server";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { db } from "@homarr/db";
|
import { db } from "@homarr/db";
|
||||||
import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions";
|
import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
|
||||||
|
|
||||||
import { getOnboardingOrFallbackAsync } from "./router/onboard/onboard-queries";
|
import { getOnboardingOrFallbackAsync } from "./router/onboard/onboard-queries";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "trpc" });
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1. CONTEXT
|
* 1. CONTEXT
|
||||||
*
|
*
|
||||||
@@ -36,7 +38,7 @@ export const createTRPCContext = (opts: { headers: Headers; session: Session | n
|
|||||||
const session = opts.session;
|
const session = opts.session;
|
||||||
const source = opts.headers.get("x-trpc-source") ?? "unknown";
|
const source = opts.headers.get("x-trpc-source") ?? "unknown";
|
||||||
|
|
||||||
logger.info(`tRPC request from ${source} by user '${session?.user.name} (${session?.user.id})'`, session?.user);
|
logger.info("Received tRPC request", { source, userId: session?.user.id, userName: session?.user.name });
|
||||||
|
|
||||||
return {
|
return {
|
||||||
session,
|
session,
|
||||||
|
|||||||
Loaded 100 of 378 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user