Compare commits
148
Commits
v1.0.0-beta.12
...
v1.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b4b19f486e | ||
|
|
32cf09a62e | ||
|
|
a1ba4372da | ||
|
|
4e153b8046 | ||
|
|
ac788650fb | ||
|
|
a9b0e26c8d | ||
|
|
132db15424 | ||
|
|
860b73fa3f | ||
|
|
e4dd19b574 | ||
|
|
1b4ed02010 | ||
|
|
47b7cbb086 | ||
|
|
7a6477a272 | ||
|
|
bff536008c | ||
|
|
8b040eddef | ||
|
|
ce87d62b35 | ||
|
|
f88cc7381b | ||
|
|
cb54de524b | ||
|
|
7d8c7b9c2d | ||
|
|
73f7d885cd | ||
|
|
470d27e091 | ||
|
|
99c8e5b609 | ||
|
|
b413e2ec7d | ||
|
|
29d4f9e003 | ||
|
|
1f54bf5b9e | ||
|
|
4d8c22a4e6 | ||
|
|
3e9e1e5e4f | ||
|
|
582b981e69 | ||
|
|
f8ec4a43cf | ||
|
|
2a8809551c | ||
|
|
9df59296ff | ||
|
|
701538fcb5 | ||
|
|
0e82f2d199 | ||
|
|
a2b5d60aa8 | ||
|
|
02dabfcd01 | ||
|
|
931f312291 | ||
|
|
175927970b | ||
|
|
c922c5b083 | ||
|
|
73bbcfeee8 | ||
|
|
7a2d97ba91 | ||
|
|
e47d497560 | ||
|
|
b9271ba14a | ||
|
|
9d85677046 | ||
|
|
b30c192b8f | ||
|
|
d4f04da709 | ||
|
|
7960a4cea1 | ||
|
|
243d7e9dd4 | ||
|
|
bdefff636b | ||
|
|
55feb9dff8 | ||
|
|
45af6442a1 | ||
|
|
72debef4b4 | ||
|
|
25635db17e | ||
|
|
1897752e38 | ||
|
|
554853ffbd | ||
|
|
e40237e4a5 | ||
|
|
fa6262cf5e | ||
|
|
49bd02e869 | ||
|
|
3c8fbe371b | ||
|
|
81a8cf4b36 | ||
|
|
b5c008b4ad | ||
|
|
343438391b | ||
|
|
8400b9fb11 | ||
|
|
fe65e73fff | ||
|
|
e023edf9d6 | ||
|
|
927913cf4e | ||
|
|
07d8103051 | ||
|
|
fe08ccf589 | ||
|
|
c55207bd59 | ||
|
|
e35811c921 | ||
|
|
e481e116ff | ||
|
|
32be09a4a7 | ||
|
|
d0a20dbfc5 | ||
|
|
68329965f7 | ||
|
|
f9fea70d39 | ||
|
|
3ed46aecbd | ||
|
|
a31c6a97e0 | ||
|
|
d1be727eb3 | ||
|
|
a1084f91e5 | ||
|
|
7622f0a4d2 | ||
|
|
34cacb3153 | ||
|
|
48cf5d5304 | ||
|
|
8c36c3e36b | ||
|
|
b10b2013af | ||
|
|
ea8acc83ea | ||
|
|
cb96508634 | ||
|
|
5e83847772 | ||
|
|
1557537763 | ||
|
|
5f993d2630 | ||
|
|
44767c46c2 | ||
|
|
aaddf0d987 | ||
|
|
7f8e6e4ea1 | ||
|
|
34a76c98e8 | ||
|
|
0f82a6f63d | ||
|
|
d4bb014a9b | ||
|
|
e01d74f4f8 | ||
|
|
ec3bda34e0 | ||
|
|
5c16fb8d6c | ||
|
|
986e013ca3 | ||
|
|
1fd3fd8dfb | ||
|
|
a03a01b964 | ||
|
|
4d94fce523 | ||
|
|
75c791801e | ||
|
|
3e67b411b6 | ||
|
|
ff1a003037 | ||
|
|
99c69ba65d | ||
|
|
f5cf92c49c | ||
|
|
05dc51b38e | ||
|
|
a53e0f7cee | ||
|
|
f3a91ca37f | ||
|
|
1e406a8a58 | ||
|
|
2ea763c231 | ||
|
|
579bb2a33e | ||
|
|
feecdd36d4 | ||
|
|
56755d1ab4 | ||
|
|
6b36ec3103 | ||
|
|
fc6dbc92df | ||
|
|
467d5e21ae | ||
|
|
b399cb6979 | ||
|
|
4d69b81676 | ||
|
|
a1fc9902a5 | ||
|
|
0649220080 | ||
|
|
e502fbc533 | ||
|
|
fac522adb9 | ||
|
|
9945425eff | ||
|
|
8cd5833281 | ||
|
|
ef7174aa36 | ||
|
|
4ce76f8a73 | ||
|
|
3e65af9ebe | ||
|
|
c6e5bec348 | ||
|
|
3e74c065f5 | ||
|
|
14ae732d0c | ||
|
|
b97883f44d | ||
|
|
741753fa74 | ||
|
|
1f0f8912b6 | ||
|
|
49d6932218 | ||
|
|
f13fefa64d | ||
|
|
cef567efdf | ||
|
|
db2b79ee7f | ||
|
|
b46d30b04c | ||
|
|
de4283b5fa | ||
|
|
a08d3e387f | ||
|
|
bd1ff01109 | ||
|
|
b24b1cc8a9 | ||
|
|
e81edc898f | ||
|
|
4d864878e3 | ||
|
|
5776ead3e3 | ||
|
|
baf32c3fe6 | ||
|
|
ea408a0fdd | ||
|
|
17f93097f6 |
No files matched your search
@@ -28,6 +28,10 @@ DB_URL='FULL_PATH_TO_YOUR_SQLITE_DB_FILE'
|
|||||||
# DB_PASSWORD='password'
|
# DB_PASSWORD='password'
|
||||||
# DB_NAME='name-of-database'
|
# DB_NAME='name-of-database'
|
||||||
|
|
||||||
|
# The below path can be used to store trusted certificates during development, it is not required and can be left empty.
|
||||||
|
# If it is used, please use the full path to the directory where the certificates are stored.
|
||||||
|
# LOCAL_CERTIFICATE_PATH='FULL_PATH_TO_CERTIFICATES'
|
||||||
|
|
||||||
TURBO_TELEMETRY_DISABLED=1
|
TURBO_TELEMETRY_DISABLED=1
|
||||||
|
|
||||||
# Configure logging to use winston logger
|
# Configure logging to use winston logger
|
||||||
|
|||||||
@@ -31,6 +31,9 @@ body:
|
|||||||
label: Version
|
label: Version
|
||||||
description: What version of Homarr are you running?
|
description: What version of Homarr are you running?
|
||||||
options:
|
options:
|
||||||
|
- 1.1.0
|
||||||
|
- 1.0.1
|
||||||
|
- 1.0.0
|
||||||
- 1.0.0-beta
|
- 1.0.0-beta
|
||||||
- Other (describe in "additional information")
|
- Other (describe in "additional information")
|
||||||
default: 0
|
default: 0
|
||||||
@@ -75,4 +78,4 @@ body:
|
|||||||
- Other (describe in "additional information")
|
- Other (describe in "additional information")
|
||||||
default: 0
|
default: 0
|
||||||
validations:
|
validations:
|
||||||
required: false
|
required: false
|
||||||
@@ -6,6 +6,11 @@
|
|||||||
matchPackagePatterns: ["^@homarr/"],
|
matchPackagePatterns: ["^@homarr/"],
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
|
// Disable Dockerode updates see https://github.com/apocas/dockerode/issues/787
|
||||||
|
{
|
||||||
|
matchPackagePatterns: ["^dockerode$"],
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
matchUpdateTypes: ["minor", "patch", "pin", "digest"],
|
matchUpdateTypes: ["minor", "patch", "pin", "digest"],
|
||||||
automerge: true,
|
automerge: true,
|
||||||
|
|||||||
@@ -94,6 +94,8 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
|
GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
|
||||||
run: |
|
run: |
|
||||||
|
git config user.name "Releases Homarr"
|
||||||
|
git config user.email "175486441+homarr-releases[bot]@users.noreply.github.com"
|
||||||
git fetch origin dev
|
git fetch origin dev
|
||||||
git checkout dev
|
git checkout dev
|
||||||
git pull origin dev
|
git pull origin dev
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ jobs:
|
|||||||
token: ${{ github.token }}
|
token: ${{ github.token }}
|
||||||
branch: dev
|
branch: dev
|
||||||
- name: Create pull request
|
- name: Create pull request
|
||||||
run: 'gh pr create --title "chore(release): automatic release ${{ steps.semver.outputs.next }}" --body "**This is an automatic release**.<br/>Manual action may be required for major bumps.<br/>Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}``" --base beta --head dev --label automerge'
|
run: 'gh pr create --title "chore(release): automatic release ${{ steps.semver.outputs.next }}" --body "**This is an automatic release**.<br/>Manual action may be required for major bumps.<br/>Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}``" --base main --head dev --label automerge'
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
- name: Discord notification
|
- name: Discord notification
|
||||||
|
|||||||
+3
-1
@@ -54,7 +54,9 @@ yarn-error.log*
|
|||||||
*.log
|
*.log
|
||||||
|
|
||||||
apps/tasks/tasks.cjs
|
apps/tasks/tasks.cjs
|
||||||
|
apps/tasks/tasks.css
|
||||||
apps/websocket/wssServer.cjs
|
apps/websocket/wssServer.cjs
|
||||||
|
apps/websocket/wssServer.css
|
||||||
apps/nextjs/.million/
|
apps/nextjs/.million/
|
||||||
packages/cli/cli.cjs
|
packages/cli/cli.cjs
|
||||||
|
|
||||||
@@ -62,4 +64,4 @@ packages/cli/cli.cjs
|
|||||||
e2e/shared/tmp
|
e2e/shared/tmp
|
||||||
|
|
||||||
#personal backgrounds
|
#personal backgrounds
|
||||||
apps/nextjs/public/images/background.png
|
apps/nextjs/public/images/background.png
|
||||||
+1246
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM node:22.13.0-alpine AS base
|
FROM node:22.13.1-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
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
// Importing env files here to validate on build
|
// Importing env files here to validate on build
|
||||||
import "@homarr/auth/env.mjs";
|
import "@homarr/auth/env";
|
||||||
import "@homarr/db/env.mjs";
|
import "@homarr/db/env";
|
||||||
import "@homarr/common/env.mjs";
|
import "@homarr/common/env";
|
||||||
|
import "@homarr/docker/env";
|
||||||
|
|
||||||
import type { NextConfig } from "next";
|
import type { NextConfig } from "next";
|
||||||
import MillionLint from "@million/lint";
|
import MillionLint from "@million/lint";
|
||||||
import createNextIntlPlugin from "next-intl/plugin";
|
import createNextIntlPlugin from "next-intl/plugin";
|
||||||
|
|
||||||
import "./src/env.mjs";
|
import "./src/env.ts";
|
||||||
|
|
||||||
// Package path does not work... so we need to use relative path
|
// Package path does not work... so we need to use relative path
|
||||||
const withNextIntl = createNextIntlPlugin("../../packages/translation/src/request.ts");
|
const withNextIntl = createNextIntlPlugin("../../packages/translation/src/request.ts");
|
||||||
|
|||||||
+22
-19
@@ -18,12 +18,15 @@
|
|||||||
"@homarr/analytics": "workspace:^0.1.0",
|
"@homarr/analytics": "workspace:^0.1.0",
|
||||||
"@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/certificates": "workspace:^0.1.0",
|
||||||
"@homarr/common": "workspace:^0.1.0",
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
"@homarr/cron-job-status": "workspace:^0.1.0",
|
"@homarr/cron-job-status": "workspace:^0.1.0",
|
||||||
"@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/docker": "workspace:^0.1.0",
|
||||||
"@homarr/form": "workspace:^0.1.0",
|
"@homarr/form": "workspace:^0.1.0",
|
||||||
"@homarr/gridstack": "^1.11.3",
|
"@homarr/gridstack": "^1.12.0",
|
||||||
|
"@homarr/icons": "workspace:^0.1.0",
|
||||||
"@homarr/integrations": "workspace:^0.1.0",
|
"@homarr/integrations": "workspace:^0.1.0",
|
||||||
"@homarr/log": "workspace:^",
|
"@homarr/log": "workspace:^",
|
||||||
"@homarr/modals": "workspace:^0.1.0",
|
"@homarr/modals": "workspace:^0.1.0",
|
||||||
@@ -38,18 +41,18 @@
|
|||||||
"@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": "^7.15.3",
|
"@mantine/colors-generator": "^7.16.1",
|
||||||
"@mantine/core": "^7.15.3",
|
"@mantine/core": "^7.16.1",
|
||||||
"@mantine/dropzone": "^7.15.3",
|
"@mantine/dropzone": "^7.16.1",
|
||||||
"@mantine/hooks": "^7.15.3",
|
"@mantine/hooks": "^7.16.1",
|
||||||
"@mantine/modals": "^7.15.3",
|
"@mantine/modals": "^7.16.1",
|
||||||
"@mantine/tiptap": "^7.15.3",
|
"@mantine/tiptap": "^7.16.1",
|
||||||
"@million/lint": "1.0.14",
|
"@million/lint": "1.0.14",
|
||||||
"@t3-oss/env-nextjs": "^0.11.1",
|
"@t3-oss/env-nextjs": "^0.11.1",
|
||||||
"@tabler/icons-react": "^3.28.1",
|
"@tabler/icons-react": "^3.29.0",
|
||||||
"@tanstack/react-query": "^5.63.0",
|
"@tanstack/react-query": "^5.64.2",
|
||||||
"@tanstack/react-query-devtools": "^5.63.0",
|
"@tanstack/react-query-devtools": "^5.64.2",
|
||||||
"@tanstack/react-query-next-experimental": "5.63.0",
|
"@tanstack/react-query-next-experimental": "5.64.2",
|
||||||
"@trpc/client": "next",
|
"@trpc/client": "next",
|
||||||
"@trpc/next": "next",
|
"@trpc/next": "next",
|
||||||
"@trpc/react-query": "next",
|
"@trpc/react-query": "next",
|
||||||
@@ -61,18 +64,18 @@
|
|||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.13",
|
||||||
"dotenv": "^16.4.7",
|
"dotenv": "^16.4.7",
|
||||||
"flag-icons": "^7.2.3",
|
"flag-icons": "^7.3.2",
|
||||||
"glob": "^11.0.1",
|
"glob": "^11.0.1",
|
||||||
"jotai": "^2.11.0",
|
"jotai": "^2.11.1",
|
||||||
"mantine-react-table": "2.0.0-beta.8",
|
"mantine-react-table": "2.0.0-beta.8",
|
||||||
"next": "15.1.4",
|
"next": "15.1.6",
|
||||||
"postcss-preset-mantine": "^1.17.0",
|
"postcss-preset-mantine": "^1.17.0",
|
||||||
"prismjs": "^1.29.0",
|
"prismjs": "^1.29.0",
|
||||||
"react": "19.0.0",
|
"react": "19.0.0",
|
||||||
"react-dom": "19.0.0",
|
"react-dom": "19.0.0",
|
||||||
"react-error-boundary": "^5.0.0",
|
"react-error-boundary": "^5.0.0",
|
||||||
"react-simple-code-editor": "^0.14.1",
|
"react-simple-code-editor": "^0.14.1",
|
||||||
"sass": "^1.83.1",
|
"sass": "^1.83.4",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"swagger-ui-react": "^5.18.2",
|
"swagger-ui-react": "^5.18.2",
|
||||||
"use-deep-compare-effect": "^1.8.1"
|
"use-deep-compare-effect": "^1.8.1"
|
||||||
@@ -82,13 +85,13 @@
|
|||||||
"@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.0",
|
"@types/chroma-js": "3.1.0",
|
||||||
"@types/node": "^22.10.5",
|
"@types/node": "^22.10.10",
|
||||||
"@types/prismjs": "^1.26.5",
|
"@types/prismjs": "^1.26.5",
|
||||||
"@types/react": "19.0.4",
|
"@types/react": "19.0.8",
|
||||||
"@types/react-dom": "19.0.2",
|
"@types/react-dom": "19.0.3",
|
||||||
"@types/swagger-ui-react": "^4.18.3",
|
"@types/swagger-ui-react": "^4.18.3",
|
||||||
"concurrently": "^9.1.2",
|
"concurrently": "^9.1.2",
|
||||||
"eslint": "^9.17.0",
|
"eslint": "^9.18.0",
|
||||||
"node-loader": "^2.1.0",
|
"node-loader": "^2.1.0",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import type { AppRouter } from "@homarr/api";
|
|||||||
import { clientApi, getTrpcUrl } from "@homarr/api/client";
|
import { clientApi, getTrpcUrl } from "@homarr/api/client";
|
||||||
import { createHeadersCallbackForSource } from "@homarr/api/shared";
|
import { createHeadersCallbackForSource } from "@homarr/api/shared";
|
||||||
|
|
||||||
import { env } from "~/env.mjs";
|
import { env } from "~/env";
|
||||||
|
|
||||||
const getWebSocketProtocol = () => {
|
const getWebSocketProtocol = () => {
|
||||||
// window is not defined on server side
|
// window is not defined on server side
|
||||||
@@ -94,6 +94,7 @@ export function TRPCReactProvider(props: PropsWithChildren) {
|
|||||||
false: unstable_httpBatchStreamLink({
|
false: unstable_httpBatchStreamLink({
|
||||||
transformer: superjson,
|
transformer: superjson,
|
||||||
url: getTrpcUrl(),
|
url: getTrpcUrl(),
|
||||||
|
maxURLLength: 2083, // Suggested by tRPC: https://trpc.io/docs/client/links/httpBatchLink#setting-a-maximum-url-length
|
||||||
headers: createHeadersCallbackForSource("nextjs-react (json)"),
|
headers: createHeadersCallbackForSource("nextjs-react (json)"),
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
import { Card, Center, Stack, Text, Title } from "@mantine/core";
|
import { Card, Center, Stack, Text, Title } from "@mantine/core";
|
||||||
|
|
||||||
import { env } from "@homarr/auth/env.mjs";
|
import { env } from "@homarr/auth/env";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import type { MouseEvent } from "react";
|
import type { MouseEvent } from "react";
|
||||||
import { useCallback, useEffect } from "react";
|
import { useCallback, useEffect } from "react";
|
||||||
|
import Link from "next/link";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import { Group, Menu } from "@mantine/core";
|
import { Group, Menu } from "@mantine/core";
|
||||||
import { useHotkeys } from "@mantine/hooks";
|
import { useHotkeys } from "@mantine/hooks";
|
||||||
@@ -9,9 +10,11 @@ import {
|
|||||||
IconBox,
|
IconBox,
|
||||||
IconBoxAlignTop,
|
IconBoxAlignTop,
|
||||||
IconChevronDown,
|
IconChevronDown,
|
||||||
|
IconLayoutBoard,
|
||||||
IconPencil,
|
IconPencil,
|
||||||
IconPencilOff,
|
IconPencilOff,
|
||||||
IconPlus,
|
IconPlus,
|
||||||
|
IconReplace,
|
||||||
IconResize,
|
IconResize,
|
||||||
IconSettings,
|
IconSettings,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
@@ -28,7 +31,7 @@ import { useCategoryActions } from "~/components/board/sections/category/categor
|
|||||||
import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
|
import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
|
||||||
import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
|
import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
|
||||||
import { HeaderButton } from "~/components/layout/header/button";
|
import { HeaderButton } from "~/components/layout/header/button";
|
||||||
import { env } from "~/env.mjs";
|
import { env } from "~/env";
|
||||||
import { useEditMode, useRequiredBoard } from "./_context";
|
import { useEditMode, useRequiredBoard } from "./_context";
|
||||||
|
|
||||||
export const BoardContentHeaderActions = () => {
|
export const BoardContentHeaderActions = () => {
|
||||||
@@ -49,6 +52,8 @@ export const BoardContentHeaderActions = () => {
|
|||||||
<HeaderButton href={`/boards/${board.name}/settings`}>
|
<HeaderButton href={`/boards/${board.name}/settings`}>
|
||||||
<IconSettings stroke={1.5} />
|
<IconSettings stroke={1.5} />
|
||||||
</HeaderButton>
|
</HeaderButton>
|
||||||
|
|
||||||
|
<SelectBoardsMenu />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -151,6 +156,32 @@ const EditModeMenu = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const SelectBoardsMenu = () => {
|
||||||
|
const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Menu position="bottom-end" withArrow>
|
||||||
|
<Menu.Target>
|
||||||
|
<HeaderButton w="auto" px={4}>
|
||||||
|
<IconReplace stroke={1.5} />
|
||||||
|
</HeaderButton>
|
||||||
|
</Menu.Target>
|
||||||
|
<Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
|
||||||
|
{boards.map((board) => (
|
||||||
|
<Menu.Item
|
||||||
|
key={board.id}
|
||||||
|
component={Link}
|
||||||
|
href={`/boards/${board.name}`}
|
||||||
|
leftSection={<IconLayoutBoard size={20} />}
|
||||||
|
>
|
||||||
|
{board.name}
|
||||||
|
</Menu.Item>
|
||||||
|
))}
|
||||||
|
</Menu.Dropdown>
|
||||||
|
</Menu>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const usePreventLeaveWithDirty = (isDirty: boolean) => {
|
const usePreventLeaveWithDirty = (isDirty: boolean) => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const { openConfirmModal } = useConfirmModal();
|
const { openConfirmModal } = useConfirmModal();
|
||||||
|
|||||||
@@ -101,7 +101,11 @@ export default async function BoardSettingsPage(props: Props) {
|
|||||||
<BoardAccessSettings board={board} initialPermissions={permissions} />
|
<BoardAccessSettings board={board} initialPermissions={permissions} />
|
||||||
</AccordionItemFor>
|
</AccordionItemFor>
|
||||||
<AccordionItemFor value="dangerZone" icon={IconAlertTriangle} danger noPadding>
|
<AccordionItemFor value="dangerZone" icon={IconAlertTriangle} danger noPadding>
|
||||||
<DangerZoneSettingsContent hideVisibility={boardSettings.homeBoardId === board.id} />
|
<DangerZoneSettingsContent
|
||||||
|
hideVisibility={
|
||||||
|
boardSettings.homeBoardId === board.id || boardSettings.mobileHomeBoardId === board.id
|
||||||
|
}
|
||||||
|
/>
|
||||||
</AccordionItemFor>
|
</AccordionItemFor>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import "~/styles/scroll-area.scss";
|
|||||||
import { notFound } from "next/navigation";
|
import { notFound } from "next/navigation";
|
||||||
import { NextIntlClientProvider } from "next-intl";
|
import { NextIntlClientProvider } from "next-intl";
|
||||||
|
|
||||||
import { env } from "@homarr/auth/env.mjs";
|
import { env } from "@homarr/auth/env";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { ModalProvider } from "@homarr/modals";
|
import { ModalProvider } from "@homarr/modals";
|
||||||
import { Notifications } from "@homarr/notifications";
|
import { Notifications } from "@homarr/notifications";
|
||||||
|
|||||||
+14
-1
@@ -3,7 +3,7 @@
|
|||||||
import { useCallback } from "react";
|
import { useCallback } from "react";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { Menu } from "@mantine/core";
|
import { Menu } from "@mantine/core";
|
||||||
import { IconCopy, IconHome, IconSettings, IconTrash } from "@tabler/icons-react";
|
import { IconCopy, IconDeviceMobile, IconHome, IconSettings, IconTrash } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
@@ -43,6 +43,12 @@ export const BoardCardMenuDropdown = ({ board }: BoardCardMenuDropdownProps) =>
|
|||||||
await revalidatePathActionAsync("/");
|
await revalidatePathActionAsync("/");
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
const setMobileHomeBoardMutation = clientApi.board.setMobileHomeBoard.useMutation({
|
||||||
|
onSettled: async () => {
|
||||||
|
// Revalidate all as it's part of the user settings, /boards page and board manage page
|
||||||
|
await revalidatePathActionAsync("/");
|
||||||
|
},
|
||||||
|
});
|
||||||
const deleteBoardMutation = clientApi.board.deleteBoard.useMutation({
|
const deleteBoardMutation = clientApi.board.deleteBoard.useMutation({
|
||||||
onSettled: async () => {
|
onSettled: async () => {
|
||||||
await revalidatePathActionAsync("/manage/boards");
|
await revalidatePathActionAsync("/manage/boards");
|
||||||
@@ -68,6 +74,10 @@ export const BoardCardMenuDropdown = ({ board }: BoardCardMenuDropdownProps) =>
|
|||||||
await setHomeBoardMutation.mutateAsync({ id: board.id });
|
await setHomeBoardMutation.mutateAsync({ id: board.id });
|
||||||
}, [board.id, setHomeBoardMutation]);
|
}, [board.id, setHomeBoardMutation]);
|
||||||
|
|
||||||
|
const handleSetMobileHomeBoard = useCallback(async () => {
|
||||||
|
await setMobileHomeBoardMutation.mutateAsync({ id: board.id });
|
||||||
|
}, [board.id, setMobileHomeBoardMutation]);
|
||||||
|
|
||||||
const handleDuplicateBoard = useCallback(() => {
|
const handleDuplicateBoard = useCallback(() => {
|
||||||
openDuplicateModal({
|
openDuplicateModal({
|
||||||
board: {
|
board: {
|
||||||
@@ -85,6 +95,9 @@ export const BoardCardMenuDropdown = ({ board }: BoardCardMenuDropdownProps) =>
|
|||||||
<Menu.Item onClick={handleSetHomeBoard} leftSection={<IconHome {...iconProps} />}>
|
<Menu.Item onClick={handleSetHomeBoard} leftSection={<IconHome {...iconProps} />}>
|
||||||
{t("setHomeBoard.label")}
|
{t("setHomeBoard.label")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
<Menu.Item onClick={handleSetMobileHomeBoard} leftSection={<IconDeviceMobile {...iconProps} />}>
|
||||||
|
{t("setMobileHomeBoard.label")}
|
||||||
|
</Menu.Item>
|
||||||
{session?.user.permissions.includes("board-create") && (
|
{session?.user.permissions.includes("board-create") && (
|
||||||
<Menu.Item onClick={handleDuplicateBoard} leftSection={<IconCopy {...iconProps} />}>
|
<Menu.Item onClick={handleDuplicateBoard} leftSection={<IconCopy {...iconProps} />}>
|
||||||
{t("duplicate.label")}
|
{t("duplicate.label")}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import {
|
|||||||
Title,
|
Title,
|
||||||
Tooltip,
|
Tooltip,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { IconDotsVertical, IconHomeFilled, IconLock, IconWorld } from "@tabler/icons-react";
|
import { IconDeviceMobile, IconDotsVertical, IconHomeFilled, IconLock, IconWorld } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
@@ -88,6 +88,14 @@ const BoardCard = async ({ board }: BoardCardProps) => {
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{board.isMobileHome && (
|
||||||
|
<Tooltip label={t("action.setMobileHomeBoard.badge.tooltip")}>
|
||||||
|
<Badge tt="none" color="yellow" variant="light" leftSection={<IconDeviceMobile size=".7rem" />}>
|
||||||
|
{t("action.setMobileHomeBoard.badge.label")}
|
||||||
|
</Badge>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
|
||||||
{board.creator && (
|
{board.creator && (
|
||||||
<Group gap="xs">
|
<Group gap="xs">
|
||||||
<UserAvatar user={board.creator} size="sm" />
|
<UserAvatar user={board.creator} size="sm" />
|
||||||
|
|||||||
+3
-1
@@ -1,4 +1,4 @@
|
|||||||
import { IconKey, IconPassword, IconUser } from "@tabler/icons-react";
|
import { IconGrid3x3, IconKey, IconPassword, IconServer, IconUser } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { IntegrationSecretKind } from "@homarr/definitions";
|
import type { IntegrationSecretKind } from "@homarr/definitions";
|
||||||
import type { TablerIcon } from "@homarr/ui";
|
import type { TablerIcon } from "@homarr/ui";
|
||||||
@@ -7,4 +7,6 @@ export const integrationSecretIcons = {
|
|||||||
username: IconUser,
|
username: IconUser,
|
||||||
apiKey: IconKey,
|
apiKey: IconKey,
|
||||||
password: IconPassword,
|
password: IconPassword,
|
||||||
|
realm: IconServer,
|
||||||
|
tokenId: IconGrid3x3,
|
||||||
} satisfies Record<IntegrationSecretKind, TablerIcon>;
|
} satisfies Record<IntegrationSecretKind, TablerIcon>;
|
||||||
@@ -15,7 +15,9 @@ export const IntegrationCreateDropdownContent = () => {
|
|||||||
const [search, setSearch] = useState("");
|
const [search, setSearch] = useState("");
|
||||||
|
|
||||||
const filteredKinds = useMemo(() => {
|
const filteredKinds = useMemo(() => {
|
||||||
return integrationKinds.filter((kind) => kind.includes(search.toLowerCase()));
|
return integrationKinds.filter((kind) =>
|
||||||
|
getIntegrationName(kind).toLowerCase().includes(search.toLowerCase().trim()),
|
||||||
|
);
|
||||||
}, [search]);
|
}, [search]);
|
||||||
|
|
||||||
const handleSearch = React.useCallback(
|
const handleSearch = React.useCallback(
|
||||||
@@ -29,6 +31,7 @@ export const IntegrationCreateDropdownContent = () => {
|
|||||||
leftSection={<IconSearch stroke={1.5} size={20} />}
|
leftSection={<IconSearch stroke={1.5} size={20} />}
|
||||||
placeholder={t("integration.page.list.search")}
|
placeholder={t("integration.page.list.search")}
|
||||||
value={search}
|
value={search}
|
||||||
|
data-autofocus
|
||||||
onChange={handleSearch}
|
onChange={handleSearch}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|||||||
@@ -102,7 +102,15 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
|
|||||||
|
|
||||||
const IntegrationSelectMenu = ({ children }: PropsWithChildren) => {
|
const IntegrationSelectMenu = ({ children }: PropsWithChildren) => {
|
||||||
return (
|
return (
|
||||||
<Menu width={256} trapFocus position="bottom-end" withinPortal shadow="md" keepMounted={false}>
|
<Menu
|
||||||
|
width={256}
|
||||||
|
trapFocus
|
||||||
|
position="bottom-end"
|
||||||
|
withinPortal
|
||||||
|
shadow="md"
|
||||||
|
keepMounted={false}
|
||||||
|
withInitialFocusPlaceholder={false}
|
||||||
|
>
|
||||||
{children}
|
{children}
|
||||||
<MenuDropdown>
|
<MenuDropdown>
|
||||||
<IntegrationCreateDropdownContent />
|
<IntegrationCreateDropdownContent />
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
IconBrandDiscord,
|
IconBrandDiscord,
|
||||||
IconBrandDocker,
|
IconBrandDocker,
|
||||||
IconBrandGithub,
|
IconBrandGithub,
|
||||||
|
IconCertificate,
|
||||||
IconGitFork,
|
IconGitFork,
|
||||||
IconHome,
|
IconHome,
|
||||||
IconInfoSmall,
|
IconInfoSmall,
|
||||||
@@ -119,6 +120,12 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
href: "/manage/tools/logs",
|
href: "/manage/tools/logs",
|
||||||
hidden: !session?.user.permissions.includes("other-view-logs"),
|
hidden: !session?.user.permissions.includes("other-view-logs"),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: t("items.tools.items.certificates"),
|
||||||
|
icon: IconCertificate,
|
||||||
|
href: "/manage/tools/certificates",
|
||||||
|
hidden: !session?.user.permissions.includes("admin"),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: t("items.tools.items.tasks"),
|
label: t("items.tools.items.tasks"),
|
||||||
icon: IconReport,
|
icon: IconReport,
|
||||||
@@ -146,7 +153,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
{
|
{
|
||||||
label: t("items.help.items.submitIssue"),
|
label: t("items.help.items.submitIssue"),
|
||||||
icon: IconBrandGithub,
|
icon: IconBrandGithub,
|
||||||
href: "https://github.com/ajnart/homarr/issues/new/choose",
|
href: "https://github.com/homarr-labs/homarr/issues/new/choose",
|
||||||
external: true,
|
external: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -158,7 +165,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
{
|
{
|
||||||
label: t("items.help.items.sourceCode"),
|
label: t("items.help.items.sourceCode"),
|
||||||
icon: IconGitFork,
|
icon: IconGitFork,
|
||||||
href: "https://github.com/ajnart/homarr",
|
href: "https://github.com/homarr-labs/homarr",
|
||||||
external: true,
|
external: true,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -15,6 +15,11 @@ export const CopyMedia = ({ media }: CopyMediaProps) => {
|
|||||||
|
|
||||||
const url = typeof window !== "undefined" ? `${window.location.origin}/api/user-medias/${media.id}` : "";
|
const url = typeof window !== "undefined" ? `${window.location.origin}/api/user-medias/${media.id}` : "";
|
||||||
|
|
||||||
|
// Clipboard only works on localhost or secure connections (https)
|
||||||
|
if (url.startsWith("http://") && !url.startsWith("http://localhost")) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CopyButton value={url}>
|
<CopyButton value={url}>
|
||||||
{({ copy, copied }) => (
|
{({ copy, copied }) => (
|
||||||
|
|||||||
@@ -1,13 +1,28 @@
|
|||||||
import Image from "next/image";
|
import Image from "next/image";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { notFound } from "next/navigation";
|
import { notFound } from "next/navigation";
|
||||||
import { Anchor, Group, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Title } from "@mantine/core";
|
import {
|
||||||
|
ActionIcon,
|
||||||
|
Anchor,
|
||||||
|
Group,
|
||||||
|
Stack,
|
||||||
|
Table,
|
||||||
|
TableTbody,
|
||||||
|
TableTd,
|
||||||
|
TableTh,
|
||||||
|
TableThead,
|
||||||
|
TableTr,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { IconExternalLink } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { humanFileSize } from "@homarr/common";
|
import { humanFileSize } from "@homarr/common";
|
||||||
import type { inferSearchParamsFromSchema } from "@homarr/common/types";
|
import type { inferSearchParamsFromSchema } from "@homarr/common/types";
|
||||||
|
import { createLocalImageUrl } from "@homarr/icons/local";
|
||||||
import { getI18n } from "@homarr/translation/server";
|
import { getI18n } from "@homarr/translation/server";
|
||||||
import { SearchInput, TablePagination, UserAvatar } from "@homarr/ui";
|
import { SearchInput, TablePagination, UserAvatar } from "@homarr/ui";
|
||||||
import { z } from "@homarr/validation";
|
import { z } from "@homarr/validation";
|
||||||
@@ -91,13 +106,14 @@ interface RowProps {
|
|||||||
|
|
||||||
const Row = async ({ media }: RowProps) => {
|
const Row = async ({ media }: RowProps) => {
|
||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
const t = await getI18n();
|
||||||
const canDelete = media.creatorId === session?.user.id || session?.user.permissions.includes("media-full-all");
|
const canDelete = media.creatorId === session?.user.id || session?.user.permissions.includes("media-full-all");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TableTr>
|
<TableTr>
|
||||||
<TableTd w={64}>
|
<TableTd w={64}>
|
||||||
<Image
|
<Image
|
||||||
src={`/api/user-medias/${media.id}`}
|
src={createLocalImageUrl(media.id)}
|
||||||
alt={media.name}
|
alt={media.name}
|
||||||
width={64}
|
width={64}
|
||||||
height={64}
|
height={64}
|
||||||
@@ -121,6 +137,17 @@ const Row = async ({ media }: RowProps) => {
|
|||||||
<TableTd w={64}>
|
<TableTd w={64}>
|
||||||
<Group wrap="nowrap" gap="xs">
|
<Group wrap="nowrap" gap="xs">
|
||||||
<CopyMedia media={media} />
|
<CopyMedia media={media} />
|
||||||
|
<Tooltip label={t("media.action.open.label")} openDelay={500}>
|
||||||
|
<ActionIcon
|
||||||
|
component="a"
|
||||||
|
href={createLocalImageUrl(media.id)}
|
||||||
|
target="_blank"
|
||||||
|
color="gray"
|
||||||
|
variant="subtle"
|
||||||
|
>
|
||||||
|
<IconExternalLink size={16} stroke={1.5} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
{canDelete && <DeleteMedia media={media} />}
|
{canDelete && <DeleteMedia media={media} />}
|
||||||
</Group>
|
</Group>
|
||||||
</TableTd>
|
</TableTd>
|
||||||
|
|||||||
@@ -37,6 +37,25 @@ export const BoardSettingsForm = ({ defaultValues }: { defaultValues: ServerSett
|
|||||||
)}
|
)}
|
||||||
{...form.getInputProps("homeBoardId")}
|
{...form.getInputProps("homeBoardId")}
|
||||||
/>
|
/>
|
||||||
|
<SelectWithCustomItems
|
||||||
|
label={tBoard("homeBoard.mobileLabel")}
|
||||||
|
description={tBoard("homeBoard.description")}
|
||||||
|
data={selectableBoards.map((board) => ({
|
||||||
|
value: board.id,
|
||||||
|
label: board.name,
|
||||||
|
image: board.logoImageUrl,
|
||||||
|
}))}
|
||||||
|
SelectOption={({ label, image }: { value: string; label: string; image: string | null }) => (
|
||||||
|
<Group>
|
||||||
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||||
|
{image ? <img width={16} height={16} src={image} alt={label} /> : <IconLayoutDashboard size={16} />}
|
||||||
|
<Text fz="sm" fw={500}>
|
||||||
|
{label}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
)}
|
||||||
|
{...form.getInputProps("mobileHomeBoardId")}
|
||||||
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</CommonSettingsForm>
|
</CommonSettingsForm>
|
||||||
|
|||||||
+81
@@ -0,0 +1,81 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Button, FileInput, Group, Stack } from "@mantine/core";
|
||||||
|
import { IconCertificate } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import { clientApi } from "@homarr/api/client";
|
||||||
|
import { revalidatePathActionAsync } from "@homarr/common/client";
|
||||||
|
import { useZodForm } from "@homarr/form";
|
||||||
|
import { createModal, useModalAction } from "@homarr/modals";
|
||||||
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
import { superRefineCertificateFile, z } from "@homarr/validation";
|
||||||
|
|
||||||
|
export const AddCertificateButton = () => {
|
||||||
|
const { openModal } = useModalAction(AddCertificateModal);
|
||||||
|
const t = useI18n();
|
||||||
|
|
||||||
|
const handleClick = () => {
|
||||||
|
openModal({});
|
||||||
|
};
|
||||||
|
|
||||||
|
return <Button onClick={handleClick}>{t("certificate.action.create.label")}</Button>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const AddCertificateModal = createModal(({ actions }) => {
|
||||||
|
const t = useI18n();
|
||||||
|
const form = useZodForm(
|
||||||
|
z.object({
|
||||||
|
file: z.instanceof(File).nullable().superRefine(superRefineCertificateFile),
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
initialValues: {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
|
file: null!,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const { mutateAsync } = clientApi.certificates.addCertificate.useMutation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form
|
||||||
|
onSubmit={form.onSubmit(async (values) => {
|
||||||
|
const formData = new FormData();
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
|
formData.set("file", values.file!);
|
||||||
|
await mutateAsync(formData, {
|
||||||
|
async onSuccess() {
|
||||||
|
showSuccessNotification({
|
||||||
|
title: t("certificate.action.create.notification.success.title"),
|
||||||
|
message: t("certificate.action.create.notification.success.message"),
|
||||||
|
});
|
||||||
|
await revalidatePathActionAsync("/manage/tools/certificates");
|
||||||
|
actions.closeModal();
|
||||||
|
},
|
||||||
|
onError() {
|
||||||
|
showErrorNotification({
|
||||||
|
title: t("certificate.action.create.notification.error.title"),
|
||||||
|
message: t("certificate.action.create.notification.error.message"),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
})}
|
||||||
|
>
|
||||||
|
<Stack>
|
||||||
|
<FileInput leftSection={<IconCertificate size={16} />} {...form.getInputProps("file")} />
|
||||||
|
<Group justify="end">
|
||||||
|
<Button onClick={actions.closeModal} variant="subtle" color="gray">
|
||||||
|
{t("common.action.cancel")}
|
||||||
|
</Button>
|
||||||
|
<Button type="submit" loading={form.submitting}>
|
||||||
|
{t("common.action.add")}
|
||||||
|
</Button>
|
||||||
|
</Group>
|
||||||
|
</Stack>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
}).withOptions({
|
||||||
|
defaultTitle(t) {
|
||||||
|
return t("certificate.action.create.label");
|
||||||
|
},
|
||||||
|
});
|
||||||
+54
@@ -0,0 +1,54 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { ActionIcon } from "@mantine/core";
|
||||||
|
import { IconTrash } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import { clientApi } from "@homarr/api/client";
|
||||||
|
import { revalidatePathActionAsync } from "@homarr/common/client";
|
||||||
|
import { useConfirmModal } from "@homarr/modals";
|
||||||
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
|
interface RemoveCertificateProps {
|
||||||
|
fileName: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const RemoveCertificate = ({ fileName }: RemoveCertificateProps) => {
|
||||||
|
const { openConfirmModal } = useConfirmModal();
|
||||||
|
const { mutateAsync } = clientApi.certificates.removeCertificate.useMutation();
|
||||||
|
const t = useI18n();
|
||||||
|
|
||||||
|
const handleClick = () => {
|
||||||
|
openConfirmModal({
|
||||||
|
title: t("certificate.action.remove.label"),
|
||||||
|
children: t("certificate.action.remove.confirm"),
|
||||||
|
// eslint-disable-next-line no-restricted-syntax
|
||||||
|
async onConfirm() {
|
||||||
|
await mutateAsync(
|
||||||
|
{ fileName },
|
||||||
|
{
|
||||||
|
async onSuccess() {
|
||||||
|
showSuccessNotification({
|
||||||
|
title: t("certificate.action.remove.notification.success.title"),
|
||||||
|
message: t("certificate.action.remove.notification.success.message"),
|
||||||
|
});
|
||||||
|
await revalidatePathActionAsync("/manage/tools/certificates");
|
||||||
|
},
|
||||||
|
onError() {
|
||||||
|
showErrorNotification({
|
||||||
|
title: t("certificate.action.remove.notification.error.title"),
|
||||||
|
message: t("certificate.action.remove.notification.error.message"),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ActionIcon onClick={handleClick} color="red" variant="subtle">
|
||||||
|
<IconTrash color="red" size={16} />
|
||||||
|
</ActionIcon>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { X509Certificate } from "node:crypto";
|
||||||
|
import { notFound } from "next/navigation";
|
||||||
|
import { Card, Group, SimpleGrid, Stack, Text, Title } from "@mantine/core";
|
||||||
|
import { IconCertificate, IconCertificateOff } from "@tabler/icons-react";
|
||||||
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
|
import { auth } from "@homarr/auth/next";
|
||||||
|
import { loadCustomRootCertificatesAsync } from "@homarr/certificates/server";
|
||||||
|
import { getMantineColor } from "@homarr/common";
|
||||||
|
import type { SupportedLanguage } from "@homarr/translation";
|
||||||
|
import { getI18n } from "@homarr/translation/server";
|
||||||
|
|
||||||
|
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
||||||
|
import { NoResults } from "~/components/no-results";
|
||||||
|
import { AddCertificateButton } from "./_components/add-certificate";
|
||||||
|
import { RemoveCertificate } from "./_components/remove-certificate";
|
||||||
|
|
||||||
|
interface CertificatesPageProps {
|
||||||
|
params: Promise<{
|
||||||
|
locale: SupportedLanguage;
|
||||||
|
}>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function CertificatesPage({ params }: CertificatesPageProps) {
|
||||||
|
const session = await auth();
|
||||||
|
if (!session?.user.permissions.includes("admin")) {
|
||||||
|
notFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
const { locale } = await params;
|
||||||
|
const t = await getI18n();
|
||||||
|
const certificates = await loadCustomRootCertificatesAsync();
|
||||||
|
const x509Certificates = certificates
|
||||||
|
.map((cert) => ({
|
||||||
|
...cert,
|
||||||
|
x509: new X509Certificate(cert.content),
|
||||||
|
}))
|
||||||
|
.sort((certA, certB) => certA.x509.validToDate.getTime() - certB.x509.validToDate.getTime());
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<DynamicBreadcrumb />
|
||||||
|
|
||||||
|
<Stack>
|
||||||
|
<Group justify="space-between">
|
||||||
|
<Stack gap={4}>
|
||||||
|
<Title>{t("certificate.page.list.title")}</Title>
|
||||||
|
<Text>{t("certificate.page.list.description")}</Text>
|
||||||
|
</Stack>
|
||||||
|
|
||||||
|
<AddCertificateButton />
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
{x509Certificates.length === 0 && (
|
||||||
|
<NoResults icon={IconCertificateOff} title={t("certificate.page.list.noResults.title")} />
|
||||||
|
)}
|
||||||
|
|
||||||
|
<SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
|
||||||
|
{x509Certificates.map((cert) => (
|
||||||
|
<Card key={cert.x509.fingerprint} withBorder>
|
||||||
|
<Group wrap="nowrap">
|
||||||
|
<IconCertificate
|
||||||
|
color={getMantineColor(iconColor(cert.x509.validToDate), 6)}
|
||||||
|
style={{ minWidth: 32 }}
|
||||||
|
size={32}
|
||||||
|
stroke={1.5}
|
||||||
|
/>
|
||||||
|
<Stack flex={1} gap="xs" maw="calc(100% - 48px)">
|
||||||
|
<Group justify="space-between" wrap="nowrap">
|
||||||
|
<Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
|
||||||
|
{cert.x509.subject}
|
||||||
|
</Text>
|
||||||
|
<Text c="gray.6" ta="end" size="sm">
|
||||||
|
{cert.fileName}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
<Group justify="space-between">
|
||||||
|
<Text size="sm" c="gray.6" title={cert.x509.validToDate.toISOString()}>
|
||||||
|
{t("certificate.page.list.expires", {
|
||||||
|
when: new Intl.RelativeTimeFormat(locale).format(
|
||||||
|
dayjs(cert.x509.validToDate).diff(dayjs(), "days"),
|
||||||
|
"days",
|
||||||
|
),
|
||||||
|
})}
|
||||||
|
</Text>
|
||||||
|
<RemoveCertificate fileName={cert.fileName} />
|
||||||
|
</Group>
|
||||||
|
</Stack>
|
||||||
|
</Group>
|
||||||
|
</Card>
|
||||||
|
))}
|
||||||
|
</SimpleGrid>
|
||||||
|
</Stack>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const iconColor = (validTo: Date) => {
|
||||||
|
const daysUntilInvalid = dayjs(validTo).diff(new Date(), "days");
|
||||||
|
if (daysUntilInvalid < 1) return "red";
|
||||||
|
if (daysUntilInvalid < 7) return "orange";
|
||||||
|
if (daysUntilInvalid < 30) return "yellow";
|
||||||
|
return "green";
|
||||||
|
};
|
||||||
@@ -16,7 +16,7 @@ import { MantineReactTable } from "mantine-react-table";
|
|||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { useTimeAgo } from "@homarr/common";
|
import { useTimeAgo } from "@homarr/common";
|
||||||
import type { DockerContainerState } from "@homarr/definitions";
|
import type { ContainerState } from "@homarr/docker";
|
||||||
import { useModalAction } from "@homarr/modals";
|
import { useModalAction } from "@homarr/modals";
|
||||||
import { AddDockerAppToHomarr } from "@homarr/modals-collection";
|
import { AddDockerAppToHomarr } from "@homarr/modals-collection";
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
@@ -246,9 +246,9 @@ const containerStates = {
|
|||||||
exited: "red",
|
exited: "red",
|
||||||
removing: "pink",
|
removing: "pink",
|
||||||
dead: "dark",
|
dead: "dark",
|
||||||
} satisfies Record<DockerContainerState, MantineColor>;
|
} satisfies Record<ContainerState, MantineColor>;
|
||||||
|
|
||||||
const ContainerStateBadge = ({ state }: { state: DockerContainerState }) => {
|
const ContainerStateBadge = ({ state }: { state: ContainerState }) => {
|
||||||
const t = useScopedI18n("docker.field.state.option");
|
const t = useScopedI18n("docker.field.state.option");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
+18
-5
@@ -18,13 +18,14 @@ interface ChangeHomeBoardFormProps {
|
|||||||
|
|
||||||
export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormProps) => {
|
export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormProps) => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const { mutate, isPending } = clientApi.user.changeHomeBoardId.useMutation({
|
const { mutate, isPending } = clientApi.user.changeHomeBoards.useMutation({
|
||||||
async onSettled() {
|
async onSettled() {
|
||||||
await revalidatePathActionAsync(`/manage/users/${user.id}`);
|
await revalidatePathActionAsync(`/manage/users/${user.id}`);
|
||||||
},
|
},
|
||||||
onSuccess(_, variables) {
|
onSuccess(_, variables) {
|
||||||
form.setInitialValues({
|
form.setInitialValues({
|
||||||
homeBoardId: variables.homeBoardId,
|
homeBoardId: variables.homeBoardId,
|
||||||
|
mobileHomeBoardId: variables.mobileHomeBoardId,
|
||||||
});
|
});
|
||||||
showSuccessNotification({
|
showSuccessNotification({
|
||||||
message: t("user.action.changeHomeBoard.notification.success.message"),
|
message: t("user.action.changeHomeBoard.notification.success.message"),
|
||||||
@@ -36,9 +37,10 @@ export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormPro
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
const form = useZodForm(validation.user.changeHomeBoard, {
|
const form = useZodForm(validation.user.changeHomeBoards, {
|
||||||
initialValues: {
|
initialValues: {
|
||||||
homeBoardId: user.homeBoardId ?? "",
|
homeBoardId: user.homeBoardId,
|
||||||
|
mobileHomeBoardId: user.mobileHomeBoardId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -52,7 +54,18 @@ export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormPro
|
|||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<Select w="100%" data={boardsData} {...form.getInputProps("homeBoardId")} />
|
<Select
|
||||||
|
label={t("management.page.user.setting.general.item.board.type.general")}
|
||||||
|
w="100%"
|
||||||
|
data={boardsData}
|
||||||
|
{...form.getInputProps("homeBoardId")}
|
||||||
|
/>
|
||||||
|
<Select
|
||||||
|
label={t("management.page.user.setting.general.item.board.type.mobile")}
|
||||||
|
w="100%"
|
||||||
|
data={boardsData}
|
||||||
|
{...form.getInputProps("mobileHomeBoardId")}
|
||||||
|
/>
|
||||||
|
|
||||||
<Group justify="end">
|
<Group justify="end">
|
||||||
<Button type="submit" color="teal" loading={isPending}>
|
<Button type="submit" color="teal" loading={isPending}>
|
||||||
@@ -64,4 +77,4 @@ export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormPro
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
type FormType = z.infer<typeof validation.user.changeHomeBoard>;
|
type FormType = z.infer<typeof validation.user.changeHomeBoards>;
|
||||||
+4
-1
@@ -51,7 +51,10 @@ export const PingIconsEnabled = ({ user }: PingIconsEnabledProps) => {
|
|||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<Switch {...form.getInputProps("pingIconsEnabled")} label={t("user.field.pingIconsEnabled.label")} />
|
<Switch
|
||||||
|
{...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
|
||||||
|
label={t("user.field.pingIconsEnabled.label")}
|
||||||
|
/>
|
||||||
|
|
||||||
<Group justify="end">
|
<Group justify="end">
|
||||||
<Button type="submit" color="teal" loading={isPending}>
|
<Button type="submit" color="teal" loading={isPending}>
|
||||||
|
|||||||
@@ -83,13 +83,15 @@ export default async function EditUserPage(props: Props) {
|
|||||||
</Box>
|
</Box>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Stack mb="lg">
|
{session?.user.id === user.id && (
|
||||||
<Title order={2}>{tGeneral("item.language")}</Title>
|
<Stack mb="lg">
|
||||||
<CurrentLanguageCombobox />
|
<Title order={2}>{tGeneral("item.language")}</Title>
|
||||||
</Stack>
|
<CurrentLanguageCombobox />
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
|
||||||
<Stack mb="lg">
|
<Stack mb="lg">
|
||||||
<Title order={2}>{tGeneral("item.board")}</Title>
|
<Title order={2}>{tGeneral("item.board.title")}</Title>
|
||||||
<ChangeHomeBoardForm
|
<ChangeHomeBoardForm
|
||||||
user={user}
|
user={user}
|
||||||
boardsData={boards.map((board) => ({
|
boardsData={boards.map((board) => ({
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { IconExclamationCircle } from "@tabler/icons-react";
|
|||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
import { env } from "@homarr/auth/env.mjs";
|
import { env } from "@homarr/auth/env";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { isProviderEnabled } from "@homarr/auth/server";
|
import { isProviderEnabled } from "@homarr/auth/server";
|
||||||
import { everyoneGroup } from "@homarr/definitions";
|
import { everyoneGroup } from "@homarr/definitions";
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { db } from "@homarr/db";
|
|||||||
import type { WidgetKind } from "@homarr/definitions";
|
import type { WidgetKind } from "@homarr/definitions";
|
||||||
import { widgetImports } from "@homarr/widgets";
|
import { widgetImports } from "@homarr/widgets";
|
||||||
|
|
||||||
import { env } from "~/env.mjs";
|
import { env } from "~/env";
|
||||||
import { WidgetPreviewPageContent } from "./_content";
|
import { WidgetPreviewPageContent } from "./_content";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
|
|||||||
@@ -30,7 +30,9 @@ const handler = auth(async (req) => {
|
|||||||
req,
|
req,
|
||||||
createContext: () => createTRPCContext({ session: req.auth, headers: req.headers }),
|
createContext: () => createTRPCContext({ session: req.auth, headers: req.headers }),
|
||||||
onError({ error, path, type }) {
|
onError({ error, path, type }) {
|
||||||
logger.error(`tRPC Error with ${type} on '${path}': (${error.code}) - ${error.message}`);
|
logger.error(
|
||||||
|
`tRPC Error with ${type} on '${path}': (${error.code}) - ${error.message}\n${error.stack}\n${error.cause}`,
|
||||||
|
);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import type { Modify } from "@homarr/common/types";
|
||||||
|
import { createId } from "@homarr/db/client";
|
||||||
|
import type { WidgetKind } from "@homarr/definitions";
|
||||||
|
|
||||||
|
import type { Board, DynamicSection, EmptySection, Item } from "~/app/[locale]/boards/_types";
|
||||||
|
import { getFirstEmptyPosition } from "./empty-position";
|
||||||
|
|
||||||
|
export interface CreateItemInput {
|
||||||
|
kind: WidgetKind;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const createItemCallback =
|
||||||
|
({ kind }: CreateItemInput) =>
|
||||||
|
(previous: Board): Board => {
|
||||||
|
const firstSection = previous.sections
|
||||||
|
.filter((section): section is EmptySection => section.kind === "empty")
|
||||||
|
.sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
|
||||||
|
.at(0);
|
||||||
|
|
||||||
|
if (!firstSection) return previous;
|
||||||
|
|
||||||
|
const dynamicSectionsOfFirstSection = previous.sections.filter(
|
||||||
|
(section): section is DynamicSection => section.kind === "dynamic" && section.parentSectionId === firstSection.id,
|
||||||
|
);
|
||||||
|
const elements = [...firstSection.items, ...dynamicSectionsOfFirstSection];
|
||||||
|
const emptyPosition = getFirstEmptyPosition(elements, previous.columnCount);
|
||||||
|
|
||||||
|
if (!emptyPosition) {
|
||||||
|
console.error("Your board is full");
|
||||||
|
return previous;
|
||||||
|
}
|
||||||
|
|
||||||
|
const widget = {
|
||||||
|
id: createId(),
|
||||||
|
kind,
|
||||||
|
options: {},
|
||||||
|
width: 1,
|
||||||
|
height: 1,
|
||||||
|
...emptyPosition,
|
||||||
|
integrationIds: [],
|
||||||
|
advancedOptions: {
|
||||||
|
customCssClasses: [],
|
||||||
|
},
|
||||||
|
} satisfies Modify<
|
||||||
|
Item,
|
||||||
|
{
|
||||||
|
kind: WidgetKind;
|
||||||
|
}
|
||||||
|
>;
|
||||||
|
|
||||||
|
return {
|
||||||
|
...previous,
|
||||||
|
sections: previous.sections.map((section) => {
|
||||||
|
// Return same section if item is not in it
|
||||||
|
if (section.id !== firstSection.id) return section;
|
||||||
|
return {
|
||||||
|
...section,
|
||||||
|
items: section.items.concat(widget),
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import { createId } from "@homarr/db/client";
|
||||||
|
|
||||||
|
import type { Board, DynamicSection, EmptySection } from "~/app/[locale]/boards/_types";
|
||||||
|
import { getFirstEmptyPosition } from "./empty-position";
|
||||||
|
|
||||||
|
export interface DuplicateItemInput {
|
||||||
|
itemId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const duplicateItemCallback =
|
||||||
|
({ itemId }: DuplicateItemInput) =>
|
||||||
|
(previous: Board): Board => {
|
||||||
|
const itemToDuplicate = previous.sections
|
||||||
|
.flatMap((section) => section.items.map((item) => ({ ...item, sectionId: section.id })))
|
||||||
|
.find((item) => item.id === itemId);
|
||||||
|
if (!itemToDuplicate) return previous;
|
||||||
|
|
||||||
|
const currentSection = previous.sections.find((section) => section.id === itemToDuplicate.sectionId);
|
||||||
|
if (!currentSection) return previous;
|
||||||
|
|
||||||
|
const dynamicSectionsOfCurrentSection = previous.sections.filter(
|
||||||
|
(section): section is DynamicSection =>
|
||||||
|
section.kind === "dynamic" && section.parentSectionId === currentSection.id,
|
||||||
|
);
|
||||||
|
const elements = [...currentSection.items, ...dynamicSectionsOfCurrentSection];
|
||||||
|
let sectionId = currentSection.id;
|
||||||
|
let emptyPosition = getFirstEmptyPosition(
|
||||||
|
elements,
|
||||||
|
currentSection.kind === "dynamic" ? currentSection.width : previous.columnCount,
|
||||||
|
currentSection.kind === "dynamic" ? currentSection.height : undefined,
|
||||||
|
{
|
||||||
|
width: itemToDuplicate.width,
|
||||||
|
height: itemToDuplicate.height,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!emptyPosition) {
|
||||||
|
const firstSection = previous.sections
|
||||||
|
.filter((section): section is EmptySection => section.kind === "empty")
|
||||||
|
.sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
|
||||||
|
.at(0);
|
||||||
|
|
||||||
|
if (!firstSection) return previous;
|
||||||
|
|
||||||
|
const dynamicSectionsOfFirstSection = previous.sections.filter(
|
||||||
|
(section): section is DynamicSection =>
|
||||||
|
section.kind === "dynamic" && section.parentSectionId === firstSection.id,
|
||||||
|
);
|
||||||
|
const elements = [...firstSection.items, ...dynamicSectionsOfFirstSection];
|
||||||
|
emptyPosition = getFirstEmptyPosition(elements, previous.columnCount, undefined, {
|
||||||
|
width: itemToDuplicate.width,
|
||||||
|
height: itemToDuplicate.height,
|
||||||
|
});
|
||||||
|
if (!emptyPosition) {
|
||||||
|
console.error("Your board is full");
|
||||||
|
return previous;
|
||||||
|
}
|
||||||
|
|
||||||
|
sectionId = firstSection.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
const widget = structuredClone(itemToDuplicate);
|
||||||
|
widget.id = createId();
|
||||||
|
widget.xOffset = emptyPosition.xOffset;
|
||||||
|
widget.yOffset = emptyPosition.yOffset;
|
||||||
|
widget.sectionId = sectionId;
|
||||||
|
|
||||||
|
const result = {
|
||||||
|
...previous,
|
||||||
|
sections: previous.sections.map((section) => {
|
||||||
|
// Return same section if item is not in it
|
||||||
|
if (section.id !== sectionId) return section;
|
||||||
|
return {
|
||||||
|
...section,
|
||||||
|
items: section.items.concat(widget),
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
|
||||||
|
return result;
|
||||||
|
};
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import type { Item } from "~/app/[locale]/boards/_types";
|
||||||
|
|
||||||
|
export const getFirstEmptyPosition = (
|
||||||
|
elements: Pick<Item, "yOffset" | "xOffset" | "width" | "height">[],
|
||||||
|
columnCount: number,
|
||||||
|
rowCount = 9999,
|
||||||
|
size: { width: number; height: number } = { width: 1, height: 1 },
|
||||||
|
) => {
|
||||||
|
for (let yOffset = 0; yOffset < rowCount + 1 - size.height; yOffset++) {
|
||||||
|
for (let xOffset = 0; xOffset < columnCount; xOffset++) {
|
||||||
|
const isOccupied = elements.some(
|
||||||
|
(element) =>
|
||||||
|
element.yOffset < yOffset + size.height &&
|
||||||
|
element.yOffset + element.height > yOffset &&
|
||||||
|
element.xOffset < xOffset + size.width &&
|
||||||
|
element.xOffset + element.width > xOffset,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!isOccupied) {
|
||||||
|
return { xOffset, yOffset };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
};
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import { describe, expect, test, vi } from "vitest";
|
||||||
|
|
||||||
|
import type { Board } from "~/app/[locale]/boards/_types";
|
||||||
|
import { createItemCallback } from "../create-item";
|
||||||
|
import * as emptyPosition from "../empty-position";
|
||||||
|
import { createDynamicSection, createEmptySection, createItem } from "./shared";
|
||||||
|
|
||||||
|
describe("item actions create-item", () => {
|
||||||
|
test("should add it to first section", () => {
|
||||||
|
const spy = vi.spyOn(emptyPosition, "getFirstEmptyPosition");
|
||||||
|
spy.mockReturnValue({ xOffset: 5, yOffset: 5 });
|
||||||
|
const input = {
|
||||||
|
sections: [createEmptySection("1", 2), createEmptySection("2", 0), createEmptySection("3", 1)],
|
||||||
|
columnCount: 4,
|
||||||
|
} satisfies Pick<Board, "sections" | "columnCount">;
|
||||||
|
|
||||||
|
const result = createItemCallback({
|
||||||
|
kind: "clock",
|
||||||
|
})(input as unknown as Board);
|
||||||
|
|
||||||
|
const firstSection = result.sections.find((section) => section.id === "2");
|
||||||
|
const item = firstSection?.items.at(0);
|
||||||
|
expect(item).toEqual(expect.objectContaining({ kind: "clock", xOffset: 5, yOffset: 5 }));
|
||||||
|
expect(spy).toHaveBeenCalledWith([], input.columnCount);
|
||||||
|
});
|
||||||
|
test("should correctly pass dynamic section and items to getFirstEmptyPosition", () => {
|
||||||
|
const spy = vi.spyOn(emptyPosition, "getFirstEmptyPosition");
|
||||||
|
spy.mockReturnValue({ xOffset: 5, yOffset: 5 });
|
||||||
|
const firstSection = createEmptySection("2", 0);
|
||||||
|
const expectedItem = createItem({ id: "12", xOffset: 1, yOffset: 2, width: 3, height: 2 });
|
||||||
|
firstSection.items.push(expectedItem);
|
||||||
|
const dynamicSectionInFirst = createDynamicSection({
|
||||||
|
id: "4",
|
||||||
|
parentSectionId: "2",
|
||||||
|
yOffset: 0,
|
||||||
|
xOffset: 0,
|
||||||
|
width: 2,
|
||||||
|
height: 2,
|
||||||
|
});
|
||||||
|
|
||||||
|
const input = {
|
||||||
|
sections: [
|
||||||
|
createEmptySection("1", 2),
|
||||||
|
firstSection,
|
||||||
|
createEmptySection("3", 1),
|
||||||
|
dynamicSectionInFirst,
|
||||||
|
createDynamicSection({ id: "5", parentSectionId: "3", yOffset: 1 }),
|
||||||
|
],
|
||||||
|
columnCount: 4,
|
||||||
|
} satisfies Pick<Board, "sections" | "columnCount">;
|
||||||
|
|
||||||
|
const result = createItemCallback({
|
||||||
|
kind: "clock",
|
||||||
|
})(input as unknown as Board);
|
||||||
|
|
||||||
|
const firstSectionResult = result.sections.find((section) => section.id === "2");
|
||||||
|
const item = firstSectionResult?.items.find((item) => item.id !== "12");
|
||||||
|
expect(item).toEqual(expect.objectContaining({ kind: "clock", xOffset: 5, yOffset: 5 }));
|
||||||
|
expect(spy).toHaveBeenCalledWith([expectedItem, dynamicSectionInFirst], input.columnCount);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { describe, expect, test, vi } from "vitest";
|
||||||
|
|
||||||
|
import type { Board } from "~/app/[locale]/boards/_types";
|
||||||
|
import { duplicateItemCallback } from "../duplicate-item";
|
||||||
|
import * as emptyPosition from "../empty-position";
|
||||||
|
import { createEmptySection, createItem } from "./shared";
|
||||||
|
|
||||||
|
describe("item actions duplicate-item", () => {
|
||||||
|
test("should copy it in the same section", () => {
|
||||||
|
const spy = vi.spyOn(emptyPosition, "getFirstEmptyPosition");
|
||||||
|
spy.mockReturnValue({ xOffset: 5, yOffset: 5 });
|
||||||
|
const currentSection = createEmptySection("2", 1);
|
||||||
|
const currentItem = createItem({
|
||||||
|
id: "1",
|
||||||
|
xOffset: 1,
|
||||||
|
yOffset: 3,
|
||||||
|
width: 3,
|
||||||
|
height: 2,
|
||||||
|
kind: "minecraftServerStatus",
|
||||||
|
integrationIds: ["1"],
|
||||||
|
options: { address: "localhost" },
|
||||||
|
advancedOptions: { customCssClasses: ["test"] },
|
||||||
|
});
|
||||||
|
const otherItem = createItem({
|
||||||
|
id: "2",
|
||||||
|
});
|
||||||
|
currentSection.items.push(currentItem, otherItem);
|
||||||
|
const input = {
|
||||||
|
columnCount: 10,
|
||||||
|
sections: [createEmptySection("1", 0), currentSection, createEmptySection("3", 2)],
|
||||||
|
} satisfies Pick<Board, "sections" | "columnCount">;
|
||||||
|
|
||||||
|
const result = duplicateItemCallback({ itemId: currentItem.id })(input as unknown as Board);
|
||||||
|
|
||||||
|
const section = result.sections.find((section) => section.id === "2");
|
||||||
|
expect(section?.items.length).toBe(3);
|
||||||
|
const duplicatedItem = section?.items.find((item) => item.id !== currentItem.id && item.id !== otherItem.id);
|
||||||
|
|
||||||
|
expect(duplicatedItem).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: "minecraftServerStatus",
|
||||||
|
xOffset: 5,
|
||||||
|
yOffset: 5,
|
||||||
|
width: 3,
|
||||||
|
height: 2,
|
||||||
|
integrationIds: ["1"],
|
||||||
|
options: { address: "localhost" },
|
||||||
|
advancedOptions: { customCssClasses: ["test"] },
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
import { describe, expect, test } from "vitest";
|
||||||
|
|
||||||
|
import type { Item } from "~/app/[locale]/boards/_types";
|
||||||
|
import { getFirstEmptyPosition } from "../empty-position";
|
||||||
|
|
||||||
|
describe("get first empty position", () => {
|
||||||
|
test.each([
|
||||||
|
[[[" ", " ", " ", " "]], [1, 1], 0, 0],
|
||||||
|
[[["a", " ", " ", " "]], [1, 1], 1, 0],
|
||||||
|
[[[" ", "a", " ", " "]], [1, 1], 0, 0],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "a", " ", " "],
|
||||||
|
["a", "a", " ", " "],
|
||||||
|
],
|
||||||
|
[1, 1],
|
||||||
|
2,
|
||||||
|
0,
|
||||||
|
],
|
||||||
|
[[["a", "a", "a", "a"]], [1, 1], 0, 1],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "a", "a", "a"],
|
||||||
|
["a", "a", "a", "a"],
|
||||||
|
],
|
||||||
|
[1, 1],
|
||||||
|
0,
|
||||||
|
2,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "a", " ", "b", "b"],
|
||||||
|
["a", "a", " ", "b", "b"],
|
||||||
|
],
|
||||||
|
[1, 2],
|
||||||
|
2,
|
||||||
|
0,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "a", " ", " ", "b", "b"],
|
||||||
|
["a", "a", " ", " ", "b", "b"],
|
||||||
|
],
|
||||||
|
[2, 2],
|
||||||
|
2,
|
||||||
|
0,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "a", " ", "d", "b", "b"],
|
||||||
|
["a", "a", "c", "e", "b", "b"],
|
||||||
|
],
|
||||||
|
[1, 1],
|
||||||
|
2,
|
||||||
|
0,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "a", " ", " ", "b", "b"],
|
||||||
|
["a", "a", " ", "e", "b", "b"],
|
||||||
|
],
|
||||||
|
[2, 2],
|
||||||
|
0,
|
||||||
|
2,
|
||||||
|
],
|
||||||
|
])("should return the first empty position", (layout, size, expectedX, expectedY) => {
|
||||||
|
const elements = createElementsFromLayout(layout);
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
|
const result = getFirstEmptyPosition(elements, layout[0]!.length, undefined, { width: size[0]!, height: size[1]! });
|
||||||
|
|
||||||
|
expect(result).toEqual({ xOffset: expectedX, yOffset: expectedY });
|
||||||
|
});
|
||||||
|
|
||||||
|
test.each([
|
||||||
|
[[[" ", " "]], [1, 1], 0, 0, 1],
|
||||||
|
[[["a", " "]], [1, 1], 1, 0, 1],
|
||||||
|
[[["a", "a"]], [1, 1], undefined, undefined, 1],
|
||||||
|
[[["a", "a"]], [1, 1], 0, 1, 2],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "b", " ", " "],
|
||||||
|
["a", "c", " ", "d"],
|
||||||
|
],
|
||||||
|
[2, 2],
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
3,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[
|
||||||
|
["a", "b", " ", " "],
|
||||||
|
["a", "c", " ", "d"],
|
||||||
|
],
|
||||||
|
[2, 2],
|
||||||
|
0,
|
||||||
|
2,
|
||||||
|
4,
|
||||||
|
],
|
||||||
|
[[["a", "b"]], [2, 1], 0, 1, 2],
|
||||||
|
])("should return the first empty position with limited rows", (layout, size, expectedX, expectedY, rowCount) => {
|
||||||
|
const elements = createElementsFromLayout(layout);
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
|
const result = getFirstEmptyPosition(elements, layout[0]!.length, rowCount, { width: size[0]!, height: size[1]! });
|
||||||
|
|
||||||
|
expect(result).toEqual(expectedX !== undefined ? { xOffset: expectedX, yOffset: expectedY } : undefined);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const createElementsFromLayout = (layout: string[][]) => {
|
||||||
|
const elements: (Pick<Item, "xOffset" | "yOffset" | "width" | "height"> & { char: string })[] = [];
|
||||||
|
for (let yOffset = 0; yOffset < layout.length; yOffset++) {
|
||||||
|
const row = layout[yOffset];
|
||||||
|
if (!row) continue;
|
||||||
|
for (let xOffset = 0; xOffset < row.length; xOffset++) {
|
||||||
|
const item = row[xOffset];
|
||||||
|
if (item === " " || !item) continue;
|
||||||
|
|
||||||
|
const existing = elements.find((element) => element.char === item);
|
||||||
|
if (existing) {
|
||||||
|
existing.height = yOffset - existing.yOffset + 1;
|
||||||
|
existing.width = xOffset - existing.xOffset + 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
elements.push({
|
||||||
|
yOffset,
|
||||||
|
xOffset,
|
||||||
|
width: 1,
|
||||||
|
height: 1,
|
||||||
|
char: item,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return elements;
|
||||||
|
};
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import type { DynamicSection, EmptySection, Item } from "~/app/[locale]/boards/_types";
|
||||||
|
|
||||||
|
export const createEmptySection = (id: string, yOffset: number): EmptySection => ({
|
||||||
|
id,
|
||||||
|
kind: "empty",
|
||||||
|
yOffset,
|
||||||
|
xOffset: 0,
|
||||||
|
items: [],
|
||||||
|
});
|
||||||
|
|
||||||
|
export const createDynamicSection = (section: Omit<Partial<DynamicSection>, "kind">): DynamicSection => ({
|
||||||
|
id: section.id ?? "0",
|
||||||
|
kind: "dynamic",
|
||||||
|
parentSectionId: section.parentSectionId ?? "0",
|
||||||
|
height: section.height ?? 1,
|
||||||
|
width: section.width ?? 1,
|
||||||
|
yOffset: section.yOffset ?? 0,
|
||||||
|
xOffset: section.xOffset ?? 0,
|
||||||
|
items: section.items ?? [],
|
||||||
|
});
|
||||||
|
|
||||||
|
export const createItem = (item: Partial<Item>): Item => ({
|
||||||
|
id: item.id ?? "0",
|
||||||
|
width: item.width ?? 1,
|
||||||
|
height: item.height ?? 1,
|
||||||
|
yOffset: item.yOffset ?? 0,
|
||||||
|
xOffset: item.xOffset ?? 0,
|
||||||
|
kind: item.kind ?? "clock",
|
||||||
|
integrationIds: item.integrationIds ?? [],
|
||||||
|
options: item.options ?? {},
|
||||||
|
advancedOptions: item.advancedOptions ?? { customCssClasses: [] },
|
||||||
|
});
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
import { useCallback } from "react";
|
import { useCallback } from "react";
|
||||||
|
|
||||||
import type { Modify } from "@homarr/common/types";
|
|
||||||
import { createId } from "@homarr/db/client";
|
|
||||||
import type { WidgetKind } from "@homarr/definitions";
|
|
||||||
import type { BoardItemAdvancedOptions } from "@homarr/validation";
|
import type { BoardItemAdvancedOptions } from "@homarr/validation";
|
||||||
|
|
||||||
import type { EmptySection, Item } from "~/app/[locale]/boards/_types";
|
import type { Item } from "~/app/[locale]/boards/_types";
|
||||||
import { useUpdateBoard } from "~/app/[locale]/boards/(content)/_client";
|
import { useUpdateBoard } from "~/app/[locale]/boards/(content)/_client";
|
||||||
|
import type { CreateItemInput } from "./actions/create-item";
|
||||||
|
import { createItemCallback } from "./actions/create-item";
|
||||||
|
import type { DuplicateItemInput } from "./actions/duplicate-item";
|
||||||
|
import { duplicateItemCallback } from "./actions/duplicate-item";
|
||||||
|
|
||||||
interface MoveAndResizeItem {
|
interface MoveAndResizeItem {
|
||||||
itemId: string;
|
itemId: string;
|
||||||
@@ -42,87 +43,19 @@ interface UpdateItemIntegrations {
|
|||||||
newIntegrations: string[];
|
newIntegrations: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
interface CreateItem {
|
|
||||||
kind: WidgetKind;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface DuplicateItem {
|
|
||||||
itemId: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const useItemActions = () => {
|
export const useItemActions = () => {
|
||||||
const { updateBoard } = useUpdateBoard();
|
const { updateBoard } = useUpdateBoard();
|
||||||
|
|
||||||
const createItem = useCallback(
|
const createItem = useCallback(
|
||||||
({ kind }: CreateItem) => {
|
(input: CreateItemInput) => {
|
||||||
updateBoard((previous) => {
|
updateBoard(createItemCallback(input));
|
||||||
const lastSection = previous.sections
|
|
||||||
.filter((section): section is EmptySection => section.kind === "empty")
|
|
||||||
.sort((sectionA, sectionB) => sectionB.yOffset - sectionA.yOffset)[0];
|
|
||||||
|
|
||||||
if (!lastSection) return previous;
|
|
||||||
|
|
||||||
const widget = {
|
|
||||||
id: createId(),
|
|
||||||
kind,
|
|
||||||
options: {},
|
|
||||||
width: 1,
|
|
||||||
height: 1,
|
|
||||||
integrationIds: [],
|
|
||||||
advancedOptions: {
|
|
||||||
customCssClasses: [],
|
|
||||||
},
|
|
||||||
} satisfies Modify<
|
|
||||||
Omit<Item, "yOffset" | "xOffset">,
|
|
||||||
{
|
|
||||||
kind: WidgetKind;
|
|
||||||
}
|
|
||||||
>;
|
|
||||||
|
|
||||||
return {
|
|
||||||
...previous,
|
|
||||||
sections: previous.sections.map((section) => {
|
|
||||||
// Return same section if item is not in it
|
|
||||||
if (section.id !== lastSection.id) return section;
|
|
||||||
return {
|
|
||||||
...section,
|
|
||||||
items: section.items.concat(widget as unknown as Item),
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
[updateBoard],
|
[updateBoard],
|
||||||
);
|
);
|
||||||
|
|
||||||
const duplicateItem = useCallback(
|
const duplicateItem = useCallback(
|
||||||
({ itemId }: DuplicateItem) => {
|
({ itemId }: DuplicateItemInput) => {
|
||||||
updateBoard((previous) => {
|
updateBoard(duplicateItemCallback({ itemId }));
|
||||||
const itemToDuplicate = previous.sections
|
|
||||||
.flatMap((section) => section.items)
|
|
||||||
.find((item) => item.id === itemId);
|
|
||||||
|
|
||||||
if (!itemToDuplicate) return previous;
|
|
||||||
|
|
||||||
const newItem = {
|
|
||||||
...itemToDuplicate,
|
|
||||||
id: createId(),
|
|
||||||
yOffset: undefined,
|
|
||||||
xOffset: undefined,
|
|
||||||
} satisfies Modify<Item, { yOffset?: number; xOffset?: number }>;
|
|
||||||
|
|
||||||
return {
|
|
||||||
...previous,
|
|
||||||
sections: previous.sections.map((section) => {
|
|
||||||
// Return same section if item is not in it
|
|
||||||
if (!section.items.some((item) => item.id === itemId)) return section;
|
|
||||||
return {
|
|
||||||
...section,
|
|
||||||
items: section.items.concat(newItem as unknown as Item),
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
[updateBoard],
|
[updateBoard],
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -79,7 +79,12 @@ const InnerContent = ({ item, ...dimensions }: InnerContentProps) => {
|
|||||||
>
|
>
|
||||||
<Throw
|
<Throw
|
||||||
error={new NoIntegrationSelectedError()}
|
error={new NoIntegrationSelectedError()}
|
||||||
when={widgetSupportsIntegrations && item.integrationIds.length === 0}
|
when={
|
||||||
|
widgetSupportsIntegrations &&
|
||||||
|
item.integrationIds.length === 0 &&
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
||||||
|
(!("integrationsRequired" in definition) || definition.integrationsRequired !== false)
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
<BoardItemMenu offset={4} item={newItem} />
|
<BoardItemMenu offset={4} item={newItem} />
|
||||||
<Comp
|
<Comp
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
import type { Board, CategorySection, DynamicSection, EmptySection, Section } from "~/app/[locale]/boards/_types";
|
||||||
|
|
||||||
|
export interface RemoveCategoryInput {
|
||||||
|
id: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const removeCategoryCallback =
|
||||||
|
(input: RemoveCategoryInput) =>
|
||||||
|
(previous: Board): Board => {
|
||||||
|
const currentCategory = previous.sections.find(
|
||||||
|
(section): section is CategorySection => section.kind === "category" && section.id === input.id,
|
||||||
|
);
|
||||||
|
if (!currentCategory) {
|
||||||
|
return previous;
|
||||||
|
}
|
||||||
|
|
||||||
|
const emptySectionsAbove = previous.sections.filter(
|
||||||
|
(section): section is EmptySection => section.kind === "empty" && section.yOffset < currentCategory.yOffset,
|
||||||
|
);
|
||||||
|
const aboveSection = emptySectionsAbove.sort((sectionA, sectionB) => sectionB.yOffset - sectionA.yOffset).at(0);
|
||||||
|
|
||||||
|
const emptySectionsBelow = previous.sections.filter(
|
||||||
|
(section): section is EmptySection => section.kind === "empty" && section.yOffset > currentCategory.yOffset,
|
||||||
|
);
|
||||||
|
const removedSection = emptySectionsBelow.sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset).at(0);
|
||||||
|
|
||||||
|
if (!aboveSection || !removedSection) {
|
||||||
|
return previous;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate the yOffset for the items in the currentCategory and removedWrapper to add them with the same offset to the aboveWrapper
|
||||||
|
const aboveYOffset = Math.max(
|
||||||
|
calculateYHeightWithOffsetForItems(aboveSection),
|
||||||
|
calculateYHeightWithOffsetForDynamicSections(previous.sections, aboveSection.id),
|
||||||
|
);
|
||||||
|
const categoryYOffset = Math.max(
|
||||||
|
calculateYHeightWithOffsetForItems(currentCategory),
|
||||||
|
calculateYHeightWithOffsetForDynamicSections(previous.sections, currentCategory.id),
|
||||||
|
);
|
||||||
|
|
||||||
|
const previousCategoryItems = currentCategory.items.map((item) => ({
|
||||||
|
...item,
|
||||||
|
yOffset: item.yOffset + aboveYOffset,
|
||||||
|
}));
|
||||||
|
const previousBelowWrapperItems = removedSection.items.map((item) => ({
|
||||||
|
...item,
|
||||||
|
yOffset: item.yOffset + aboveYOffset + categoryYOffset,
|
||||||
|
}));
|
||||||
|
|
||||||
|
return {
|
||||||
|
...previous,
|
||||||
|
sections: [
|
||||||
|
...previous.sections.filter((section) => section.yOffset < aboveSection.yOffset && section.kind !== "dynamic"),
|
||||||
|
{
|
||||||
|
...aboveSection,
|
||||||
|
items: [...aboveSection.items, ...previousCategoryItems, ...previousBelowWrapperItems],
|
||||||
|
},
|
||||||
|
...previous.sections
|
||||||
|
.filter(
|
||||||
|
(section): section is CategorySection | EmptySection =>
|
||||||
|
section.yOffset > removedSection.yOffset && section.kind !== "dynamic",
|
||||||
|
)
|
||||||
|
.map((section) => ({
|
||||||
|
...section,
|
||||||
|
position: section.yOffset - 2,
|
||||||
|
})),
|
||||||
|
...previous.sections
|
||||||
|
.filter((section): section is DynamicSection => section.kind === "dynamic")
|
||||||
|
.map((dynamicSection) => {
|
||||||
|
// Move dynamic sections from removed section to above section with required yOffset
|
||||||
|
if (dynamicSection.parentSectionId === removedSection.id) {
|
||||||
|
return {
|
||||||
|
...dynamicSection,
|
||||||
|
yOffset: dynamicSection.yOffset + aboveYOffset + categoryYOffset,
|
||||||
|
parentSectionId: aboveSection.id,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Move dynamic sections from category to above section with required yOffset
|
||||||
|
if (dynamicSection.parentSectionId === currentCategory.id) {
|
||||||
|
return {
|
||||||
|
...dynamicSection,
|
||||||
|
yOffset: dynamicSection.yOffset + aboveYOffset,
|
||||||
|
parentSectionId: aboveSection.id,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return dynamicSection;
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const calculateYHeightWithOffsetForDynamicSections = (sections: Section[], sectionId: string) => {
|
||||||
|
return sections.reduce((acc, section) => {
|
||||||
|
if (section.kind !== "dynamic" || section.parentSectionId !== sectionId) {
|
||||||
|
return acc;
|
||||||
|
}
|
||||||
|
|
||||||
|
const yHeightWithOffset = section.yOffset + section.height;
|
||||||
|
if (yHeightWithOffset > acc) return yHeightWithOffset;
|
||||||
|
return acc;
|
||||||
|
}, 0);
|
||||||
|
};
|
||||||
|
|
||||||
|
const calculateYHeightWithOffsetForItems = (section: Section) =>
|
||||||
|
section.items.reduce((acc, item) => {
|
||||||
|
const yHeightWithOffset = item.yOffset + item.height;
|
||||||
|
if (yHeightWithOffset > acc) return yHeightWithOffset;
|
||||||
|
return acc;
|
||||||
|
}, 0);
|
||||||
+125
@@ -0,0 +1,125 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||||
|
import { describe, expect, test } from "vitest";
|
||||||
|
|
||||||
|
import type { DynamicSection, Item, Section } from "~/app/[locale]/boards/_types";
|
||||||
|
import { removeCategoryCallback } from "../remove-category";
|
||||||
|
|
||||||
|
describe("Remove Category", () => {
|
||||||
|
test.each([
|
||||||
|
[3, [0, 1, 2, 3, 4, 5, 6], [0, 1, 2, 5, 6], [3, 4], 2],
|
||||||
|
[5, [0, 1, 2, 3, 4, 5, 6], [0, 1, 2, 3, 4], [5, 6], 4],
|
||||||
|
[1, [0, 1, 2, 3, 4, 5, 6], [0, 3, 4, 5, 6], [1, 2], 0],
|
||||||
|
[3, [0, 3, 6, 7, 8], [0, 7, 8], [3, 6], 0],
|
||||||
|
])(
|
||||||
|
"should remove category",
|
||||||
|
(removeId, initialYOffsets, expectedYOffsets, expectedRemovals, expectedLocationOfItems) => {
|
||||||
|
const sections = createSections(initialYOffsets);
|
||||||
|
|
||||||
|
const input = removeId.toString();
|
||||||
|
|
||||||
|
const result = removeCategoryCallback({ id: input })({ sections } as never);
|
||||||
|
|
||||||
|
expect(result.sections.map((section) => parseInt(section.id, 10))).toEqual(expectedYOffsets);
|
||||||
|
expectedRemovals.forEach((expectedRemoval) => {
|
||||||
|
expect(result.sections.find((section) => section.id === expectedRemoval.toString())).toBeUndefined();
|
||||||
|
});
|
||||||
|
const aboveSection = result.sections.find((section) => section.id === expectedLocationOfItems.toString());
|
||||||
|
expect(aboveSection?.items.map((item) => parseInt(item.id, 10))).toEqual(
|
||||||
|
expect.arrayContaining(expectedRemovals),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
test("should correctly move items to above empty section", () => {
|
||||||
|
const initialYOffsets = [0, 1, 2, 3, 4, 5, 6];
|
||||||
|
const sections: Section[] = createSections(initialYOffsets);
|
||||||
|
const aboveSection = sections.find((section) => section.yOffset === 2)!;
|
||||||
|
aboveSection.items = [
|
||||||
|
createItem({ id: "above-1" }),
|
||||||
|
createItem({ id: "above-2", yOffset: 3, xOffset: 2, height: 2 }),
|
||||||
|
];
|
||||||
|
const removedCategory = sections.find((section) => section.yOffset === 3)!;
|
||||||
|
removedCategory.items = [
|
||||||
|
createItem({ id: "category-1" }),
|
||||||
|
createItem({ id: "category-2", yOffset: 2, xOffset: 4, width: 4 }),
|
||||||
|
];
|
||||||
|
const removedEmptySection = sections.find((section) => section.yOffset === 4)!;
|
||||||
|
removedEmptySection.items = [
|
||||||
|
createItem({ id: "below-1", xOffset: 5 }),
|
||||||
|
createItem({ id: "below-2", yOffset: 1, xOffset: 1, height: 2 }),
|
||||||
|
];
|
||||||
|
sections.push(
|
||||||
|
createDynamicSection({
|
||||||
|
id: "7",
|
||||||
|
parentSectionId: "3",
|
||||||
|
yOffset: 7,
|
||||||
|
height: 3,
|
||||||
|
items: [createItem({ id: "dynamic-1" })],
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
const input = "3";
|
||||||
|
|
||||||
|
const result = removeCategoryCallback({ id: input })({ sections } as never);
|
||||||
|
|
||||||
|
expect(result.sections.map((section) => parseInt(section.id, 10))).toEqual([0, 1, 2, 5, 6, 7]);
|
||||||
|
const aboveSectionResult = result.sections.find((section) => section.id === "2")!;
|
||||||
|
expect(aboveSectionResult.items).toEqual(
|
||||||
|
expect.arrayContaining([
|
||||||
|
createItem({ id: "above-1" }),
|
||||||
|
createItem({ id: "above-2", yOffset: 3, xOffset: 2, height: 2 }),
|
||||||
|
createItem({ id: "category-1", yOffset: 5 }),
|
||||||
|
createItem({ id: "category-2", yOffset: 7, xOffset: 4, width: 4 }),
|
||||||
|
createItem({ id: "below-1", yOffset: 15, xOffset: 5 }),
|
||||||
|
createItem({ id: "below-2", yOffset: 16, xOffset: 1, height: 2 }),
|
||||||
|
]),
|
||||||
|
);
|
||||||
|
const dynamicSection = result.sections.find((section): section is DynamicSection => section.id === "7")!;
|
||||||
|
expect(dynamicSection.yOffset).toBe(12);
|
||||||
|
expect(dynamicSection.parentSectionId).toBe("2");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const createItem = (item: Partial<{ id: string; width: number; height: number; yOffset: number; xOffset: number }>) => {
|
||||||
|
return {
|
||||||
|
id: item.id ?? "0",
|
||||||
|
kind: "app",
|
||||||
|
options: {},
|
||||||
|
advancedOptions: {
|
||||||
|
customCssClasses: [],
|
||||||
|
},
|
||||||
|
height: item.height ?? 1,
|
||||||
|
width: item.width ?? 1,
|
||||||
|
yOffset: item.yOffset ?? 0,
|
||||||
|
xOffset: item.xOffset ?? 0,
|
||||||
|
integrationIds: [],
|
||||||
|
} satisfies Item;
|
||||||
|
};
|
||||||
|
|
||||||
|
const createDynamicSection = (
|
||||||
|
section: Partial<
|
||||||
|
Pick<DynamicSection, "id" | "height" | "width" | "yOffset" | "xOffset" | "parentSectionId" | "items">
|
||||||
|
>,
|
||||||
|
) => {
|
||||||
|
return {
|
||||||
|
id: section.id ?? "0",
|
||||||
|
kind: "dynamic",
|
||||||
|
height: section.height ?? 1,
|
||||||
|
width: section.width ?? 1,
|
||||||
|
yOffset: section.yOffset ?? 0,
|
||||||
|
xOffset: section.xOffset ?? 0,
|
||||||
|
parentSectionId: section.parentSectionId ?? "0",
|
||||||
|
items: section.items ?? [],
|
||||||
|
} satisfies DynamicSection;
|
||||||
|
};
|
||||||
|
|
||||||
|
const createSections = (initialYOffsets: number[]) => {
|
||||||
|
return initialYOffsets.map((yOffset, index) => ({
|
||||||
|
id: yOffset.toString(),
|
||||||
|
kind: index % 2 === 0 ? "empty" : "category",
|
||||||
|
name: "Category",
|
||||||
|
yOffset,
|
||||||
|
xOffset: 0,
|
||||||
|
items: [createItem({ id: yOffset.toString() })],
|
||||||
|
})) satisfies Section[];
|
||||||
|
};
|
||||||
@@ -2,10 +2,12 @@ import { useCallback } from "react";
|
|||||||
|
|
||||||
import { createId } from "@homarr/db/client";
|
import { createId } from "@homarr/db/client";
|
||||||
|
|
||||||
import type { CategorySection, EmptySection, Section } from "~/app/[locale]/boards/_types";
|
import type { CategorySection, EmptySection } from "~/app/[locale]/boards/_types";
|
||||||
import { useUpdateBoard } from "~/app/[locale]/boards/(content)/_client";
|
import { useUpdateBoard } from "~/app/[locale]/boards/(content)/_client";
|
||||||
import type { MoveCategoryInput } from "./actions/move-category";
|
import type { MoveCategoryInput } from "./actions/move-category";
|
||||||
import { moveCategoryCallback } from "./actions/move-category";
|
import { moveCategoryCallback } from "./actions/move-category";
|
||||||
|
import type { RemoveCategoryInput } from "./actions/remove-category";
|
||||||
|
import { removeCategoryCallback } from "./actions/remove-category";
|
||||||
|
|
||||||
interface AddCategory {
|
interface AddCategory {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -17,10 +19,6 @@ interface RenameCategory {
|
|||||||
name: string;
|
name: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface RemoveCategory {
|
|
||||||
id: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const useCategoryActions = () => {
|
export const useCategoryActions = () => {
|
||||||
const { updateBoard } = useUpdateBoard();
|
const { updateBoard } = useUpdateBoard();
|
||||||
|
|
||||||
@@ -132,57 +130,8 @@ export const useCategoryActions = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const removeCategory = useCallback(
|
const removeCategory = useCallback(
|
||||||
({ id: categoryId }: RemoveCategory) => {
|
(input: RemoveCategoryInput) => {
|
||||||
updateBoard((previous) => {
|
updateBoard(removeCategoryCallback(input));
|
||||||
const currentCategory = previous.sections.find(
|
|
||||||
(section): section is CategorySection => section.kind === "category" && section.id === categoryId,
|
|
||||||
);
|
|
||||||
if (!currentCategory) return previous;
|
|
||||||
|
|
||||||
const aboveWrapper = previous.sections.find(
|
|
||||||
(section): section is EmptySection =>
|
|
||||||
section.kind === "empty" && section.yOffset === currentCategory.yOffset - 1,
|
|
||||||
);
|
|
||||||
|
|
||||||
const removedWrapper = previous.sections.find(
|
|
||||||
(section): section is EmptySection =>
|
|
||||||
section.kind === "empty" && section.yOffset === currentCategory.yOffset + 1,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!aboveWrapper || !removedWrapper) return previous;
|
|
||||||
|
|
||||||
// Calculate the yOffset for the items in the currentCategory and removedWrapper to add them with the same offset to the aboveWrapper
|
|
||||||
const aboveYOffset = calculateYHeightWithOffset(aboveWrapper);
|
|
||||||
const categoryYOffset = calculateYHeightWithOffset(currentCategory);
|
|
||||||
|
|
||||||
const previousCategoryItems = currentCategory.items.map((item) => ({
|
|
||||||
...item,
|
|
||||||
yOffset: item.yOffset + aboveYOffset,
|
|
||||||
}));
|
|
||||||
const previousBelowWrapperItems = removedWrapper.items.map((item) => ({
|
|
||||||
...item,
|
|
||||||
yOffset: item.yOffset + aboveYOffset + categoryYOffset,
|
|
||||||
}));
|
|
||||||
|
|
||||||
return {
|
|
||||||
...previous,
|
|
||||||
sections: [
|
|
||||||
...previous.sections.filter((section) => section.yOffset < currentCategory.yOffset - 1),
|
|
||||||
{
|
|
||||||
...aboveWrapper,
|
|
||||||
items: [...aboveWrapper.items, ...previousCategoryItems, ...previousBelowWrapperItems],
|
|
||||||
},
|
|
||||||
...previous.sections
|
|
||||||
.filter(
|
|
||||||
(section): section is CategorySection | EmptySection => section.yOffset >= currentCategory.yOffset + 2,
|
|
||||||
)
|
|
||||||
.map((section) => ({
|
|
||||||
...section,
|
|
||||||
position: section.yOffset - 2,
|
|
||||||
})),
|
|
||||||
],
|
|
||||||
};
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
[updateBoard],
|
[updateBoard],
|
||||||
);
|
);
|
||||||
@@ -195,10 +144,3 @@ export const useCategoryActions = () => {
|
|||||||
removeCategory,
|
removeCategory,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const calculateYHeightWithOffset = (section: Section) =>
|
|
||||||
section.items.reduce((acc, item) => {
|
|
||||||
const yHeightWithOffset = item.yOffset + item.height;
|
|
||||||
if (yHeightWithOffset > acc) return yHeightWithOffset;
|
|
||||||
return acc;
|
|
||||||
}, 0);
|
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import { createEnv } from "@t3-oss/env-nextjs";
|
import { createEnv } from "@t3-oss/env-nextjs";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { shouldSkipEnvValidation } from "@homarr/common/env-validation";
|
||||||
|
|
||||||
export const env = createEnv({
|
export const env = createEnv({
|
||||||
shared: {
|
shared: {
|
||||||
PORT: z.coerce.number().default(3000),
|
PORT: z.coerce.number().default(3000),
|
||||||
@@ -10,11 +12,7 @@ export const env = createEnv({
|
|||||||
* Specify your server-side environment variables schema here. This way you can ensure the app isn't
|
* Specify your server-side environment variables schema here. This way you can ensure the app isn't
|
||||||
* built with invalid env vars.
|
* built with invalid env vars.
|
||||||
*/
|
*/
|
||||||
server: {
|
server: {},
|
||||||
// Comma separated list of docker hostnames that can be used to connect to query the docker endpoints (localhost:2375,host.docker.internal:2375, ...)
|
|
||||||
DOCKER_HOSTNAMES: z.string().optional(),
|
|
||||||
DOCKER_PORTS: z.number().optional(),
|
|
||||||
},
|
|
||||||
/**
|
/**
|
||||||
* Specify your client-side environment variables schema here.
|
* Specify your client-side environment variables schema here.
|
||||||
* For them to be exposed to the client, prefix them with `NEXT_PUBLIC_`.
|
* For them to be exposed to the client, prefix them with `NEXT_PUBLIC_`.
|
||||||
@@ -28,10 +26,8 @@ export const env = createEnv({
|
|||||||
runtimeEnv: {
|
runtimeEnv: {
|
||||||
PORT: process.env.PORT,
|
PORT: process.env.PORT,
|
||||||
NODE_ENV: process.env.NODE_ENV,
|
NODE_ENV: process.env.NODE_ENV,
|
||||||
DOCKER_HOSTNAMES: process.env.DOCKER_HOSTNAMES,
|
|
||||||
DOCKER_PORTS: process.env.DOCKER_PORTS,
|
|
||||||
// NEXT_PUBLIC_CLIENTVAR: process.env.NEXT_PUBLIC_CLIENTVAR,
|
// NEXT_PUBLIC_CLIENTVAR: process.env.NEXT_PUBLIC_CLIENTVAR,
|
||||||
},
|
},
|
||||||
skipValidation:
|
skipValidation: shouldSkipEnvValidation(),
|
||||||
Boolean(process.env.CI) || Boolean(process.env.SKIP_ENV_VALIDATION) || process.env.npm_lifecycle_event === "lint",
|
emptyStringAsUndefined: true,
|
||||||
});
|
});
|
||||||
@@ -38,15 +38,15 @@
|
|||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.13",
|
||||||
"dotenv": "^16.4.7",
|
"dotenv": "^16.4.7",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
"undici": "7.2.1"
|
"undici": "7.3.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/node": "^22.10.5",
|
"@types/node": "^22.10.10",
|
||||||
"dotenv-cli": "^8.0.0",
|
"dotenv-cli": "^8.0.0",
|
||||||
"eslint": "^9.17.0",
|
"eslint": "^9.18.0",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"tsx": "4.19.2",
|
"tsx": "4.19.2",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
|
|||||||
@@ -1,35 +1,6 @@
|
|||||||
import type { Dispatcher } from "undici";
|
import { setGlobalDispatcher } from "undici";
|
||||||
import { Agent, setGlobalDispatcher } from "undici";
|
|
||||||
|
|
||||||
import { logger } from "@homarr/log";
|
import { LoggingAgent } from "@homarr/common/server";
|
||||||
|
|
||||||
export class LoggingAgent extends Agent {
|
|
||||||
constructor(...props: ConstructorParameters<typeof Agent>) {
|
|
||||||
super(...props);
|
|
||||||
}
|
|
||||||
|
|
||||||
dispatch(options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean {
|
|
||||||
const url = new URL(`${options.origin as string}${options.path}`);
|
|
||||||
|
|
||||||
// The below code should prevent sensitive data from being logged as
|
|
||||||
// some integrations use query parameters for auth
|
|
||||||
url.searchParams.forEach((value, key) => {
|
|
||||||
if (value === "") return; // Skip empty values
|
|
||||||
if (/^-?\d{1,12}$/.test(value)) return; // Skip small numbers
|
|
||||||
if (value === "true" || value === "false") return; // Skip boolean values
|
|
||||||
if (/^[a-zA-Z]{1,12}$/.test(value)) return; // Skip short strings
|
|
||||||
if (/^\d{4}-\d{2}-\d{2}$/.test(value)) return; // Skip dates
|
|
||||||
if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value)) return; // Skip date times
|
|
||||||
|
|
||||||
url.searchParams.set(key, "REDACTED");
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`Dispatching request ${url.toString().replaceAll("=&", "&")} (${Object.keys(options.headers ?? {}).length} headers)`,
|
|
||||||
);
|
|
||||||
return super.dispatch(options, handler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const agent = new LoggingAgent();
|
const agent = new LoggingAgent();
|
||||||
setGlobalDispatcher(agent);
|
setGlobalDispatcher(agent);
|
||||||
@@ -33,8 +33,8 @@
|
|||||||
"@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.5.13",
|
"@types/ws": "^8.5.14",
|
||||||
"eslint": "^9.17.0",
|
"eslint": "^9.18.0",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-10
@@ -24,10 +24,10 @@
|
|||||||
<strong>Demo ✨</strong>
|
<strong>Demo ✨</strong>
|
||||||
</a>
|
</a>
|
||||||
•
|
•
|
||||||
<a href="https://homarr.dev/docs/getting-started/installation/">
|
<a href="https://homarr.dev/docs/category/installation-1/">
|
||||||
<strong>Install 💻</strong>
|
<strong>Install 💻</strong>
|
||||||
</a> •
|
</a> •
|
||||||
<a href="https://translate.homarr.dev/">
|
<a href="https://crowdin.com/project/homarr_labs">
|
||||||
<strong>Translations 🈺</strong>
|
<strong>Translations 🈺</strong>
|
||||||
</a> •
|
</a> •
|
||||||
<a href="https://discord.com/invite/aCsmEV5RgA">
|
<a href="https://discord.com/invite/aCsmEV5RgA">
|
||||||
@@ -35,13 +35,6 @@
|
|||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
> [!WARNING]
|
|
||||||
> This is a beta version of Homarr. You can download the old but stable version at https://github.com/ajnart/homarr/. Running this version is at your own risk.
|
|
||||||
|
|
||||||
Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips. With Homarr, you can access and control everything in one location. Homarr seamlessly integrates with the apps you've added, providing you with valuable information and giving you complete control. Installation is a breeze, and Homarr supports a wide range of deployment methods.
|
|
||||||
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
@@ -100,7 +93,7 @@ Homarr has a [built-in collection of widgets and integrations](https://homarr.de
|
|||||||
Since we are updating Homarr very frequently, we recommend reading our official installation guides:
|
Since we are updating Homarr very frequently, we recommend reading our official installation guides:
|
||||||
|
|
||||||
<h2>
|
<h2>
|
||||||
<a href="https://homarr.dev/docs/getting-started/installation/">
|
<a href="https://homarr.dev/docs/category/installation-1/">
|
||||||
Please click here for official installation instructions
|
Please click here for official installation instructions
|
||||||
</a>
|
</a>
|
||||||
</h2>
|
</h2>
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ describe("Onboarding", () => {
|
|||||||
environment: {
|
environment: {
|
||||||
AUTH_PROVIDERS: "ldap",
|
AUTH_PROVIDERS: "ldap",
|
||||||
AUTH_LDAP_URI: "ldap://host.docker.internal:3890",
|
AUTH_LDAP_URI: "ldap://host.docker.internal:3890",
|
||||||
AUTH_LDAP_BASE: "",
|
AUTH_LDAP_BASE: "not-used",
|
||||||
AUTH_LDAP_BIND_DN: "",
|
AUTH_LDAP_BIND_DN: "not-used",
|
||||||
AUTH_LDAP_BIND_PASSWORD: "",
|
AUTH_LDAP_BIND_PASSWORD: "not-used",
|
||||||
},
|
},
|
||||||
mounts: {
|
mounts: {
|
||||||
"/appdata": localMountPath,
|
"/appdata": localMountPath,
|
||||||
|
|||||||
+16
-12
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "homarr",
|
"name": "homarr",
|
||||||
"version": "1.0.0-beta.12",
|
"version": "1.2.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "cross-env CI=true turbo build",
|
"build": "cross-env CI=true turbo build",
|
||||||
@@ -22,9 +22,10 @@
|
|||||||
"lint:ws": "pnpm dlx sherif@latest",
|
"lint:ws": "pnpm dlx sherif@latest",
|
||||||
"package:new": "turbo gen init",
|
"package:new": "turbo gen init",
|
||||||
"release": "semantic-release",
|
"release": "semantic-release",
|
||||||
"test": "cross-env NODE_ENV=development vitest run --exclude e2e --coverage.enabled ",
|
"start": "concurrently \"pnpm with-env node apps/tasks/tasks.cjs\" \"pnpm with-env node apps/websocket/wssServer.cjs\" \"pnpm -F nextjs start\"",
|
||||||
"test:e2e": "cross-env NODE_ENV=development vitest e2e",
|
"test": "cross-env NODE_ENV=development CI=true vitest run --exclude e2e --coverage.enabled ",
|
||||||
"test:ui": "cross-env NODE_ENV=development vitest --exclude e2e --ui --coverage.enabled",
|
"test:e2e": "cross-env NODE_ENV=development CI=true vitest e2e",
|
||||||
|
"test:ui": "cross-env NODE_ENV=development CI=true vitest --exclude e2e --ui --coverage.enabled",
|
||||||
"typecheck": "turbo typecheck",
|
"typecheck": "turbo typecheck",
|
||||||
"with-env": "dotenv -e .env --"
|
"with-env": "dotenv -e .env --"
|
||||||
},
|
},
|
||||||
@@ -37,27 +38,30 @@
|
|||||||
"@semantic-release/github": "^11.0.1",
|
"@semantic-release/github": "^11.0.1",
|
||||||
"@semantic-release/npm": "^12.0.1",
|
"@semantic-release/npm": "^12.0.1",
|
||||||
"@semantic-release/release-notes-generator": "^14.0.3",
|
"@semantic-release/release-notes-generator": "^14.0.3",
|
||||||
"@turbo/gen": "^2.3.3",
|
"@turbo/gen": "^2.3.4",
|
||||||
"@vitejs/plugin-react": "^4.3.4",
|
"@vitejs/plugin-react": "^4.3.4",
|
||||||
"@vitest/coverage-v8": "^2.1.8",
|
"@vitest/coverage-v8": "^3.0.4",
|
||||||
"@vitest/ui": "^2.1.8",
|
"@vitest/ui": "^3.0.4",
|
||||||
"conventional-changelog-conventionalcommits": "^8.0.0",
|
"conventional-changelog-conventionalcommits": "^8.0.0",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"jsdom": "^26.0.0",
|
"jsdom": "^26.0.0",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"semantic-release": "^24.2.1",
|
"semantic-release": "^24.2.1",
|
||||||
"testcontainers": "^10.16.0",
|
"testcontainers": "^10.17.1",
|
||||||
"turbo": "^2.3.3",
|
"turbo": "^2.3.4",
|
||||||
"typescript": "^5.7.3",
|
"typescript": "^5.7.3",
|
||||||
"vite-tsconfig-paths": "^5.1.4",
|
"vite-tsconfig-paths": "^5.1.4",
|
||||||
"vitest": "^2.1.8"
|
"vitest": "^3.0.4"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@9.15.3",
|
"packageManager": "pnpm@9.15.4",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=22.13.0"
|
"node": ">=22.13.1"
|
||||||
},
|
},
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"allowNonAppliedPatches": true,
|
"allowNonAppliedPatches": true,
|
||||||
|
"overrides": {
|
||||||
|
"proxmox-api>undici": "7.3.0"
|
||||||
|
},
|
||||||
"patchedDependencies": {
|
"patchedDependencies": {
|
||||||
"pretty-print-error": "patches/pretty-print-error.patch"
|
"pretty-print-error": "patches/pretty-print-error.patch"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.17.0",
|
"eslint": "^9.18.0",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,12 +22,14 @@
|
|||||||
"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/cron-job-runner": "workspace:^0.1.0",
|
"@homarr/cron-job-runner": "workspace:^0.1.0",
|
||||||
"@homarr/cron-job-status": "workspace:^0.1.0",
|
"@homarr/cron-job-status": "workspace:^0.1.0",
|
||||||
"@homarr/cron-jobs": "workspace:^0.1.0",
|
"@homarr/cron-jobs": "workspace:^0.1.0",
|
||||||
"@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/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/log": "workspace:^",
|
||||||
@@ -41,9 +43,8 @@
|
|||||||
"@trpc/client": "next",
|
"@trpc/client": "next",
|
||||||
"@trpc/react-query": "next",
|
"@trpc/react-query": "next",
|
||||||
"@trpc/server": "next",
|
"@trpc/server": "next",
|
||||||
"dockerode": "^4.0.3",
|
|
||||||
"lodash.clonedeep": "^4.5.0",
|
"lodash.clonedeep": "^4.5.0",
|
||||||
"next": "15.1.4",
|
"next": "15.1.6",
|
||||||
"react": "19.0.0",
|
"react": "19.0.0",
|
||||||
"react-dom": "19.0.0",
|
"react-dom": "19.0.0",
|
||||||
"superjson": "2.2.2",
|
"superjson": "2.2.2",
|
||||||
@@ -53,8 +54,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",
|
||||||
"@types/dockerode": "^3.3.34",
|
"eslint": "^9.18.0",
|
||||||
"eslint": "^9.17.0",
|
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { createTRPCClient, createTRPCReact, httpLink } from "@trpc/react-query";
|
import { createTRPCClient, httpLink } from "@trpc/client";
|
||||||
|
import { createTRPCReact } from "@trpc/react-query";
|
||||||
import SuperJSON from "superjson";
|
import SuperJSON from "superjson";
|
||||||
|
|
||||||
import type { AppRouter } from ".";
|
import type { AppRouter } from ".";
|
||||||
|
|||||||
@@ -98,56 +98,59 @@ export const createManyIntegrationMiddleware = <TKind extends IntegrationKind>(
|
|||||||
action: IntegrationAction,
|
action: IntegrationAction,
|
||||||
...kinds: AtLeastOneOf<TKind> // Ensure at least one kind is provided
|
...kinds: AtLeastOneOf<TKind> // Ensure at least one kind is provided
|
||||||
) => {
|
) => {
|
||||||
return publicProcedure
|
return publicProcedure.input(z.object({ integrationIds: z.array(z.string()) })).use(async ({ ctx, input, next }) => {
|
||||||
.input(z.object({ integrationIds: z.array(z.string()).min(1) }))
|
const dbIntegrations =
|
||||||
.use(async ({ ctx, input, next }) => {
|
input.integrationIds.length >= 1
|
||||||
const dbIntegrations = await ctx.db.query.integrations.findMany({
|
? await ctx.db.query.integrations.findMany({
|
||||||
where: and(inArray(integrations.id, input.integrationIds), inArray(integrations.kind, kinds)),
|
where: and(inArray(integrations.id, input.integrationIds), inArray(integrations.kind, kinds)),
|
||||||
with: {
|
|
||||||
secrets: true,
|
|
||||||
items: {
|
|
||||||
with: {
|
with: {
|
||||||
item: {
|
secrets: true,
|
||||||
|
items: {
|
||||||
with: {
|
with: {
|
||||||
section: {
|
item: {
|
||||||
columns: {
|
with: {
|
||||||
boardId: true,
|
section: {
|
||||||
|
columns: {
|
||||||
|
boardId: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
userPermissions: true,
|
||||||
|
groupPermissions: true,
|
||||||
},
|
},
|
||||||
},
|
})
|
||||||
userPermissions: true,
|
: [];
|
||||||
groupPermissions: true,
|
|
||||||
},
|
const offset = input.integrationIds.length - dbIntegrations.length;
|
||||||
|
if (offset !== 0) {
|
||||||
|
throw new TRPCError({
|
||||||
|
code: "NOT_FOUND",
|
||||||
|
message: `${offset} of the specified integrations not found or not of kinds ${kinds.join(",")}: ([${input.integrationIds.join(",")}] compared to [${dbIntegrations.map(({ id, kind }) => `${kind}:${id}`).join(",")}])`,
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const offset = input.integrationIds.length - dbIntegrations.length;
|
if (dbIntegrations.length >= 1) {
|
||||||
if (offset !== 0) {
|
|
||||||
throw new TRPCError({
|
|
||||||
code: "NOT_FOUND",
|
|
||||||
message: `${offset} of the specified integrations not found or not of kinds ${kinds.join(",")}: ([${input.integrationIds.join(",")}] compared to [${dbIntegrations.map(({ id, kind }) => `${kind}:${id}`).join(",")}])`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
await throwIfActionIsNotAllowedAsync(action, ctx.db, dbIntegrations, ctx.session);
|
await throwIfActionIsNotAllowedAsync(action, ctx.db, dbIntegrations, ctx.session);
|
||||||
|
}
|
||||||
|
|
||||||
return next({
|
return next({
|
||||||
ctx: {
|
ctx: {
|
||||||
integrations: dbIntegrations.map(
|
integrations: dbIntegrations.map(
|
||||||
({ secrets, kind, items: _ignore1, groupPermissions: _ignore2, userPermissions: _ignore3, ...rest }) => ({
|
({ secrets, kind, items: _ignore1, groupPermissions: _ignore2, userPermissions: _ignore3, ...rest }) => ({
|
||||||
...rest,
|
...rest,
|
||||||
kind: kind as TKind,
|
kind: kind as TKind,
|
||||||
decryptedSecrets: secrets.map((secret) => ({
|
decryptedSecrets: secrets.map((secret) => ({
|
||||||
...secret,
|
...secret,
|
||||||
value: decryptSecret(secret.value),
|
value: decryptSecret(secret.value),
|
||||||
})),
|
})),
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { apiKeysRouter } from "./router/apiKeys";
|
import { apiKeysRouter } from "./router/apiKeys";
|
||||||
import { appRouter as innerAppRouter } from "./router/app";
|
import { appRouter as innerAppRouter } from "./router/app";
|
||||||
import { boardRouter } from "./router/board";
|
import { boardRouter } from "./router/board";
|
||||||
|
import { certificateRouter } from "./router/certificates/certificate-router";
|
||||||
import { cronJobsRouter } from "./router/cron-jobs";
|
import { cronJobsRouter } from "./router/cron-jobs";
|
||||||
import { dockerRouter } from "./router/docker/docker-router";
|
import { dockerRouter } from "./router/docker/docker-router";
|
||||||
import { groupRouter } from "./router/group";
|
import { groupRouter } from "./router/group";
|
||||||
@@ -41,6 +42,7 @@ export const appRouter = createTRPCRouter({
|
|||||||
apiKeys: apiKeysRouter,
|
apiKeys: apiKeysRouter,
|
||||||
media: mediaRouter,
|
media: mediaRouter,
|
||||||
updateChecker: updateCheckerRouter,
|
updateChecker: updateCheckerRouter,
|
||||||
|
certificates: certificateRouter,
|
||||||
});
|
});
|
||||||
|
|
||||||
// export type definition of API
|
// export type definition of API
|
||||||
|
|||||||
+502
-206
@@ -2,8 +2,9 @@ import { TRPCError } from "@trpc/server";
|
|||||||
import superjson from "superjson";
|
import superjson from "superjson";
|
||||||
|
|
||||||
import { constructBoardPermissions } from "@homarr/auth/shared";
|
import { constructBoardPermissions } from "@homarr/auth/shared";
|
||||||
import type { Database, InferInsertModel, SQL } from "@homarr/db";
|
import type { DeviceType } from "@homarr/common/server";
|
||||||
import { and, createId, eq, inArray, like, or } from "@homarr/db";
|
import type { Database, InferInsertModel, InferSelectModel, SQL } from "@homarr/db";
|
||||||
|
import { and, createId, eq, handleTransactionsAsync, inArray, like, or } from "@homarr/db";
|
||||||
import { getServerSettingByKeyAsync } from "@homarr/db/queries";
|
import { getServerSettingByKeyAsync } from "@homarr/db/queries";
|
||||||
import {
|
import {
|
||||||
boardGroupPermissions,
|
boardGroupPermissions,
|
||||||
@@ -121,6 +122,7 @@ export const boardRouter = createTRPCRouter({
|
|||||||
return dbBoards.map((board) => ({
|
return dbBoards.map((board) => ({
|
||||||
...board,
|
...board,
|
||||||
isHome: currentUserWhenPresent?.homeBoardId === board.id,
|
isHome: currentUserWhenPresent?.homeBoardId === board.id,
|
||||||
|
isMobileHome: currentUserWhenPresent?.mobileHomeBoardId === board.id,
|
||||||
}));
|
}));
|
||||||
}),
|
}),
|
||||||
search: publicProcedure
|
search: publicProcedure
|
||||||
@@ -194,6 +196,7 @@ export const boardRouter = createTRPCRouter({
|
|||||||
logoImageUrl: board.logoImageUrl,
|
logoImageUrl: board.logoImageUrl,
|
||||||
permissions: constructBoardPermissions(board, ctx.session),
|
permissions: constructBoardPermissions(board, ctx.session),
|
||||||
isHome: currentUserWhenPresent?.homeBoardId === board.id,
|
isHome: currentUserWhenPresent?.homeBoardId === board.id,
|
||||||
|
isMobileHome: currentUserWhenPresent?.mobileHomeBoardId === board.id,
|
||||||
}));
|
}));
|
||||||
}),
|
}),
|
||||||
createBoard: permissionRequiredProcedure
|
createBoard: permissionRequiredProcedure
|
||||||
@@ -201,21 +204,49 @@ export const boardRouter = createTRPCRouter({
|
|||||||
.input(validation.board.create)
|
.input(validation.board.create)
|
||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
const boardId = createId();
|
const boardId = createId();
|
||||||
await ctx.db.transaction(async (transaction) => {
|
await handleTransactionsAsync(ctx.db, {
|
||||||
await transaction.insert(boards).values({
|
async handleAsync(db, schema) {
|
||||||
id: boardId,
|
await db.transaction(async (transaction) => {
|
||||||
name: input.name,
|
await transaction.insert(schema.boards).values({
|
||||||
isPublic: input.isPublic,
|
id: boardId,
|
||||||
columnCount: input.columnCount,
|
name: input.name,
|
||||||
creatorId: ctx.session.user.id,
|
isPublic: input.isPublic,
|
||||||
});
|
columnCount: input.columnCount,
|
||||||
await transaction.insert(sections).values({
|
creatorId: ctx.session.user.id,
|
||||||
id: createId(),
|
});
|
||||||
kind: "empty",
|
await transaction.insert(schema.sections).values({
|
||||||
xOffset: 0,
|
id: createId(),
|
||||||
yOffset: 0,
|
kind: "empty",
|
||||||
boardId,
|
xOffset: 0,
|
||||||
});
|
yOffset: 0,
|
||||||
|
boardId,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleSync(db) {
|
||||||
|
db.transaction((transaction) => {
|
||||||
|
transaction
|
||||||
|
.insert(boards)
|
||||||
|
.values({
|
||||||
|
id: boardId,
|
||||||
|
name: input.name,
|
||||||
|
isPublic: input.isPublic,
|
||||||
|
columnCount: input.columnCount,
|
||||||
|
creatorId: ctx.session.user.id,
|
||||||
|
})
|
||||||
|
.run();
|
||||||
|
transaction
|
||||||
|
.insert(sections)
|
||||||
|
.values({
|
||||||
|
id: createId(),
|
||||||
|
kind: "empty",
|
||||||
|
xOffset: 0,
|
||||||
|
yOffset: 0,
|
||||||
|
boardId,
|
||||||
|
})
|
||||||
|
.run();
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
duplicateBoard: permissionRequiredProcedure
|
duplicateBoard: permissionRequiredProcedure
|
||||||
@@ -299,28 +330,54 @@ export const boardRouter = createTRPCRouter({
|
|||||||
})),
|
})),
|
||||||
);
|
);
|
||||||
|
|
||||||
ctx.db.transaction((transaction) => {
|
await handleTransactionsAsync(ctx.db, {
|
||||||
transaction
|
async handleAsync(db, schema) {
|
||||||
.insert(boards)
|
await db.transaction(async (transaction) => {
|
||||||
.values({
|
transaction.insert(schema.boards).values({
|
||||||
...boardProps,
|
...boardProps,
|
||||||
id: newBoardId,
|
id: newBoardId,
|
||||||
name: input.name,
|
name: input.name,
|
||||||
creatorId: ctx.session.user.id,
|
creatorId: ctx.session.user.id,
|
||||||
})
|
});
|
||||||
.run();
|
|
||||||
|
|
||||||
if (sectionsToInsert.length > 0) {
|
if (sectionsToInsert.length > 0) {
|
||||||
transaction.insert(sections).values(sectionsToInsert).run();
|
await transaction.insert(schema.sections).values(sectionsToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (itemsToInsert.length > 0) {
|
if (itemsToInsert.length > 0) {
|
||||||
transaction.insert(items).values(itemsToInsert).run();
|
await transaction.insert(schema.items).values(itemsToInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (itemIntegrationsToInsert.length > 0) {
|
if (itemIntegrationsToInsert.length > 0) {
|
||||||
transaction.insert(integrationItems).values(itemIntegrationsToInsert).run();
|
await transaction.insert(schema.integrationItems).values(itemIntegrationsToInsert);
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleSync(db) {
|
||||||
|
db.transaction((transaction) => {
|
||||||
|
transaction
|
||||||
|
.insert(boards)
|
||||||
|
.values({
|
||||||
|
...boardProps,
|
||||||
|
id: newBoardId,
|
||||||
|
name: input.name,
|
||||||
|
creatorId: ctx.session.user.id,
|
||||||
|
})
|
||||||
|
.run();
|
||||||
|
|
||||||
|
if (sectionsToInsert.length > 0) {
|
||||||
|
transaction.insert(sections).values(sectionsToInsert).run();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemsToInsert.length > 0) {
|
||||||
|
transaction.insert(items).values(itemsToInsert).run();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemIntegrationsToInsert.length > 0) {
|
||||||
|
transaction.insert(integrationItems).values(itemIntegrationsToInsert).run();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
renameBoard: protectedProcedure.input(validation.board.rename).mutation(async ({ ctx, input }) => {
|
renameBoard: protectedProcedure.input(validation.board.rename).mutation(async ({ ctx, input }) => {
|
||||||
@@ -336,7 +393,10 @@ export const boardRouter = createTRPCRouter({
|
|||||||
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.id), "full");
|
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.id), "full");
|
||||||
const boardSettings = await getServerSettingByKeyAsync(ctx.db, "board");
|
const boardSettings = await getServerSettingByKeyAsync(ctx.db, "board");
|
||||||
|
|
||||||
if (input.visibility !== "public" && boardSettings.homeBoardId === input.id) {
|
if (
|
||||||
|
input.visibility !== "public" &&
|
||||||
|
(boardSettings.homeBoardId === input.id || boardSettings.mobileHomeBoardId === input.id)
|
||||||
|
) {
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "BAD_REQUEST",
|
code: "BAD_REQUEST",
|
||||||
message: "Cannot make home board private",
|
message: "Cannot make home board private",
|
||||||
@@ -358,30 +418,30 @@ export const boardRouter = createTRPCRouter({
|
|||||||
|
|
||||||
await ctx.db.update(users).set({ homeBoardId: input.id }).where(eq(users.id, ctx.session.user.id));
|
await ctx.db.update(users).set({ homeBoardId: input.id }).where(eq(users.id, ctx.session.user.id));
|
||||||
}),
|
}),
|
||||||
|
setMobileHomeBoard: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ ctx, input }) => {
|
||||||
|
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.id), "view");
|
||||||
|
|
||||||
|
await ctx.db.update(users).set({ mobileHomeBoardId: input.id }).where(eq(users.id, ctx.session.user.id));
|
||||||
|
}),
|
||||||
getHomeBoard: publicProcedure.query(async ({ ctx }) => {
|
getHomeBoard: publicProcedure.query(async ({ ctx }) => {
|
||||||
const userId = ctx.session?.user.id;
|
const userId = ctx.session?.user.id;
|
||||||
const user = userId
|
const user = userId
|
||||||
? await ctx.db.query.users.findFirst({
|
? ((await ctx.db.query.users.findFirst({
|
||||||
where: eq(users.id, userId),
|
where: eq(users.id, userId),
|
||||||
})
|
})) ?? null)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
// 1. user home board, 2. home board, 3. not found
|
const homeBoardId = await getHomeIdBoardAsync(ctx.db, user, ctx.deviceType);
|
||||||
let boardWhere: SQL<unknown> | null = null;
|
|
||||||
if (user?.homeBoardId) {
|
|
||||||
boardWhere = eq(boards.id, user.homeBoardId);
|
|
||||||
} else {
|
|
||||||
const boardSettings = await getServerSettingByKeyAsync(ctx.db, "board");
|
|
||||||
boardWhere = boardSettings.homeBoardId ? eq(boards.id, boardSettings.homeBoardId) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!boardWhere) {
|
if (!homeBoardId) {
|
||||||
throw new TRPCError({
|
throw new TRPCError({
|
||||||
code: "NOT_FOUND",
|
code: "NOT_FOUND",
|
||||||
message: "No home board found",
|
message: "No home board found",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const boardWhere = eq(boards.id, homeBoardId);
|
||||||
|
|
||||||
await throwIfActionForbiddenAsync(ctx, boardWhere, "view");
|
await throwIfActionForbiddenAsync(ctx, boardWhere, "view");
|
||||||
|
|
||||||
return await getFullBoardWithWhereAsync(ctx.db, boardWhere, ctx.session?.user.id ?? null);
|
return await getFullBoardWithWhereAsync(ctx.db, boardWhere, ctx.session?.user.id ?? null);
|
||||||
@@ -428,148 +488,313 @@ export const boardRouter = createTRPCRouter({
|
|||||||
saveBoard: protectedProcedure.input(validation.board.save).mutation(async ({ input, ctx }) => {
|
saveBoard: protectedProcedure.input(validation.board.save).mutation(async ({ input, ctx }) => {
|
||||||
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.id), "modify");
|
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.id), "modify");
|
||||||
|
|
||||||
await ctx.db.transaction(async (transaction) => {
|
const dbBoard = await getFullBoardWithWhereAsync(ctx.db, eq(boards.id, input.id), ctx.session.user.id);
|
||||||
const dbBoard = await getFullBoardWithWhereAsync(transaction, eq(boards.id, input.id), ctx.session.user.id);
|
|
||||||
|
|
||||||
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
|
await handleTransactionsAsync(ctx.db, {
|
||||||
|
async handleAsync(db, schema) {
|
||||||
|
await db.transaction(async (transaction) => {
|
||||||
|
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
|
||||||
|
|
||||||
if (addedSections.length > 0) {
|
if (addedSections.length > 0) {
|
||||||
await transaction.insert(sections).values(
|
await transaction.insert(schema.sections).values(
|
||||||
addedSections.map((section) => ({
|
addedSections.map((section) => ({
|
||||||
id: section.id,
|
id: section.id,
|
||||||
kind: section.kind,
|
kind: section.kind,
|
||||||
yOffset: section.yOffset,
|
yOffset: section.yOffset,
|
||||||
xOffset: section.kind === "dynamic" ? section.xOffset : 0,
|
xOffset: section.kind === "dynamic" ? section.xOffset : 0,
|
||||||
height: "height" in section ? section.height : null,
|
height: "height" in section ? section.height : null,
|
||||||
width: "width" in section ? section.width : null,
|
width: "width" in section ? section.width : null,
|
||||||
parentSectionId: "parentSectionId" in section ? section.parentSectionId : null,
|
parentSectionId: "parentSectionId" in section ? section.parentSectionId : null,
|
||||||
name: "name" in section ? section.name : null,
|
name: "name" in section ? section.name : null,
|
||||||
boardId: dbBoard.id,
|
boardId: dbBoard.id,
|
||||||
})),
|
})),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const inputItems = input.sections.flatMap((section) =>
|
const inputItems = input.sections.flatMap((section) =>
|
||||||
section.items.map((item) => ({ ...item, sectionId: section.id })),
|
section.items.map((item) => ({ ...item, sectionId: section.id })),
|
||||||
);
|
);
|
||||||
const dbItems = dbBoard.sections.flatMap((section) =>
|
const dbItems = dbBoard.sections.flatMap((section) =>
|
||||||
section.items.map((item) => ({ ...item, sectionId: section.id })),
|
section.items.map((item) => ({ ...item, sectionId: section.id })),
|
||||||
);
|
|
||||||
|
|
||||||
const addedItems = filterAddedItems(inputItems, dbItems);
|
|
||||||
|
|
||||||
if (addedItems.length > 0) {
|
|
||||||
await transaction.insert(items).values(
|
|
||||||
addedItems.map((item) => ({
|
|
||||||
id: item.id,
|
|
||||||
kind: item.kind,
|
|
||||||
height: item.height,
|
|
||||||
width: item.width,
|
|
||||||
xOffset: item.xOffset,
|
|
||||||
yOffset: item.yOffset,
|
|
||||||
options: superjson.stringify(item.options),
|
|
||||||
advancedOptions: superjson.stringify(item.advancedOptions),
|
|
||||||
sectionId: item.sectionId,
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const inputIntegrationRelations = inputItems.flatMap(({ integrationIds, id: itemId }) =>
|
|
||||||
integrationIds.map((integrationId) => ({
|
|
||||||
integrationId,
|
|
||||||
itemId,
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
const dbIntegrationRelations = dbItems.flatMap(({ integrationIds, id: itemId }) =>
|
|
||||||
integrationIds.map((integrationId) => ({
|
|
||||||
integrationId,
|
|
||||||
itemId,
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
const addedIntegrationRelations = inputIntegrationRelations.filter(
|
|
||||||
(inputRelation) =>
|
|
||||||
!dbIntegrationRelations.some(
|
|
||||||
(dbRelation) =>
|
|
||||||
dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (addedIntegrationRelations.length > 0) {
|
|
||||||
await transaction.insert(integrationItems).values(
|
|
||||||
addedIntegrationRelations.map((relation) => ({
|
|
||||||
itemId: relation.itemId,
|
|
||||||
integrationId: relation.integrationId,
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const updatedItems = filterUpdatedItems(inputItems, dbItems);
|
|
||||||
|
|
||||||
for (const item of updatedItems) {
|
|
||||||
await transaction
|
|
||||||
.update(items)
|
|
||||||
.set({
|
|
||||||
kind: item.kind,
|
|
||||||
height: item.height,
|
|
||||||
width: item.width,
|
|
||||||
xOffset: item.xOffset,
|
|
||||||
yOffset: item.yOffset,
|
|
||||||
options: superjson.stringify(item.options),
|
|
||||||
advancedOptions: superjson.stringify(item.advancedOptions),
|
|
||||||
sectionId: item.sectionId,
|
|
||||||
})
|
|
||||||
.where(eq(items.id, item.id));
|
|
||||||
}
|
|
||||||
|
|
||||||
const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
|
|
||||||
|
|
||||||
for (const section of updatedSections) {
|
|
||||||
const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
|
|
||||||
await transaction
|
|
||||||
.update(sections)
|
|
||||||
.set({
|
|
||||||
yOffset: section.yOffset,
|
|
||||||
xOffset: section.xOffset,
|
|
||||||
height: prev?.kind === "dynamic" && "height" in section ? section.height : null,
|
|
||||||
width: prev?.kind === "dynamic" && "width" in section ? section.width : null,
|
|
||||||
parentSectionId: prev?.kind === "dynamic" && "parentSectionId" in section ? section.parentSectionId : null,
|
|
||||||
name: prev?.kind === "category" && "name" in section ? section.name : null,
|
|
||||||
})
|
|
||||||
.where(eq(sections.id, section.id));
|
|
||||||
}
|
|
||||||
|
|
||||||
const removedIntegrationRelations = dbIntegrationRelations.filter(
|
|
||||||
(dbRelation) =>
|
|
||||||
!inputIntegrationRelations.some(
|
|
||||||
(inputRelation) =>
|
|
||||||
dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
for (const relation of removedIntegrationRelations) {
|
|
||||||
await transaction
|
|
||||||
.delete(integrationItems)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(integrationItems.itemId, relation.itemId),
|
|
||||||
eq(integrationItems.integrationId, relation.integrationId),
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
const removedItems = filterRemovedItems(inputItems, dbItems);
|
const addedItems = filterAddedItems(inputItems, dbItems);
|
||||||
|
|
||||||
const itemIds = removedItems.map((item) => item.id);
|
if (addedItems.length > 0) {
|
||||||
if (itemIds.length > 0) {
|
await transaction.insert(schema.items).values(
|
||||||
await transaction.delete(items).where(inArray(items.id, itemIds));
|
addedItems.map((item) => ({
|
||||||
}
|
id: item.id,
|
||||||
|
kind: item.kind,
|
||||||
|
height: item.height,
|
||||||
|
width: item.width,
|
||||||
|
xOffset: item.xOffset,
|
||||||
|
yOffset: item.yOffset,
|
||||||
|
options: superjson.stringify(item.options),
|
||||||
|
advancedOptions: superjson.stringify(item.advancedOptions),
|
||||||
|
sectionId: item.sectionId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
|
const inputIntegrationRelations = inputItems.flatMap(({ integrationIds, id: itemId }) =>
|
||||||
const sectionIds = removedSections.map((section) => section.id);
|
integrationIds.map((integrationId) => ({
|
||||||
|
integrationId,
|
||||||
|
itemId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
const dbIntegrationRelations = dbItems.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 (sectionIds.length > 0) {
|
if (addedIntegrationRelations.length > 0) {
|
||||||
await transaction.delete(sections).where(inArray(sections.id, sectionIds));
|
await transaction.insert(schema.integrationItems).values(
|
||||||
}
|
addedIntegrationRelations.map((relation) => ({
|
||||||
|
itemId: relation.itemId,
|
||||||
|
integrationId: relation.integrationId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const updatedItems = filterUpdatedItems(inputItems, dbItems);
|
||||||
|
|
||||||
|
for (const item of updatedItems) {
|
||||||
|
await transaction
|
||||||
|
.update(schema.items)
|
||||||
|
.set({
|
||||||
|
kind: item.kind,
|
||||||
|
height: item.height,
|
||||||
|
width: item.width,
|
||||||
|
xOffset: item.xOffset,
|
||||||
|
yOffset: item.yOffset,
|
||||||
|
options: superjson.stringify(item.options),
|
||||||
|
advancedOptions: superjson.stringify(item.advancedOptions),
|
||||||
|
sectionId: item.sectionId,
|
||||||
|
})
|
||||||
|
.where(eq(items.id, item.id));
|
||||||
|
}
|
||||||
|
|
||||||
|
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: section.yOffset,
|
||||||
|
xOffset: section.xOffset,
|
||||||
|
height: prev?.kind === "dynamic" && "height" in section ? section.height : null,
|
||||||
|
width: prev?.kind === "dynamic" && "width" in section ? section.width : null,
|
||||||
|
parentSectionId:
|
||||||
|
prev?.kind === "dynamic" && "parentSectionId" in section ? section.parentSectionId : null,
|
||||||
|
name: prev?.kind === "category" && "name" in section ? section.name : null,
|
||||||
|
})
|
||||||
|
.where(eq(sections.id, section.id));
|
||||||
|
}
|
||||||
|
|
||||||
|
const removedIntegrationRelations = dbIntegrationRelations.filter(
|
||||||
|
(dbRelation) =>
|
||||||
|
!inputIntegrationRelations.some(
|
||||||
|
(inputRelation) =>
|
||||||
|
dbRelation.itemId === inputRelation.itemId &&
|
||||||
|
dbRelation.integrationId === inputRelation.integrationId,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
for (const relation of removedIntegrationRelations) {
|
||||||
|
await transaction
|
||||||
|
.delete(schema.integrationItems)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(integrationItems.itemId, relation.itemId),
|
||||||
|
eq(integrationItems.integrationId, relation.integrationId),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const removedItems = filterRemovedItems(inputItems, dbItems);
|
||||||
|
|
||||||
|
const itemIds = removedItems.map((item) => item.id);
|
||||||
|
if (itemIds.length > 0) {
|
||||||
|
await transaction.delete(schema.items).where(inArray(items.id, itemIds));
|
||||||
|
}
|
||||||
|
|
||||||
|
const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
|
||||||
|
const sectionIds = removedSections.map((section) => section.id);
|
||||||
|
|
||||||
|
if (sectionIds.length > 0) {
|
||||||
|
await transaction.delete(schema.sections).where(inArray(sections.id, sectionIds));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleSync(db) {
|
||||||
|
db.transaction((transaction) => {
|
||||||
|
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
|
||||||
|
|
||||||
|
if (addedSections.length > 0) {
|
||||||
|
transaction
|
||||||
|
.insert(sections)
|
||||||
|
.values(
|
||||||
|
addedSections.map((section) => ({
|
||||||
|
id: section.id,
|
||||||
|
kind: section.kind,
|
||||||
|
yOffset: section.yOffset,
|
||||||
|
xOffset: section.kind === "dynamic" ? section.xOffset : 0,
|
||||||
|
height: "height" in section ? section.height : null,
|
||||||
|
width: "width" in section ? section.width : null,
|
||||||
|
parentSectionId: "parentSectionId" in section ? section.parentSectionId : null,
|
||||||
|
name: "name" in section ? section.name : null,
|
||||||
|
boardId: dbBoard.id,
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
|
||||||
|
const inputItems = input.sections.flatMap((section) =>
|
||||||
|
section.items.map((item) => ({ ...item, sectionId: section.id })),
|
||||||
|
);
|
||||||
|
const dbItems = dbBoard.sections.flatMap((section) =>
|
||||||
|
section.items.map((item) => ({ ...item, sectionId: section.id })),
|
||||||
|
);
|
||||||
|
|
||||||
|
const addedItems = filterAddedItems(inputItems, dbItems);
|
||||||
|
|
||||||
|
if (addedItems.length > 0) {
|
||||||
|
transaction
|
||||||
|
.insert(items)
|
||||||
|
.values(
|
||||||
|
addedItems.map((item) => ({
|
||||||
|
id: item.id,
|
||||||
|
kind: item.kind,
|
||||||
|
height: item.height,
|
||||||
|
width: item.width,
|
||||||
|
xOffset: item.xOffset,
|
||||||
|
yOffset: item.yOffset,
|
||||||
|
options: superjson.stringify(item.options),
|
||||||
|
advancedOptions: superjson.stringify(item.advancedOptions),
|
||||||
|
sectionId: item.sectionId,
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
|
||||||
|
const inputIntegrationRelations = inputItems.flatMap(({ integrationIds, id: itemId }) =>
|
||||||
|
integrationIds.map((integrationId) => ({
|
||||||
|
integrationId,
|
||||||
|
itemId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
const dbIntegrationRelations = dbItems.flatMap(({ integrationIds, id: itemId }) =>
|
||||||
|
integrationIds.map((integrationId) => ({
|
||||||
|
integrationId,
|
||||||
|
itemId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
const addedIntegrationRelations = inputIntegrationRelations.filter(
|
||||||
|
(inputRelation) =>
|
||||||
|
!dbIntegrationRelations.some(
|
||||||
|
(dbRelation) =>
|
||||||
|
dbRelation.itemId === inputRelation.itemId &&
|
||||||
|
dbRelation.integrationId === inputRelation.integrationId,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (addedIntegrationRelations.length > 0) {
|
||||||
|
transaction
|
||||||
|
.insert(integrationItems)
|
||||||
|
.values(
|
||||||
|
addedIntegrationRelations.map((relation) => ({
|
||||||
|
itemId: relation.itemId,
|
||||||
|
integrationId: relation.integrationId,
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
|
||||||
|
const updatedItems = filterUpdatedItems(inputItems, dbItems);
|
||||||
|
|
||||||
|
for (const item of updatedItems) {
|
||||||
|
transaction
|
||||||
|
.update(items)
|
||||||
|
.set({
|
||||||
|
kind: item.kind,
|
||||||
|
height: item.height,
|
||||||
|
width: item.width,
|
||||||
|
xOffset: item.xOffset,
|
||||||
|
yOffset: item.yOffset,
|
||||||
|
options: superjson.stringify(item.options),
|
||||||
|
advancedOptions: superjson.stringify(item.advancedOptions),
|
||||||
|
sectionId: item.sectionId,
|
||||||
|
})
|
||||||
|
.where(eq(items.id, item.id))
|
||||||
|
.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: section.yOffset,
|
||||||
|
xOffset: section.xOffset,
|
||||||
|
height: prev?.kind === "dynamic" && "height" in section ? section.height : null,
|
||||||
|
width: prev?.kind === "dynamic" && "width" in section ? section.width : null,
|
||||||
|
parentSectionId:
|
||||||
|
prev?.kind === "dynamic" && "parentSectionId" in section ? section.parentSectionId : null,
|
||||||
|
name: prev?.kind === "category" && "name" in section ? section.name : null,
|
||||||
|
})
|
||||||
|
.where(eq(sections.id, section.id))
|
||||||
|
.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(inputItems, dbItems);
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
|
||||||
@@ -649,18 +874,42 @@ export const boardRouter = createTRPCRouter({
|
|||||||
.mutation(async ({ input, ctx }) => {
|
.mutation(async ({ input, ctx }) => {
|
||||||
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
|
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
|
||||||
|
|
||||||
await ctx.db.transaction(async (transaction) => {
|
await handleTransactionsAsync(ctx.db, {
|
||||||
await transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId));
|
async handleAsync(db, schema) {
|
||||||
if (input.permissions.length === 0) {
|
await db.transaction(async (transaction) => {
|
||||||
return;
|
await transaction
|
||||||
}
|
.delete(schema.boardUserPermissions)
|
||||||
await transaction.insert(boardUserPermissions).values(
|
.where(eq(boardUserPermissions.boardId, input.entityId));
|
||||||
input.permissions.map((permission) => ({
|
if (input.permissions.length === 0) {
|
||||||
userId: permission.principalId,
|
return;
|
||||||
permission: permission.permission,
|
}
|
||||||
boardId: input.entityId,
|
await transaction.insert(schema.boardUserPermissions).values(
|
||||||
})),
|
input.permissions.map((permission) => ({
|
||||||
);
|
userId: permission.principalId,
|
||||||
|
permission: permission.permission,
|
||||||
|
boardId: input.entityId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleSync(db) {
|
||||||
|
db.transaction((transaction) => {
|
||||||
|
transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId)).run();
|
||||||
|
if (input.permissions.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
transaction
|
||||||
|
.insert(boardUserPermissions)
|
||||||
|
.values(
|
||||||
|
input.permissions.map((permission) => ({
|
||||||
|
userId: permission.principalId,
|
||||||
|
permission: permission.permission,
|
||||||
|
boardId: input.entityId,
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
saveGroupBoardPermissions: protectedProcedure
|
saveGroupBoardPermissions: protectedProcedure
|
||||||
@@ -668,18 +917,42 @@ export const boardRouter = createTRPCRouter({
|
|||||||
.mutation(async ({ input, ctx }) => {
|
.mutation(async ({ input, ctx }) => {
|
||||||
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
|
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
|
||||||
|
|
||||||
await ctx.db.transaction(async (transaction) => {
|
await handleTransactionsAsync(ctx.db, {
|
||||||
await transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId));
|
async handleAsync(db, schema) {
|
||||||
if (input.permissions.length === 0) {
|
await db.transaction(async (transaction) => {
|
||||||
return;
|
await transaction
|
||||||
}
|
.delete(schema.boardGroupPermissions)
|
||||||
await transaction.insert(boardGroupPermissions).values(
|
.where(eq(boardGroupPermissions.boardId, input.entityId));
|
||||||
input.permissions.map((permission) => ({
|
if (input.permissions.length === 0) {
|
||||||
groupId: permission.principalId,
|
return;
|
||||||
permission: permission.permission,
|
}
|
||||||
boardId: input.entityId,
|
await transaction.insert(schema.boardGroupPermissions).values(
|
||||||
})),
|
input.permissions.map((permission) => ({
|
||||||
);
|
groupId: permission.principalId,
|
||||||
|
permission: permission.permission,
|
||||||
|
boardId: input.entityId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleSync(db) {
|
||||||
|
db.transaction((transaction) => {
|
||||||
|
transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId)).run();
|
||||||
|
if (input.permissions.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
transaction
|
||||||
|
.insert(boardGroupPermissions)
|
||||||
|
.values(
|
||||||
|
input.permissions.map((permission) => ({
|
||||||
|
groupId: permission.principalId,
|
||||||
|
permission: permission.permission,
|
||||||
|
boardId: input.entityId,
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
importOldmarrConfig: permissionRequiredProcedure
|
importOldmarrConfig: permissionRequiredProcedure
|
||||||
@@ -692,6 +965,29 @@ export const boardRouter = createTRPCRouter({
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the home board id of the user with the given device type
|
||||||
|
* For an example of a user with deviceType = 'mobile' it would go through the following order:
|
||||||
|
* 1. user.mobileHomeBoardId
|
||||||
|
* 2. user.homeBoardId
|
||||||
|
* 3. serverSettings.mobileHomeBoardId
|
||||||
|
* 4. serverSettings.homeBoardId
|
||||||
|
* 5. show NOT_FOUND error
|
||||||
|
*/
|
||||||
|
const getHomeIdBoardAsync = async (
|
||||||
|
db: Database,
|
||||||
|
user: InferSelectModel<typeof users> | null,
|
||||||
|
deviceType: DeviceType,
|
||||||
|
) => {
|
||||||
|
const settingKey = deviceType === "mobile" ? "mobileHomeBoardId" : "homeBoardId";
|
||||||
|
if (user?.[settingKey] || user?.homeBoardId) {
|
||||||
|
return user[settingKey] ?? user.homeBoardId;
|
||||||
|
} else {
|
||||||
|
const boardSettings = await getServerSettingByKeyAsync(db, "board");
|
||||||
|
return boardSettings[settingKey] ?? boardSettings.homeBoardId;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const noBoardWithSimilarNameAsync = async (db: Database, name: string, ignoredIds: string[] = []) => {
|
const noBoardWithSimilarNameAsync = async (db: Database, name: string, ignoredIds: string[] = []) => {
|
||||||
const boards = await db.query.boards.findMany({
|
const boards = await db.query.boards.findMany({
|
||||||
columns: {
|
columns: {
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
import { zfd } from "zod-form-data";
|
||||||
|
|
||||||
|
import { addCustomRootCertificateAsync, removeCustomRootCertificateAsync } from "@homarr/certificates/server";
|
||||||
|
import { superRefineCertificateFile, validation } from "@homarr/validation";
|
||||||
|
|
||||||
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../trpc";
|
||||||
|
|
||||||
|
export const certificateRouter = createTRPCRouter({
|
||||||
|
addCertificate: permissionRequiredProcedure
|
||||||
|
.requiresPermission("admin")
|
||||||
|
.input(
|
||||||
|
zfd.formData({
|
||||||
|
file: zfd.file().superRefine(superRefineCertificateFile),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.mutation(async ({ input }) => {
|
||||||
|
const content = await input.file.text();
|
||||||
|
await addCustomRootCertificateAsync(input.file.name, content);
|
||||||
|
}),
|
||||||
|
removeCertificate: permissionRequiredProcedure
|
||||||
|
.requiresPermission("admin")
|
||||||
|
.input(z.object({ fileName: validation.certificates.validFileNameSchema }))
|
||||||
|
.mutation(async ({ input }) => {
|
||||||
|
await removeCustomRootCertificateAsync(input.fileName);
|
||||||
|
}),
|
||||||
|
});
|
||||||
@@ -1,26 +1,24 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
import type Docker from "dockerode";
|
|
||||||
import type { Container } from "dockerode";
|
|
||||||
|
|
||||||
import { db, like, or } from "@homarr/db";
|
import { db, like, or } from "@homarr/db";
|
||||||
import { icons } from "@homarr/db/schema";
|
import { icons } from "@homarr/db/schema";
|
||||||
import type { DockerContainerState } from "@homarr/definitions";
|
import { DockerSingleton } from "@homarr/docker";
|
||||||
|
import type { Container, ContainerInfo, ContainerState, Docker, Port } from "@homarr/docker";
|
||||||
import { logger } from "@homarr/log";
|
import { logger } from "@homarr/log";
|
||||||
import { createCacheChannel } from "@homarr/redis";
|
import { createCacheChannel } from "@homarr/redis";
|
||||||
import { z } from "@homarr/validation";
|
import { z } from "@homarr/validation";
|
||||||
|
|
||||||
import { createTRPCRouter, permissionRequiredProcedure } from "../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure } from "../../trpc";
|
||||||
import { DockerSingleton } from "./docker-singleton";
|
|
||||||
|
|
||||||
const dockerCache = createCacheChannel<{
|
const dockerCache = createCacheChannel<{
|
||||||
containers: (Docker.ContainerInfo & { instance: string; iconUrl: string | null })[];
|
containers: (ContainerInfo & { instance: string; iconUrl: string | null })[];
|
||||||
}>("docker-containers", 5 * 60 * 1000);
|
}>("docker-containers", 5 * 60 * 1000);
|
||||||
|
|
||||||
export const dockerRouter = createTRPCRouter({
|
export const dockerRouter = createTRPCRouter({
|
||||||
getContainers: permissionRequiredProcedure.requiresPermission("admin").query(async () => {
|
getContainers: permissionRequiredProcedure.requiresPermission("admin").query(async () => {
|
||||||
const result = await dockerCache
|
const result = await dockerCache
|
||||||
.consumeAsync(async () => {
|
.consumeAsync(async () => {
|
||||||
const dockerInstances = DockerSingleton.getInstance();
|
const dockerInstances = DockerSingleton.getInstances();
|
||||||
const containers = await Promise.all(
|
const containers = await Promise.all(
|
||||||
// Return all the containers of all the instances into only one item
|
// Return all the containers of all the instances into only one item
|
||||||
dockerInstances.map(({ instance, host: key }) =>
|
dockerInstances.map(({ instance, host: key }) =>
|
||||||
@@ -33,8 +31,7 @@ export const dockerRouter = createTRPCRouter({
|
|||||||
),
|
),
|
||||||
).then((containers) => containers.flat());
|
).then((containers) => containers.flat());
|
||||||
|
|
||||||
const extractImage = (container: Docker.ContainerInfo) =>
|
const extractImage = (container: ContainerInfo) => container.Image.split("/").at(-1)?.split(":").at(0) ?? "";
|
||||||
container.Image.split("/").at(-1)?.split(":").at(0) ?? "";
|
|
||||||
const likeQueries = containers.map((container) => like(icons.name, `%${extractImage(container)}%`));
|
const likeQueries = containers.map((container) => like(icons.name, `%${extractImage(container)}%`));
|
||||||
const dbIcons =
|
const dbIcons =
|
||||||
likeQueries.length >= 1
|
likeQueries.length >= 1
|
||||||
@@ -151,7 +148,7 @@ const getContainerOrDefaultAsync = async (instance: Docker, id: string) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const getContainerOrThrowAsync = async (id: string) => {
|
const getContainerOrThrowAsync = async (id: string) => {
|
||||||
const dockerInstances = DockerSingleton.getInstance();
|
const dockerInstances = DockerSingleton.getInstances();
|
||||||
const containers = await Promise.all(dockerInstances.map(({ instance }) => getContainerOrDefaultAsync(instance, id)));
|
const containers = await Promise.all(dockerInstances.map(({ instance }) => getContainerOrDefaultAsync(instance, id)));
|
||||||
const foundContainer = containers.find((container) => container) ?? null;
|
const foundContainer = containers.find((container) => container) ?? null;
|
||||||
|
|
||||||
@@ -168,21 +165,21 @@ const getContainerOrThrowAsync = async (id: string) => {
|
|||||||
interface DockerContainer {
|
interface DockerContainer {
|
||||||
name: string;
|
name: string;
|
||||||
id: string;
|
id: string;
|
||||||
state: DockerContainerState;
|
state: ContainerState;
|
||||||
image: string;
|
image: string;
|
||||||
ports: Docker.Port[];
|
ports: Port[];
|
||||||
iconUrl: string | null;
|
iconUrl: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function sanitizeContainers(
|
function sanitizeContainers(
|
||||||
containers: (Docker.ContainerInfo & { instance: string; iconUrl: string | null })[],
|
containers: (ContainerInfo & { instance: string; iconUrl: string | null })[],
|
||||||
): DockerContainer[] {
|
): DockerContainer[] {
|
||||||
return containers.map((container) => {
|
return containers.map((container) => {
|
||||||
return {
|
return {
|
||||||
name: container.Names[0]?.split("/")[1] ?? "Unknown",
|
name: container.Names[0]?.split("/")[1] ?? "Unknown",
|
||||||
id: container.Id,
|
id: container.Id,
|
||||||
instance: container.instance,
|
instance: container.instance,
|
||||||
state: container.State as DockerContainerState,
|
state: container.State as ContainerState,
|
||||||
image: container.Image,
|
image: container.Image,
|
||||||
ports: container.Ports,
|
ports: container.Ports,
|
||||||
iconUrl: container.iconUrl,
|
iconUrl: container.iconUrl,
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
import Docker from "dockerode";
|
|
||||||
|
|
||||||
interface DockerInstance {
|
|
||||||
host: string;
|
|
||||||
instance: Docker;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class DockerSingleton {
|
|
||||||
private static instances: DockerInstance[];
|
|
||||||
|
|
||||||
private createInstances() {
|
|
||||||
const instances: DockerInstance[] = [];
|
|
||||||
const hostVariable = process.env.DOCKER_HOST;
|
|
||||||
const portVariable = process.env.DOCKER_PORT;
|
|
||||||
if (hostVariable === undefined || portVariable === undefined) {
|
|
||||||
instances.push({ host: "socket", instance: new Docker() });
|
|
||||||
return instances;
|
|
||||||
}
|
|
||||||
const hosts = hostVariable.split(",");
|
|
||||||
const ports = portVariable.split(",");
|
|
||||||
|
|
||||||
if (hosts.length !== ports.length) {
|
|
||||||
throw new Error("The number of hosts and ports must match");
|
|
||||||
}
|
|
||||||
|
|
||||||
hosts.forEach((host, i) => {
|
|
||||||
instances.push({
|
|
||||||
host: `${host}:${ports[i]}`,
|
|
||||||
instance: new Docker({
|
|
||||||
host,
|
|
||||||
port: parseInt(ports[i] ?? "", 10),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
return instances;
|
|
||||||
});
|
|
||||||
return instances;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static findInstance(key: string): DockerInstance | undefined {
|
|
||||||
return this.instances.find((instance) => instance.host === key);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static getInstance(): DockerInstance[] {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
||||||
if (!DockerSingleton.instances) {
|
|
||||||
DockerSingleton.instances = new DockerSingleton().createInstances();
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.instances;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,7 @@ import { TRPCError } from "@trpc/server";
|
|||||||
import { objectEntries } from "@homarr/common";
|
import { objectEntries } from "@homarr/common";
|
||||||
import { decryptSecret, encryptSecret } from "@homarr/common/server";
|
import { decryptSecret, encryptSecret } from "@homarr/common/server";
|
||||||
import type { Database } from "@homarr/db";
|
import type { Database } from "@homarr/db";
|
||||||
import { and, asc, createId, eq, inArray, like } from "@homarr/db";
|
import { and, asc, createId, eq, handleTransactionsAsync, inArray, like } from "@homarr/db";
|
||||||
import {
|
import {
|
||||||
groupMembers,
|
groupMembers,
|
||||||
groupPermissions,
|
groupPermissions,
|
||||||
@@ -130,6 +130,16 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
limit: input.limit,
|
limit: input.limit,
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
// This is used to get the integrations by their ids it's public because it's needed to get integrations data in the boards
|
||||||
|
byIds: publicProcedure.input(z.array(z.string())).query(async ({ ctx, input }) => {
|
||||||
|
return await ctx.db.query.integrations.findMany({
|
||||||
|
where: inArray(integrations.id, input),
|
||||||
|
columns: {
|
||||||
|
id: true,
|
||||||
|
kind: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}),
|
||||||
byId: protectedProcedure.input(validation.integration.byId).query(async ({ ctx, input }) => {
|
byId: protectedProcedure.input(validation.integration.byId).query(async ({ ctx, input }) => {
|
||||||
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.id), "full");
|
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.id), "full");
|
||||||
const integration = await ctx.db.query.integrations.findFirst({
|
const integration = await ctx.db.query.integrations.findFirst({
|
||||||
@@ -360,20 +370,45 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
.mutation(async ({ input, ctx }) => {
|
.mutation(async ({ input, ctx }) => {
|
||||||
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
|
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
|
||||||
|
|
||||||
await ctx.db.transaction(async (transaction) => {
|
await handleTransactionsAsync(ctx.db, {
|
||||||
await transaction
|
async handleAsync(db, schema) {
|
||||||
.delete(integrationUserPermissions)
|
await ctx.db.transaction(async (transaction) => {
|
||||||
.where(eq(integrationUserPermissions.integrationId, input.entityId));
|
await transaction
|
||||||
if (input.permissions.length === 0) {
|
.delete(schema.integrationUserPermissions)
|
||||||
return;
|
.where(eq(schema.integrationUserPermissions.integrationId, input.entityId));
|
||||||
}
|
if (input.permissions.length === 0) {
|
||||||
await transaction.insert(integrationUserPermissions).values(
|
return;
|
||||||
input.permissions.map((permission) => ({
|
}
|
||||||
userId: permission.principalId,
|
await transaction.insert(schema.integrationUserPermissions).values(
|
||||||
permission: permission.permission,
|
input.permissions.map((permission) => ({
|
||||||
integrationId: input.entityId,
|
userId: permission.principalId,
|
||||||
})),
|
permission: permission.permission,
|
||||||
);
|
integrationId: input.entityId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleSync(db) {
|
||||||
|
db.transaction((transaction) => {
|
||||||
|
transaction
|
||||||
|
.delete(integrationUserPermissions)
|
||||||
|
.where(eq(integrationUserPermissions.integrationId, input.entityId))
|
||||||
|
.run();
|
||||||
|
if (input.permissions.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
transaction
|
||||||
|
.insert(integrationUserPermissions)
|
||||||
|
.values(
|
||||||
|
input.permissions.map((permission) => ({
|
||||||
|
userId: permission.principalId,
|
||||||
|
permission: permission.permission,
|
||||||
|
integrationId: input.entityId,
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
saveGroupIntegrationPermissions: protectedProcedure
|
saveGroupIntegrationPermissions: protectedProcedure
|
||||||
@@ -381,20 +416,45 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
.mutation(async ({ input, ctx }) => {
|
.mutation(async ({ input, ctx }) => {
|
||||||
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
|
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
|
||||||
|
|
||||||
await ctx.db.transaction(async (transaction) => {
|
await handleTransactionsAsync(ctx.db, {
|
||||||
await transaction
|
async handleAsync(db, schema) {
|
||||||
.delete(integrationGroupPermissions)
|
await db.transaction(async (transaction) => {
|
||||||
.where(eq(integrationGroupPermissions.integrationId, input.entityId));
|
await transaction
|
||||||
if (input.permissions.length === 0) {
|
.delete(schema.integrationGroupPermissions)
|
||||||
return;
|
.where(eq(schema.integrationGroupPermissions.integrationId, input.entityId));
|
||||||
}
|
if (input.permissions.length === 0) {
|
||||||
await transaction.insert(integrationGroupPermissions).values(
|
return;
|
||||||
input.permissions.map((permission) => ({
|
}
|
||||||
groupId: permission.principalId,
|
await transaction.insert(schema.integrationGroupPermissions).values(
|
||||||
permission: permission.permission,
|
input.permissions.map((permission) => ({
|
||||||
integrationId: input.entityId,
|
groupId: permission.principalId,
|
||||||
})),
|
permission: permission.permission,
|
||||||
);
|
integrationId: input.entityId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleSync(db) {
|
||||||
|
db.transaction((transaction) => {
|
||||||
|
transaction
|
||||||
|
.delete(integrationGroupPermissions)
|
||||||
|
.where(eq(integrationGroupPermissions.integrationId, input.entityId))
|
||||||
|
.run();
|
||||||
|
if (input.permissions.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
transaction
|
||||||
|
.insert(integrationGroupPermissions)
|
||||||
|
.values(
|
||||||
|
input.permissions.map((permission) => ({
|
||||||
|
groupId: permission.principalId,
|
||||||
|
permission: permission.permission,
|
||||||
|
integrationId: input.entityId,
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
searchInIntegration: protectedProcedure
|
searchInIntegration: protectedProcedure
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
|
||||||
import { env } from "@homarr/auth/env.mjs";
|
import { env } from "@homarr/auth/env";
|
||||||
|
|
||||||
export const throwIfCredentialsDisabled = () => {
|
export const throwIfCredentialsDisabled = () => {
|
||||||
if (!env.AUTH_PROVIDERS.includes("credentials")) {
|
if (!env.AUTH_PROVIDERS.includes("credentials")) {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ describe("all should return all apps", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: createDefaultSession(),
|
session: createDefaultSession(),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -55,6 +56,7 @@ describe("all should return all apps", () => {
|
|||||||
// Arrange
|
// Arrange
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db: createDb(),
|
db: createDb(),
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -72,6 +74,7 @@ describe("byId should return an app by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
vi.spyOn(appAccessControl, "canUserSeeAppAsync").mockReturnValue(Promise.resolve(true));
|
vi.spyOn(appAccessControl, "canUserSeeAppAsync").mockReturnValue(Promise.resolve(true));
|
||||||
@@ -103,6 +106,7 @@ describe("byId should return an app by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
await db.insert(apps).values([
|
await db.insert(apps).values([
|
||||||
@@ -128,6 +132,7 @@ describe("byId should return an app by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -145,6 +150,7 @@ describe("create should create a new app with all arguments", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: createDefaultSession(["app-create"]),
|
session: createDefaultSession(["app-create"]),
|
||||||
});
|
});
|
||||||
const input = {
|
const input = {
|
||||||
@@ -171,6 +177,7 @@ describe("create should create a new app with all arguments", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: createDefaultSession(["app-create"]),
|
session: createDefaultSession(["app-create"]),
|
||||||
});
|
});
|
||||||
const input = {
|
const input = {
|
||||||
@@ -199,6 +206,7 @@ describe("update should update an app", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: createDefaultSession(["app-modify-all"]),
|
session: createDefaultSession(["app-modify-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -237,6 +245,7 @@ describe("update should update an app", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: createDefaultSession(["app-modify-all"]),
|
session: createDefaultSession(["app-modify-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -261,6 +270,7 @@ describe("delete should delete an app", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: createDefaultSession(["app-full-all"]),
|
session: createDefaultSession(["app-full-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ 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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: null });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: null });
|
||||||
|
|
||||||
const user1 = await createRandomUserAsync(db);
|
const user1 = await createRandomUserAsync(db);
|
||||||
const user2 = await createRandomUserAsync(db);
|
const user2 = await createRandomUserAsync(db);
|
||||||
@@ -85,6 +85,7 @@ describe("getAllBoards should return all boards accessable to the current user",
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({
|
const caller = boardRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: {
|
session: {
|
||||||
user: {
|
user: {
|
||||||
id: defaultCreatorId,
|
id: defaultCreatorId,
|
||||||
@@ -124,7 +125,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const user1 = await createRandomUserAsync(db);
|
const user1 = await createRandomUserAsync(db);
|
||||||
const user2 = await createRandomUserAsync(db);
|
const user2 = await createRandomUserAsync(db);
|
||||||
@@ -168,6 +169,7 @@ describe("getAllBoards should return all boards accessable to the current user",
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({
|
const caller = boardRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -232,6 +234,7 @@ describe("getAllBoards should return all boards accessable to the current user",
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({
|
const caller = boardRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -290,7 +293,7 @@ describe("createBoard should create a new board", () => {
|
|||||||
permissions: ["board-create"] satisfies GroupPermissionKey[],
|
permissions: ["board-create"] satisfies GroupPermissionKey[],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
const caller = boardRouter.createCaller({ db, session });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session });
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
id: defaultCreatorId,
|
id: defaultCreatorId,
|
||||||
@@ -316,7 +319,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () => await caller.createBoard({ name: "newBoard", columnCount: 12, isPublic: true });
|
const actAsync = async () => await caller.createBoard({ name: "newBoard", columnCount: 12, isPublic: true });
|
||||||
@@ -330,7 +333,7 @@ describe("rename board should rename board", () => {
|
|||||||
test("should rename board", async () => {
|
test("should rename board", async () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
@@ -358,7 +361,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
id: defaultCreatorId,
|
id: defaultCreatorId,
|
||||||
@@ -385,7 +388,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () => await caller.renameBoard({ id: "nonExistentBoardId", name: "newName" });
|
const actAsync = async () => await caller.renameBoard({ id: "nonExistentBoardId", name: "newName" });
|
||||||
@@ -401,7 +404,7 @@ describe("changeBoardVisibility should change board visibility", () => {
|
|||||||
async (visibility) => {
|
async (visibility) => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
@@ -436,7 +439,7 @@ describe("deleteBoard should delete board", () => {
|
|||||||
test("should delete board", async () => {
|
test("should delete board", async () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
@@ -463,7 +466,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () => await caller.deleteBoard({ id: "nonExistentBoardId" });
|
const actAsync = async () => await caller.deleteBoard({ id: "nonExistentBoardId" });
|
||||||
@@ -478,7 +481,7 @@ describe("getHomeBoard should return home board", () => {
|
|||||||
// Arrange
|
// Arrange
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const fullBoardProps = await createFullBoardAsync(db, "home");
|
const fullBoardProps = await createFullBoardAsync(db, "home");
|
||||||
await db
|
await db
|
||||||
@@ -502,7 +505,7 @@ describe("getHomeBoard should return home board", () => {
|
|||||||
// Arrange
|
// Arrange
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const fullBoardProps = await createFullBoardAsync(db, "home");
|
const fullBoardProps = await createFullBoardAsync(db, "home");
|
||||||
await db.insert(serverSettings).values({
|
await db.insert(serverSettings).values({
|
||||||
@@ -523,7 +526,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
await createFullBoardAsync(db, "home");
|
await createFullBoardAsync(db, "home");
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
@@ -539,7 +542,7 @@ describe("getBoardByName should return board by name", () => {
|
|||||||
// Arrange
|
// Arrange
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const fullBoardProps = await createFullBoardAsync(db, name);
|
const fullBoardProps = await createFullBoardAsync(db, name);
|
||||||
|
|
||||||
@@ -557,7 +560,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
await createFullBoardAsync(db, "default");
|
await createFullBoardAsync(db, "default");
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
@@ -573,7 +576,7 @@ describe("savePartialBoardSettings should save general settings", () => {
|
|||||||
// Arrange
|
// Arrange
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const newPageTitle = "newPageTitle";
|
const newPageTitle = "newPageTitle";
|
||||||
const newMetaTitle = "newMetaTitle";
|
const newMetaTitle = "newMetaTitle";
|
||||||
@@ -633,7 +636,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
await caller.savePartialBoardSettings({
|
await caller.savePartialBoardSettings({
|
||||||
@@ -652,7 +655,7 @@ 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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, 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");
|
||||||
|
|
||||||
@@ -689,7 +692,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const { boardId, itemId, sectionId } = await createFullBoardAsync(db, "default");
|
const { boardId, itemId, sectionId } = await createFullBoardAsync(db, "default");
|
||||||
|
|
||||||
@@ -744,7 +747,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const anotherIntegration = {
|
const anotherIntegration = {
|
||||||
id: createId(),
|
id: createId(),
|
||||||
kind: "adGuardHome",
|
kind: "adGuardHome",
|
||||||
@@ -814,7 +817,7 @@ describe("saveBoard should save full board", () => {
|
|||||||
async (partialSection) => {
|
async (partialSection) => {
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, 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");
|
||||||
|
|
||||||
@@ -867,7 +870,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, 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");
|
||||||
|
|
||||||
@@ -931,7 +934,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const integration = {
|
const integration = {
|
||||||
id: createId(),
|
id: createId(),
|
||||||
kind: "plex",
|
kind: "plex",
|
||||||
@@ -998,7 +1001,7 @@ describe("saveBoard should save full board", () => {
|
|||||||
});
|
});
|
||||||
it("should update section when present in input", async () => {
|
it("should update section when present in input", async () => {
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, 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");
|
||||||
const newSectionId = createId();
|
const newSectionId = createId();
|
||||||
@@ -1056,7 +1059,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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const { boardId, itemId, sectionId } = await createFullBoardAsync(db, "default");
|
const { boardId, itemId, sectionId } = await createFullBoardAsync(db, "default");
|
||||||
|
|
||||||
@@ -1112,7 +1115,7 @@ describe("saveBoard should save full board", () => {
|
|||||||
});
|
});
|
||||||
it("should fail when board not found", async () => {
|
it("should fail when board not found", async () => {
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
await caller.saveBoard({
|
await caller.saveBoard({
|
||||||
@@ -1128,7 +1131,7 @@ 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 = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
|
|
||||||
const user1 = await createRandomUserAsync(db);
|
const user1 = await createRandomUserAsync(db);
|
||||||
@@ -1202,7 +1205,7 @@ describe("saveUserBoardPermissions should save user board permissions", () => {
|
|||||||
async (permission) => {
|
async (permission) => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
|
|
||||||
const user1 = await createRandomUserAsync(db);
|
const user1 = await createRandomUserAsync(db);
|
||||||
@@ -1244,7 +1247,7 @@ describe("saveGroupBoardPermissions should save group board permissions", () =>
|
|||||||
async (permission) => {
|
async (permission) => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = boardRouter.createCaller({ db, session: defaultSession });
|
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ describe("All procedures should only be accessible for users with admin permissi
|
|||||||
// Arrange
|
// Arrange
|
||||||
const caller = dockerRouter.createCaller({
|
const caller = dockerRouter.createCaller({
|
||||||
db: null as unknown as Database,
|
db: null as unknown as Database,
|
||||||
|
deviceType: undefined,
|
||||||
session: createSessionWithPermissions("admin"),
|
session: createSessionWithPermissions("admin"),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -68,6 +69,7 @@ describe("All procedures should only be accessible for users with admin permissi
|
|||||||
);
|
);
|
||||||
const caller = dockerRouter.createCaller({
|
const caller = dockerRouter.createCaller({
|
||||||
db: null as unknown as Database,
|
db: null as unknown as Database,
|
||||||
|
deviceType: undefined,
|
||||||
session: createSessionWithPermissions(...groupPermissionsWithoutAdmin),
|
session: createSessionWithPermissions(...groupPermissionsWithoutAdmin),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -81,6 +83,7 @@ describe("All procedures should only be accessible for users with admin permissi
|
|||||||
// Arrange
|
// Arrange
|
||||||
const caller = dockerRouter.createCaller({
|
const caller = dockerRouter.createCaller({
|
||||||
db: null as unknown as Database,
|
db: null as unknown as Database,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -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 * as env from "@homarr/auth/env.mjs";
|
import * as env from "@homarr/auth/env";
|
||||||
import { createId, eq } from "@homarr/db";
|
import { createId, 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 { createDb } from "@homarr/db/test";
|
||||||
@@ -37,7 +37,7 @@ describe("paginated should return a list of groups with pagination", () => {
|
|||||||
async (page, expectedCount) => {
|
async (page, expectedCount) => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values(
|
await db.insert(groups).values(
|
||||||
[1, 2, 3, 4, 5].map((number) => ({
|
[1, 2, 3, 4, 5].map((number) => ({
|
||||||
@@ -60,7 +60,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values(
|
await db.insert(groups).values(
|
||||||
[1, 2, 3, 4, 5].map((number) => ({
|
[1, 2, 3, 4, 5].map((number) => ({
|
||||||
@@ -81,7 +81,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const user = createDummyUser();
|
const user = createDummyUser();
|
||||||
await db.insert(users).values(user);
|
await db.insert(users).values(user);
|
||||||
@@ -117,7 +117,7 @@ describe("paginated should return a list of groups with pagination", () => {
|
|||||||
async (query, expectedCount, firstKey) => {
|
async (query, expectedCount, firstKey) => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values(
|
await db.insert(groups).values(
|
||||||
["first", "second", "third", "forth", "fifth"].map((key, index) => ({
|
["first", "second", "third", "forth", "fifth"].map((key, index) => ({
|
||||||
@@ -140,7 +140,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () => await caller.getPaginated({});
|
const actAsync = async () => await caller.getPaginated({});
|
||||||
@@ -154,7 +154,7 @@ 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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const user = createDummyUser();
|
const user = createDummyUser();
|
||||||
const groupId = "1";
|
const groupId = "1";
|
||||||
@@ -197,7 +197,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values({
|
await db.insert(groups).values({
|
||||||
id: "2",
|
id: "2",
|
||||||
@@ -214,7 +214,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () => await caller.getById({ id: "1" });
|
const actAsync = async () => await caller.getById({ id: "1" });
|
||||||
@@ -228,7 +228,7 @@ 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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const name = "a".repeat(64);
|
const name = "a".repeat(64);
|
||||||
await db.insert(users).values(defaultSession.user);
|
await db.insert(users).values(defaultSession.user);
|
||||||
@@ -252,7 +252,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
const longName = "a".repeat(65);
|
const longName = "a".repeat(65);
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
@@ -273,7 +273,7 @@ describe("create should create group in database", () => {
|
|||||||
])("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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values({
|
await db.insert(groups).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
@@ -290,7 +290,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () => await caller.createGroup({ name: "test" });
|
const actAsync = async () => await caller.createGroup({ name: "test" });
|
||||||
@@ -307,7 +307,7 @@ describe("update should update name with value that is no duplicate", () => {
|
|||||||
])("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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
await db.insert(groups).values([
|
await db.insert(groups).values([
|
||||||
@@ -340,7 +340,7 @@ describe("update should update name with value that is no duplicate", () => {
|
|||||||
])("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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
await db.insert(groups).values([
|
await db.insert(groups).values([
|
||||||
@@ -368,7 +368,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values({
|
await db.insert(groups).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
@@ -389,7 +389,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
@@ -407,7 +407,7 @@ 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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
await db.insert(groups).values({
|
await db.insert(groups).values({
|
||||||
@@ -437,7 +437,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values({
|
await db.insert(groups).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
@@ -458,7 +458,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
@@ -476,7 +476,7 @@ 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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
const newUserId = createId();
|
const newUserId = createId();
|
||||||
@@ -513,7 +513,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values({
|
await db.insert(groups).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
@@ -534,7 +534,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
@@ -552,7 +552,7 @@ 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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
await db.insert(groups).values([
|
await db.insert(groups).values([
|
||||||
@@ -581,7 +581,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(groups).values({
|
await db.insert(groups).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
@@ -601,7 +601,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
@@ -620,7 +620,7 @@ describe("addMember should add member to group", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const spy = vi.spyOn(env, "env", "get");
|
const spy = vi.spyOn(env, "env", "get");
|
||||||
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
|
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
const userId = createId();
|
const userId = createId();
|
||||||
@@ -658,7 +658,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
@@ -679,7 +679,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
@@ -697,7 +697,7 @@ describe("addMember should add member to group", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const spy = vi.spyOn(env, "env", "get");
|
const spy = vi.spyOn(env, "env", "get");
|
||||||
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
|
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
const userId = createId();
|
const userId = createId();
|
||||||
@@ -735,7 +735,7 @@ describe("removeMember should remove member from group", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const spy = vi.spyOn(env, "env", "get");
|
const spy = vi.spyOn(env, "env", "get");
|
||||||
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
|
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
const userId = createId();
|
const userId = createId();
|
||||||
@@ -776,7 +776,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
@@ -797,7 +797,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 = createDb();
|
||||||
const caller = groupRouter.createCaller({ db, session: defaultSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const actAsync = async () =>
|
const actAsync = async () =>
|
||||||
@@ -815,7 +815,7 @@ describe("removeMember should remove member from group", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const spy = vi.spyOn(env, "env", "get");
|
const spy = vi.spyOn(env, "env", "get");
|
||||||
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
|
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
|
||||||
const caller = groupRouter.createCaller({ db, session: adminSession });
|
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
|
||||||
|
|
||||||
const groupId = createId();
|
const groupId = createId();
|
||||||
const userId = createId();
|
const userId = createId();
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ describe("all should return all integrations", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(),
|
session: defaultSessionWithPermissions(),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -63,6 +64,7 @@ describe("byId should return an integration by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-full-all"]),
|
session: defaultSessionWithPermissions(["integration-full-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -89,6 +91,7 @@ describe("byId should return an integration by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-full-all"]),
|
session: defaultSessionWithPermissions(["integration-full-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -100,6 +103,7 @@ describe("byId should return an integration by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-full-all"]),
|
session: defaultSessionWithPermissions(["integration-full-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -147,6 +151,7 @@ describe("byId should return an integration by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -172,6 +177,7 @@ describe("create should create a new integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-create"]),
|
session: defaultSessionWithPermissions(["integration-create"]),
|
||||||
});
|
});
|
||||||
const input = {
|
const input = {
|
||||||
@@ -206,6 +212,7 @@ describe("create should create a new integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-create"]),
|
session: defaultSessionWithPermissions(["integration-create"]),
|
||||||
});
|
});
|
||||||
const input = {
|
const input = {
|
||||||
@@ -249,6 +256,7 @@ describe("create should create a new integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
||||||
});
|
});
|
||||||
const input = {
|
const input = {
|
||||||
@@ -272,6 +280,7 @@ describe("update should update an integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-full-all"]),
|
session: defaultSessionWithPermissions(["integration-full-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -346,6 +355,7 @@ describe("update should update an integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-full-all"]),
|
session: defaultSessionWithPermissions(["integration-full-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -364,6 +374,7 @@ describe("update should update an integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -386,6 +397,7 @@ describe("delete should delete an integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-full-all"]),
|
session: defaultSessionWithPermissions(["integration-full-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -419,6 +431,7 @@ describe("delete should delete an integration", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
session: defaultSessionWithPermissions(["integration-interact-all"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ vi.mock("@homarr/auth", async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Mock the env module to return the credentials provider
|
// Mock the env module to return the credentials provider
|
||||||
vi.mock("@homarr/auth/env.mjs", () => {
|
vi.mock("@homarr/auth/env", () => {
|
||||||
return {
|
return {
|
||||||
env: {
|
env: {
|
||||||
AUTH_PROVIDERS: ["credentials"],
|
AUTH_PROVIDERS: ["credentials"],
|
||||||
@@ -38,6 +38,7 @@ describe("all should return all existing invites without sensitive informations"
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = inviteRouter.createCaller({
|
const caller = inviteRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -72,6 +73,7 @@ describe("all should return all existing invites without sensitive informations"
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = inviteRouter.createCaller({
|
const caller = inviteRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -111,6 +113,7 @@ describe("create should create a new invite expiring on the specified date with
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = inviteRouter.createCaller({
|
const caller = inviteRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
await db.insert(users).values({
|
await db.insert(users).values({
|
||||||
@@ -142,6 +145,7 @@ describe("delete should remove invite by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = inviteRouter.createCaller({
|
const caller = inviteRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -179,6 +183,7 @@ describe("delete should remove invite by id", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = inviteRouter.createCaller({
|
const caller = inviteRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ describe("getAll server settings", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = serverSettingsRouter.createCaller({
|
const caller = serverSettingsRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -44,6 +45,7 @@ describe("getAll server settings", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = serverSettingsRouter.createCaller({
|
const caller = serverSettingsRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -58,6 +60,7 @@ describe("saveSettings", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = serverSettingsRouter.createCaller({
|
const caller = serverSettingsRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ vi.mock("@homarr/auth", async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Mock the env module to return the credentials provider
|
// Mock the env module to return the credentials provider
|
||||||
vi.mock("@homarr/auth/env.mjs", () => {
|
vi.mock("@homarr/auth/env", () => {
|
||||||
return {
|
return {
|
||||||
env: {
|
env: {
|
||||||
AUTH_PROVIDERS: ["credentials"],
|
AUTH_PROVIDERS: ["credentials"],
|
||||||
@@ -42,6 +42,7 @@ describe("initUser should initialize the first user", () => {
|
|||||||
await createOnboardingStepAsync(db, "user");
|
await createOnboardingStepAsync(db, "user");
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -65,6 +66,7 @@ describe("initUser should initialize the first user", () => {
|
|||||||
await createOnboardingStepAsync(db, "user");
|
await createOnboardingStepAsync(db, "user");
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -89,6 +91,7 @@ describe("initUser should initialize the first user", () => {
|
|||||||
await createOnboardingStepAsync(db, "user");
|
await createOnboardingStepAsync(db, "user");
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -109,6 +112,7 @@ describe("register should create a user with valid invitation", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -164,6 +168,7 @@ describe("register should create a user with valid invitation", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -206,6 +211,7 @@ describe("editProfile shoud update user", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -242,6 +248,7 @@ describe("editProfile shoud update user", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -277,6 +284,7 @@ describe("delete should delete user", () => {
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = userRouter.createCaller({
|
const caller = userRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: defaultSession,
|
session: defaultSession,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ describe("ping should call sendPingRequestAsync with url and return result", ()
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
spy.mockImplementation(() => Promise.resolve({ error: "error" }));
|
spy.mockImplementation(() => Promise.resolve({ error: "error" }));
|
||||||
@@ -37,6 +38,7 @@ describe("ping should call sendPingRequestAsync with url and return result", ()
|
|||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = appRouter.createCaller({
|
const caller = appRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
session: null,
|
session: null,
|
||||||
});
|
});
|
||||||
spy.mockImplementation(() => Promise.resolve({ statusCode: 200 }));
|
spy.mockImplementation(() => Promise.resolve({ statusCode: 200 }));
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { TRPCError } from "@trpc/server";
|
|||||||
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
|
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
|
||||||
import type { Database } from "@homarr/db";
|
import type { Database } from "@homarr/db";
|
||||||
import { and, createId, eq, like } from "@homarr/db";
|
import { and, createId, eq, like } from "@homarr/db";
|
||||||
import { groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema";
|
import { boards, groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema";
|
||||||
import { selectUserSchema } from "@homarr/db/validationSchemas";
|
import { selectUserSchema } from "@homarr/db/validationSchemas";
|
||||||
import { credentialsAdminGroup } from "@homarr/definitions";
|
import { credentialsAdminGroup } from "@homarr/definitions";
|
||||||
import type { SupportedAuthProvider } from "@homarr/definitions";
|
import type { SupportedAuthProvider } from "@homarr/definitions";
|
||||||
@@ -18,6 +18,7 @@ import {
|
|||||||
protectedProcedure,
|
protectedProcedure,
|
||||||
publicProcedure,
|
publicProcedure,
|
||||||
} from "../trpc";
|
} from "../trpc";
|
||||||
|
import { throwIfActionForbiddenAsync } from "./board/board-access";
|
||||||
import { throwIfCredentialsDisabled } from "./invite/checks";
|
import { throwIfCredentialsDisabled } from "./invite/checks";
|
||||||
import { nextOnboardingStepAsync } from "./onboard/onboard-queries";
|
import { nextOnboardingStepAsync } from "./onboard/onboard-queries";
|
||||||
|
|
||||||
@@ -209,6 +210,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
image: true,
|
image: true,
|
||||||
provider: true,
|
provider: true,
|
||||||
homeBoardId: true,
|
homeBoardId: true,
|
||||||
|
mobileHomeBoardId: true,
|
||||||
firstDayOfWeek: true,
|
firstDayOfWeek: true,
|
||||||
pingIconsEnabled: true,
|
pingIconsEnabled: true,
|
||||||
defaultSearchEngineId: true,
|
defaultSearchEngineId: true,
|
||||||
@@ -232,6 +234,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
image: true,
|
image: true,
|
||||||
provider: true,
|
provider: true,
|
||||||
homeBoardId: true,
|
homeBoardId: true,
|
||||||
|
mobileHomeBoardId: true,
|
||||||
firstDayOfWeek: true,
|
firstDayOfWeek: true,
|
||||||
pingIconsEnabled: true,
|
pingIconsEnabled: true,
|
||||||
defaultSearchEngineId: true,
|
defaultSearchEngineId: true,
|
||||||
@@ -373,8 +376,8 @@ export const userRouter = createTRPCRouter({
|
|||||||
})
|
})
|
||||||
.where(eq(users.id, input.userId));
|
.where(eq(users.id, input.userId));
|
||||||
}),
|
}),
|
||||||
changeHomeBoardId: protectedProcedure
|
changeHomeBoards: protectedProcedure
|
||||||
.input(convertIntersectionToZodObject(validation.user.changeHomeBoard.and(z.object({ userId: z.string() }))))
|
.input(convertIntersectionToZodObject(validation.user.changeHomeBoards.and(z.object({ userId: z.string() }))))
|
||||||
.output(z.void())
|
.output(z.void())
|
||||||
.meta({ openapi: { method: "PATCH", path: "/api/users/changeHome", tags: ["users"], protect: true } })
|
.meta({ openapi: { method: "PATCH", path: "/api/users/changeHome", tags: ["users"], protect: true } })
|
||||||
.mutation(async ({ input, ctx }) => {
|
.mutation(async ({ input, ctx }) => {
|
||||||
@@ -401,10 +404,19 @@ export const userRouter = createTRPCRouter({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only allow user to select boards they have access to
|
||||||
|
if (input.homeBoardId) {
|
||||||
|
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.homeBoardId), "view");
|
||||||
|
}
|
||||||
|
if (input.mobileHomeBoardId) {
|
||||||
|
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.mobileHomeBoardId), "view");
|
||||||
|
}
|
||||||
|
|
||||||
await ctx.db
|
await ctx.db
|
||||||
.update(users)
|
.update(users)
|
||||||
.set({
|
.set({
|
||||||
homeBoardId: input.homeBoardId,
|
homeBoardId: input.homeBoardId,
|
||||||
|
mobileHomeBoardId: input.mobileHomeBoardId,
|
||||||
})
|
})
|
||||||
.where(eq(users.id, input.userId));
|
.where(eq(users.id, input.userId));
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
import { observable } from "@trpc/server/observable";
|
import { observable } from "@trpc/server/observable";
|
||||||
|
|
||||||
import { getIntegrationKindsByCategory } from "@homarr/definitions";
|
|
||||||
import type { HealthMonitoring } from "@homarr/integrations";
|
import type { HealthMonitoring } from "@homarr/integrations";
|
||||||
import { systemInfoRequestHandler } from "@homarr/request-handler/health-monitoring";
|
import type { ProxmoxClusterInfo } from "@homarr/integrations/types";
|
||||||
|
import { clusterInfoRequestHandler, systemInfoRequestHandler } from "@homarr/request-handler/health-monitoring";
|
||||||
|
|
||||||
import { createManyIntegrationMiddleware } from "../../middlewares/integration";
|
import { createManyIntegrationMiddleware, createOneIntegrationMiddleware } from "../../middlewares/integration";
|
||||||
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
||||||
|
|
||||||
export const healthMonitoringRouter = createTRPCRouter({
|
export const healthMonitoringRouter = createTRPCRouter({
|
||||||
getHealthStatus: publicProcedure
|
getSystemHealthStatus: publicProcedure
|
||||||
.unstable_concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("healthMonitoring")))
|
.unstable_concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot"))
|
||||||
.query(async ({ ctx }) => {
|
.query(async ({ ctx }) => {
|
||||||
return await Promise.all(
|
return await Promise.all(
|
||||||
ctx.integrations.map(async (integration) => {
|
ctx.integrations.map(async (integration) => {
|
||||||
@@ -25,9 +25,8 @@ export const healthMonitoringRouter = createTRPCRouter({
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
|
subscribeSystemHealthStatus: publicProcedure
|
||||||
subscribeHealthStatus: publicProcedure
|
.unstable_concat(createManyIntegrationMiddleware("query", "openmediavault", "dashDot"))
|
||||||
.unstable_concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("healthMonitoring")))
|
|
||||||
.subscription(({ ctx }) => {
|
.subscription(({ ctx }) => {
|
||||||
return observable<{ integrationId: string; healthInfo: HealthMonitoring; timestamp: Date }>((emit) => {
|
return observable<{ integrationId: string; healthInfo: HealthMonitoring; timestamp: Date }>((emit) => {
|
||||||
const unsubscribes: (() => void)[] = [];
|
const unsubscribes: (() => void)[] = [];
|
||||||
@@ -49,4 +48,26 @@ export const healthMonitoringRouter = createTRPCRouter({
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
getClusterHealthStatus: publicProcedure
|
||||||
|
.unstable_concat(createOneIntegrationMiddleware("query", "proxmox"))
|
||||||
|
.query(async ({ ctx }) => {
|
||||||
|
const innerHandler = clusterInfoRequestHandler.handler(ctx.integration, {});
|
||||||
|
const { data } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
|
||||||
|
return data;
|
||||||
|
}),
|
||||||
|
subscribeClusterHealthStatus: publicProcedure
|
||||||
|
.unstable_concat(createOneIntegrationMiddleware("query", "proxmox"))
|
||||||
|
.subscription(({ ctx }) => {
|
||||||
|
return observable<ProxmoxClusterInfo>((emit) => {
|
||||||
|
const unsubscribes: (() => void)[] = [];
|
||||||
|
const innerHandler = clusterInfoRequestHandler.handler(ctx.integration, {});
|
||||||
|
const unsubscribe = innerHandler.subscribe((healthInfo) => {
|
||||||
|
emit.next(healthInfo);
|
||||||
|
});
|
||||||
|
unsubscribes.push(unsubscribe);
|
||||||
|
return () => {
|
||||||
|
unsubscribe();
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
@@ -1,12 +1,36 @@
|
|||||||
import type { RssFeed } from "@homarr/cron-jobs";
|
import { rssFeedsRequestHandler } from "@homarr/request-handler/rss-feeds";
|
||||||
import { createItemChannel } from "@homarr/redis";
|
import { z } from "@homarr/validation";
|
||||||
|
|
||||||
import { createOneItemMiddleware } from "../../middlewares/item";
|
|
||||||
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
||||||
|
|
||||||
export const rssFeedRouter = createTRPCRouter({
|
export const rssFeedRouter = createTRPCRouter({
|
||||||
getFeeds: publicProcedure.unstable_concat(createOneItemMiddleware("rssFeed")).query(async ({ input }) => {
|
getFeeds: publicProcedure
|
||||||
const channel = createItemChannel<RssFeed[]>(input.itemId);
|
.input(
|
||||||
return await channel.getAsync();
|
z.object({
|
||||||
}),
|
urls: z.array(z.string()),
|
||||||
|
maximumAmountPosts: z.number(),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.query(async ({ input }) => {
|
||||||
|
const rssFeeds = await Promise.all(
|
||||||
|
input.urls.map(async (url) => {
|
||||||
|
const innerHandler = rssFeedsRequestHandler.handler({
|
||||||
|
url,
|
||||||
|
count: input.maximumAmountPosts,
|
||||||
|
});
|
||||||
|
return await innerHandler.getCachedOrUpdatedDataAsync({
|
||||||
|
forceUpdate: false,
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
return rssFeeds
|
||||||
|
.flatMap((rssFeed) => rssFeed.data.entries)
|
||||||
|
.slice(0, input.maximumAmountPosts)
|
||||||
|
.sort((entryA, entryB) => {
|
||||||
|
return entryA.published && entryB.published
|
||||||
|
? new Date(entryB.published).getTime() - new Date(entryA.published).getTime()
|
||||||
|
: 0;
|
||||||
|
});
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
@@ -12,6 +12,7 @@ import type { OpenApiMeta } from "trpc-to-openapi";
|
|||||||
|
|
||||||
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 { 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 { logger } from "@homarr/log";
|
||||||
@@ -39,6 +40,7 @@ export const createTRPCContext = (opts: { headers: Headers; session: Session | n
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
session,
|
session,
|
||||||
|
deviceType: userAgent(opts.headers).device.type,
|
||||||
db,
|
db,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,13 +2,15 @@ import type { ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapte
|
|||||||
import { cookies } from "next/headers";
|
import { cookies } from "next/headers";
|
||||||
import NextAuth from "next-auth";
|
import NextAuth from "next-auth";
|
||||||
import Credentials from "next-auth/providers/credentials";
|
import Credentials from "next-auth/providers/credentials";
|
||||||
|
import { formatError } from "pretty-print-error";
|
||||||
|
|
||||||
import { db } from "@homarr/db";
|
import { db } from "@homarr/db";
|
||||||
import type { SupportedAuthProvider } from "@homarr/definitions";
|
import type { SupportedAuthProvider } from "@homarr/definitions";
|
||||||
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
import { createAdapter } from "./adapter";
|
import { createAdapter } from "./adapter";
|
||||||
import { createSessionCallback } from "./callbacks";
|
import { createSessionCallback } from "./callbacks";
|
||||||
import { env } from "./env.mjs";
|
import { env } from "./env";
|
||||||
import { createSignInEventHandler } from "./events";
|
import { createSignInEventHandler } from "./events";
|
||||||
import { createCredentialsConfiguration, createLdapConfiguration } from "./providers/credentials/credentials-provider";
|
import { createCredentialsConfiguration, createLdapConfiguration } from "./providers/credentials/credentials-provider";
|
||||||
import { EmptyNextAuthProvider } from "./providers/empty/empty-provider";
|
import { EmptyNextAuthProvider } from "./providers/empty/empty-provider";
|
||||||
@@ -26,15 +28,16 @@ export const createConfiguration = (
|
|||||||
const adapter = createAdapter(db, provider);
|
const adapter = createAdapter(db, provider);
|
||||||
return NextAuth({
|
return NextAuth({
|
||||||
logger: {
|
logger: {
|
||||||
error: (code, ...message) => {
|
error: (error) => {
|
||||||
// Remove the big error message for failed login attempts
|
// Remove the big error message for failed login attempts
|
||||||
// as it is not useful for the user.
|
// as it is not useful for the user.
|
||||||
if (code.name === "CredentialsSignin") {
|
if (error.name === "CredentialsSignin") {
|
||||||
console.warn("The login attempt of a user was not successful.");
|
logger.warn("The login attempt of a user was not successful.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.error(code, ...message);
|
logger.error(formatError(error));
|
||||||
|
logger.error(formatError(error.cause));
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
trustHost: true,
|
trustHost: true,
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { createEnv } from "@t3-oss/env-nextjs";
|
import { createEnv } from "@t3-oss/env-nextjs";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const trueStrings = ["1", "yes", "t", "true"];
|
import { createBooleanSchema, createDurationSchema, shouldSkipEnvValidation } from "@homarr/common/env-validation";
|
||||||
const falseStrings = ["0", "no", "f", "false"];
|
import { supportedAuthProviders } from "@homarr/definitions";
|
||||||
|
|
||||||
const supportedAuthProviders = ["credentials", "oidc", "ldap"];
|
|
||||||
const authProvidersSchema = z
|
const authProvidersSchema = z
|
||||||
.string()
|
.string()
|
||||||
.min(1)
|
.min(1)
|
||||||
@@ -14,7 +13,7 @@ const authProvidersSchema = z
|
|||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
.split(",")
|
.split(",")
|
||||||
.filter((provider) => {
|
.filter((provider) => {
|
||||||
if (supportedAuthProviders.includes(provider)) return true;
|
if (supportedAuthProviders.some((supportedProvider) => supportedProvider === provider)) return true;
|
||||||
else if (!provider)
|
else if (!provider)
|
||||||
console.log("One or more of the entries for AUTH_PROVIDER could not be parsed and/or returned null.");
|
console.log("One or more of the entries for AUTH_PROVIDER could not be parsed and/or returned null.");
|
||||||
else console.log(`The value entered for AUTH_PROVIDER "${provider}" is incorrect.`);
|
else console.log(`The value entered for AUTH_PROVIDER "${provider}" is incorrect.`);
|
||||||
@@ -23,41 +22,7 @@ const authProvidersSchema = z
|
|||||||
)
|
)
|
||||||
.default("credentials");
|
.default("credentials");
|
||||||
|
|
||||||
const createDurationSchema = (defaultValue) =>
|
const skipValidation = shouldSkipEnvValidation();
|
||||||
z
|
|
||||||
.string()
|
|
||||||
.regex(/^\d+[smhd]?$/)
|
|
||||||
.default(defaultValue)
|
|
||||||
.transform((duration) => {
|
|
||||||
const lastChar = duration[duration.length - 1];
|
|
||||||
if (!isNaN(Number(lastChar))) {
|
|
||||||
return Number(defaultValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
const multipliers = {
|
|
||||||
s: 1,
|
|
||||||
m: 60,
|
|
||||||
h: 60 * 60,
|
|
||||||
d: 60 * 60 * 24,
|
|
||||||
};
|
|
||||||
const numberDuration = Number(duration.slice(0, -1));
|
|
||||||
const multiplier = multipliers[lastChar];
|
|
||||||
|
|
||||||
return numberDuration * multiplier;
|
|
||||||
});
|
|
||||||
|
|
||||||
const booleanSchema = z
|
|
||||||
.string()
|
|
||||||
.default("false")
|
|
||||||
.transform((value, ctx) => {
|
|
||||||
const normalized = value.trim().toLowerCase();
|
|
||||||
if (trueStrings.includes(normalized)) return true;
|
|
||||||
if (falseStrings.includes(normalized)) return false;
|
|
||||||
|
|
||||||
throw new Error(`Invalid boolean value for ${ctx.path.join(".")}`);
|
|
||||||
});
|
|
||||||
|
|
||||||
const skipValidation = Boolean(process.env.CI) || Boolean(process.env.SKIP_ENV_VALIDATION);
|
|
||||||
const authProviders = skipValidation ? [] : authProvidersSchema.parse(process.env.AUTH_PROVIDERS);
|
const authProviders = skipValidation ? [] : authProvidersSchema.parse(process.env.AUTH_PROVIDERS);
|
||||||
|
|
||||||
export const env = createEnv({
|
export const env = createEnv({
|
||||||
@@ -71,7 +36,7 @@ export const env = createEnv({
|
|||||||
AUTH_OIDC_CLIENT_ID: z.string().min(1),
|
AUTH_OIDC_CLIENT_ID: z.string().min(1),
|
||||||
AUTH_OIDC_CLIENT_SECRET: z.string().min(1),
|
AUTH_OIDC_CLIENT_SECRET: z.string().min(1),
|
||||||
AUTH_OIDC_CLIENT_NAME: z.string().min(1).default("OIDC"),
|
AUTH_OIDC_CLIENT_NAME: z.string().min(1).default("OIDC"),
|
||||||
AUTH_OIDC_AUTO_LOGIN: booleanSchema,
|
AUTH_OIDC_AUTO_LOGIN: createBooleanSchema(false),
|
||||||
AUTH_OIDC_SCOPE_OVERWRITE: z.string().min(1).default("openid email profile groups"),
|
AUTH_OIDC_SCOPE_OVERWRITE: z.string().min(1).default("openid email profile groups"),
|
||||||
AUTH_OIDC_GROUPS_ATTRIBUTE: z.string().default("groups"), // Is used in the signIn event to assign the correct groups, key is from object of decoded id_token
|
AUTH_OIDC_GROUPS_ATTRIBUTE: z.string().default("groups"), // Is used in the signIn event to assign the correct groups, key is from object of decoded id_token
|
||||||
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: z.string().optional(),
|
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: z.string().optional(),
|
||||||
@@ -121,4 +86,5 @@ export const env = createEnv({
|
|||||||
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: process.env.AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE,
|
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: process.env.AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE,
|
||||||
},
|
},
|
||||||
skipValidation,
|
skipValidation,
|
||||||
|
emptyStringAsUndefined: true,
|
||||||
});
|
});
|
||||||
@@ -8,7 +8,7 @@ import { groupMembers, groups, users } from "@homarr/db/schema";
|
|||||||
import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions";
|
import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions";
|
||||||
import { logger } from "@homarr/log";
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
import { env } from "./env.mjs";
|
import { env } from "./env";
|
||||||
import { extractProfileName } from "./providers/oidc/oidc-provider";
|
import { extractProfileName } from "./providers/oidc/oidc-provider";
|
||||||
|
|
||||||
export const createSignInEventHandler = (db: Database): Exclude<NextAuthConfig["events"], undefined>["signIn"] => {
|
export const createSignInEventHandler = (db: Database): Exclude<NextAuthConfig["events"], undefined>["signIn"] => {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
"./client": "./client.ts",
|
"./client": "./client.ts",
|
||||||
"./server": "./server.ts",
|
"./server": "./server.ts",
|
||||||
"./shared": "./shared.ts",
|
"./shared": "./shared.ts",
|
||||||
"./env.mjs": "./env.mjs"
|
"./env": "./env.ts"
|
||||||
},
|
},
|
||||||
"main": "./index.ts",
|
"main": "./index.ts",
|
||||||
"types": "./index.ts",
|
"types": "./index.ts",
|
||||||
@@ -34,8 +34,9 @@
|
|||||||
"bcrypt": "^5.1.1",
|
"bcrypt": "^5.1.1",
|
||||||
"cookies": "^0.9.1",
|
"cookies": "^0.9.1",
|
||||||
"ldapts": "7.3.1",
|
"ldapts": "7.3.1",
|
||||||
"next": "15.1.4",
|
"next": "15.1.6",
|
||||||
"next-auth": "5.0.0-beta.25",
|
"next-auth": "5.0.0-beta.25",
|
||||||
|
"pretty-print-error": "^1.1.2",
|
||||||
"react": "19.0.0",
|
"react": "19.0.0",
|
||||||
"react-dom": "19.0.0"
|
"react-dom": "19.0.0"
|
||||||
},
|
},
|
||||||
@@ -45,7 +46,7 @@
|
|||||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
"@types/bcrypt": "5.0.2",
|
"@types/bcrypt": "5.0.2",
|
||||||
"@types/cookies": "0.9.0",
|
"@types/cookies": "0.9.0",
|
||||||
"eslint": "^9.17.0",
|
"eslint": "^9.18.0",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { SupportedAuthProvider } from "@homarr/definitions";
|
import type { SupportedAuthProvider } from "@homarr/definitions";
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
import { env } from "../env";
|
||||||
|
|
||||||
export const isProviderEnabled = (provider: SupportedAuthProvider) => {
|
export const isProviderEnabled = (provider: SupportedAuthProvider) => {
|
||||||
// The question mark is placed there because isProviderEnabled is called during static build of about page
|
// The question mark is placed there because isProviderEnabled is called during static build of about page
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { CredentialsSignin } from "@auth/core/errors";
|
import { CredentialsSignin } from "@auth/core/errors";
|
||||||
|
|
||||||
|
import { extractErrorMessage } from "@homarr/common";
|
||||||
import type { Database, InferInsertModel } from "@homarr/db";
|
import type { Database, InferInsertModel } from "@homarr/db";
|
||||||
import { and, createId, eq } from "@homarr/db";
|
import { and, createId, eq } from "@homarr/db";
|
||||||
import { users } from "@homarr/db/schema";
|
import { users } from "@homarr/db/schema";
|
||||||
@@ -7,7 +8,7 @@ import { logger } from "@homarr/log";
|
|||||||
import type { validation } from "@homarr/validation";
|
import type { validation } from "@homarr/validation";
|
||||||
import { z } from "@homarr/validation";
|
import { z } from "@homarr/validation";
|
||||||
|
|
||||||
import { env } from "../../../env.mjs";
|
import { env } from "../../../env";
|
||||||
import { LdapClient } from "../ldap-client";
|
import { LdapClient } from "../ldap-client";
|
||||||
|
|
||||||
export const authorizeWithLdapCredentialsAsync = async (
|
export const authorizeWithLdapCredentialsAsync = async (
|
||||||
@@ -21,8 +22,8 @@ export const authorizeWithLdapCredentialsAsync = async (
|
|||||||
distinguishedName: env.AUTH_LDAP_BIND_DN,
|
distinguishedName: env.AUTH_LDAP_BIND_DN,
|
||||||
password: env.AUTH_LDAP_BIND_PASSWORD,
|
password: env.AUTH_LDAP_BIND_PASSWORD,
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch((error) => {
|
||||||
logger.error("Failed to connect to LDAP server");
|
logger.error(`Failed to connect to LDAP server ${extractErrorMessage(error)}`);
|
||||||
throw new CredentialsSignin();
|
throw new CredentialsSignin();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { Client } from "ldapts";
|
|||||||
|
|
||||||
import { objectEntries } from "@homarr/common";
|
import { objectEntries } from "@homarr/common";
|
||||||
|
|
||||||
import { env } from "../../env.mjs";
|
import { env } from "../../env";
|
||||||
|
|
||||||
export interface BindOptions {
|
export interface BindOptions {
|
||||||
distinguishedName: string;
|
distinguishedName: string;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { Provider } from "next-auth/providers";
|
import type { Provider } from "next-auth/providers";
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
import { env } from "../env";
|
||||||
|
|
||||||
export const filterProviders = (providers: Exclude<Provider, () => unknown>[]) => {
|
export const filterProviders = (providers: Exclude<Provider, () => unknown>[]) => {
|
||||||
// During build this will be undefined, so we default to an empty array
|
// During build this will be undefined, so we default to an empty array
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import type { ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapte
|
|||||||
import type { OIDCConfig } from "@auth/core/providers";
|
import type { OIDCConfig } from "@auth/core/providers";
|
||||||
import type { Profile } from "@auth/core/types";
|
import type { Profile } from "@auth/core/types";
|
||||||
|
|
||||||
import { env } from "../../env.mjs";
|
import { env } from "../../env";
|
||||||
import { createRedirectUri } from "../../redirect";
|
import { createRedirectUri } from "../../redirect";
|
||||||
|
|
||||||
export const OidcProvider = (headers: ReadonlyHeaders | null): OIDCConfig<Profile> => ({
|
export const OidcProvider = (headers: ReadonlyHeaders | null): OIDCConfig<Profile> => ({
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { createDb } from "@homarr/db/test";
|
|||||||
import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization";
|
import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization";
|
||||||
import * as ldapClient from "../credentials/ldap-client";
|
import * as ldapClient from "../credentials/ldap-client";
|
||||||
|
|
||||||
vi.mock("../../env.mjs", () => ({
|
vi.mock("../../env", () => ({
|
||||||
env: {
|
env: {
|
||||||
AUTH_LDAP_BIND_DN: "bind_dn",
|
AUTH_LDAP_BIND_DN: "bind_dn",
|
||||||
AUTH_LDAP_BIND_PASSWORD: "bind_password",
|
AUTH_LDAP_BIND_PASSWORD: "bind_password",
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions";
|
|||||||
|
|
||||||
import { createSignInEventHandler } from "../events";
|
import { createSignInEventHandler } from "../events";
|
||||||
|
|
||||||
vi.mock("../env.mjs", () => {
|
vi.mock("../env", () => {
|
||||||
return {
|
return {
|
||||||
env: {
|
env: {
|
||||||
AUTH_OIDC_GROUPS_ATTRIBUTE: "someRandomGroupsKey",
|
AUTH_OIDC_GROUPS_ATTRIBUTE: "someRandomGroupsKey",
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import baseConfig from "@homarr/eslint-config/base";
|
||||||
|
|
||||||
|
/** @type {import('typescript-eslint').Config} */
|
||||||
|
export default [
|
||||||
|
{
|
||||||
|
ignores: [],
|
||||||
|
},
|
||||||
|
...baseConfig,
|
||||||
|
];
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"name": "@homarr/certificates",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"private": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"type": "module",
|
||||||
|
"exports": {
|
||||||
|
"./server": "./src/server.ts"
|
||||||
|
},
|
||||||
|
"typesVersions": {
|
||||||
|
"*": {
|
||||||
|
"*": [
|
||||||
|
"src/*"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"clean": "rm -rf .turbo node_modules",
|
||||||
|
"format": "prettier --check . --ignore-path ../../.gitignore",
|
||||||
|
"lint": "eslint",
|
||||||
|
"typecheck": "tsc --noEmit"
|
||||||
|
},
|
||||||
|
"prettier": "@homarr/prettier-config",
|
||||||
|
"dependencies": {
|
||||||
|
"@homarr/common": "workspace:^0.1.0",
|
||||||
|
"undici": "7.3.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||||
|
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||||
|
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||||
|
"eslint": "^9.18.0",
|
||||||
|
"typescript": "^5.7.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
import fsSync from "node:fs";
|
||||||
|
import fs from "node:fs/promises";
|
||||||
|
import { Agent } from "node:https";
|
||||||
|
import path from "node:path";
|
||||||
|
import { rootCertificates } from "node:tls";
|
||||||
|
import axios from "axios";
|
||||||
|
import { fetch } from "undici";
|
||||||
|
|
||||||
|
import { LoggingAgent } from "@homarr/common/server";
|
||||||
|
|
||||||
|
const getCertificateFolder = () => {
|
||||||
|
return process.env.NODE_ENV === "production"
|
||||||
|
? path.join("/appdata", "trusted-certificates")
|
||||||
|
: process.env.LOCAL_CERTIFICATE_PATH;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const loadCustomRootCertificatesAsync = async () => {
|
||||||
|
const folder = getCertificateFolder();
|
||||||
|
|
||||||
|
if (!folder) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!fsSync.existsSync(folder)) {
|
||||||
|
await fs.mkdir(folder, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
const dirContent = await fs.readdir(folder);
|
||||||
|
return await Promise.all(
|
||||||
|
dirContent
|
||||||
|
.filter((file) => file.endsWith(".crt"))
|
||||||
|
.map(async (file) => ({
|
||||||
|
content: await fs.readFile(path.join(folder, file), "utf8"),
|
||||||
|
fileName: file,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const removeCustomRootCertificateAsync = async (fileName: string) => {
|
||||||
|
const folder = getCertificateFolder();
|
||||||
|
if (!folder) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await fs.rm(path.join(folder, fileName));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const addCustomRootCertificateAsync = async (fileName: string, content: string) => {
|
||||||
|
const folder = getCertificateFolder();
|
||||||
|
if (!folder) {
|
||||||
|
throw new Error(
|
||||||
|
"When you want to use custom certificates locally you need to set LOCAL_CERTIFICATE_PATH to an absolute path",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fileName.includes("/")) {
|
||||||
|
throw new Error("Invalid file name");
|
||||||
|
}
|
||||||
|
|
||||||
|
await fs.writeFile(path.join(folder, fileName), content);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const createCertificateAgentAsync = async () => {
|
||||||
|
const customCertificates = await loadCustomRootCertificatesAsync();
|
||||||
|
return new LoggingAgent({
|
||||||
|
connect: {
|
||||||
|
ca: rootCertificates.concat(customCertificates.map((cert) => cert.content)),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const createAxiosCertificateInstanceAsync = async () => {
|
||||||
|
const customCertificates = await loadCustomRootCertificatesAsync();
|
||||||
|
return axios.create({
|
||||||
|
httpsAgent: new Agent({
|
||||||
|
ca: rootCertificates.concat(customCertificates.map((cert) => cert.content)),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const fetchWithTrustedCertificatesAsync: typeof fetch = async (url, options) => {
|
||||||
|
const agent = await createCertificateAgentAsync();
|
||||||
|
return fetch(url, {
|
||||||
|
...options,
|
||||||
|
dispatcher: agent,
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"extends": "@homarr/tsconfig/base.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
|
||||||
|
},
|
||||||
|
"include": ["*.ts", "src"],
|
||||||
|
"exclude": ["node_modules"]
|
||||||
|
}
|
||||||
@@ -33,7 +33,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.17.0",
|
"eslint": "^9.18.0",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,6 +2,8 @@ import { randomBytes } from "crypto";
|
|||||||
import { createEnv } from "@t3-oss/env-nextjs";
|
import { createEnv } from "@t3-oss/env-nextjs";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import { shouldSkipEnvValidation } from "./src/env-validation";
|
||||||
|
|
||||||
const errorSuffix = `, please generate a 64 character secret in hex format or use the following: "${randomBytes(32).toString("hex")}"`;
|
const errorSuffix = `, please generate a 64 character secret in hex format or use the following: "${randomBytes(32).toString("hex")}"`;
|
||||||
|
|
||||||
export const env = createEnv({
|
export const env = createEnv({
|
||||||
@@ -23,6 +25,6 @@ export const env = createEnv({
|
|||||||
runtimeEnv: {
|
runtimeEnv: {
|
||||||
SECRET_ENCRYPTION_KEY: process.env.SECRET_ENCRYPTION_KEY,
|
SECRET_ENCRYPTION_KEY: process.env.SECRET_ENCRYPTION_KEY,
|
||||||
},
|
},
|
||||||
skipValidation:
|
skipValidation: shouldSkipEnvValidation(),
|
||||||
Boolean(process.env.CI) || Boolean(process.env.SKIP_ENV_VALIDATION) || process.env.npm_lifecycle_event === "lint",
|
emptyStringAsUndefined: true,
|
||||||
});
|
});
|
||||||
@@ -9,7 +9,8 @@
|
|||||||
"./types": "./src/types.ts",
|
"./types": "./src/types.ts",
|
||||||
"./server": "./src/server.ts",
|
"./server": "./src/server.ts",
|
||||||
"./client": "./src/client.ts",
|
"./client": "./src/client.ts",
|
||||||
"./env.mjs": "./env.mjs"
|
"./env": "./env.ts",
|
||||||
|
"./env-validation": "./src/env-validation.ts"
|
||||||
},
|
},
|
||||||
"typesVersions": {
|
"typesVersions": {
|
||||||
"*": {
|
"*": {
|
||||||
@@ -28,15 +29,17 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@homarr/log": "workspace:^0.1.0",
|
"@homarr/log": "workspace:^0.1.0",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.13",
|
||||||
"next": "15.1.4",
|
"next": "15.1.6",
|
||||||
"react": "19.0.0",
|
"react": "19.0.0",
|
||||||
"react-dom": "19.0.0"
|
"react-dom": "19.0.0",
|
||||||
|
"undici": "7.3.0",
|
||||||
|
"zod": "^3.24.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.17.0",
|
"eslint": "^9.18.0",
|
||||||
"typescript": "^5.7.3"
|
"typescript": "^5.7.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import crypto from "crypto";
|
import crypto from "crypto";
|
||||||
|
|
||||||
import { env } from "../env.mjs";
|
import { env } from "../env";
|
||||||
|
|
||||||
const algorithm = "aes-256-cbc"; //Using AES encryption
|
const algorithm = "aes-256-cbc"; //Using AES encryption
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
const trueStrings = ["1", "yes", "t", "true"];
|
||||||
|
const falseStrings = ["0", "no", "f", "false"];
|
||||||
|
|
||||||
|
export const createBooleanSchema = (defaultValue: boolean) =>
|
||||||
|
z
|
||||||
|
.string()
|
||||||
|
.default(defaultValue.toString())
|
||||||
|
.transform((value, ctx) => {
|
||||||
|
const normalized = value.trim().toLowerCase();
|
||||||
|
if (trueStrings.includes(normalized)) return true;
|
||||||
|
if (falseStrings.includes(normalized)) return false;
|
||||||
|
|
||||||
|
throw new Error(`Invalid boolean value for ${ctx.path.join(".")}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
export const createDurationSchema = (defaultValue: `${number}${"s" | "m" | "h" | "d"}`) =>
|
||||||
|
z
|
||||||
|
.string()
|
||||||
|
.regex(/^\d+[smhd]?$/)
|
||||||
|
.default(defaultValue)
|
||||||
|
.transform((duration) => {
|
||||||
|
const lastChar = duration[duration.length - 1] as "s" | "m" | "h" | "d";
|
||||||
|
if (!isNaN(Number(lastChar))) {
|
||||||
|
return Number(defaultValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
const multipliers = {
|
||||||
|
s: 1,
|
||||||
|
m: 60,
|
||||||
|
h: 60 * 60,
|
||||||
|
d: 60 * 60 * 24,
|
||||||
|
};
|
||||||
|
const numberDuration = Number(duration.slice(0, -1));
|
||||||
|
const multiplier = multipliers[lastChar];
|
||||||
|
|
||||||
|
return numberDuration * multiplier;
|
||||||
|
});
|
||||||
|
|
||||||
|
export const shouldSkipEnvValidation = () =>
|
||||||
|
Boolean(process.env.CI) || Boolean(process.env.SKIP_ENV_VALIDATION) || process.env.npm_lifecycle_event === "lint";
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import type { Dispatcher } from "undici";
|
||||||
|
import { Agent } from "undici";
|
||||||
|
|
||||||
|
import { logger } from "@homarr/log";
|
||||||
|
|
||||||
|
export class LoggingAgent extends Agent {
|
||||||
|
constructor(...props: ConstructorParameters<typeof Agent>) {
|
||||||
|
super(...props);
|
||||||
|
}
|
||||||
|
|
||||||
|
dispatch(options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean {
|
||||||
|
const url = new URL(`${options.origin as string}${options.path}`);
|
||||||
|
|
||||||
|
// The below code should prevent sensitive data from being logged as
|
||||||
|
// some integrations use query parameters for auth
|
||||||
|
url.searchParams.forEach((value, key) => {
|
||||||
|
if (value === "") return; // Skip empty values
|
||||||
|
if (/^-?\d{1,12}$/.test(value)) return; // Skip small numbers
|
||||||
|
if (value === "true" || value === "false") return; // Skip boolean values
|
||||||
|
if (/^[a-zA-Z]{1,12}$/.test(value)) return; // Skip short strings
|
||||||
|
if (/^\d{4}-\d{2}-\d{2}$/.test(value)) return; // Skip dates
|
||||||
|
if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value)) return; // Skip date times
|
||||||
|
|
||||||
|
url.searchParams.set(key, "REDACTED");
|
||||||
|
});
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
`Dispatching request ${url.toString().replaceAll("=&", "&")} (${Object.keys(options.headers ?? {}).length} headers)`,
|
||||||
|
);
|
||||||
|
return super.dispatch(options, handler);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,2 +1,4 @@
|
|||||||
export * from "./security";
|
export * from "./security";
|
||||||
export * from "./encryption";
|
export * from "./encryption";
|
||||||
|
export * from "./user-agent";
|
||||||
|
export * from "./fetch-agent";
|
||||||
Loaded 100 of 252 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user