Merge remote-tracking branch 'origin/main' into fix/private-notification-origins

# Conflicts:
#	src/app/api/settings/ntfy/route.ts
#	src/app/api/settings/webhook/route.ts
This commit is contained in:
Marc-André Bombeck committed 2026-09-10 18:07:55 +02:00
commit 71175290af
255 files changed
+12654 -1141

No files matched your search

+13 -2
View File
@@ -1,5 +1,11 @@
import { prisma } from "@/lib/db";
import { apiSuccess, apiError, safeJson } from "@/lib/api-response";
import {
apiError,
apiSuccess,
apiValidationError,
safeJson,
sanitiseZodIssues,
} from "@/lib/api-response";
import {
emailSettingsSchema,
notificationChannelEnabledSchema,
@@ -102,7 +108,12 @@ export const PUT = apiHandler(async (request: NextRequest) => {
}
const parsed = emailSettingsSchema.safeParse(body);
if (!parsed.success) return apiError("Invalid data", 422);
if (!parsed.success)
return apiValidationError(
"Invalid data",
sanitiseZodIssues(parsed.error.issues),
422,
);
const { recipient, enabled } = parsed.data;
+12 -3
View File
@@ -1,5 +1,11 @@
import { prisma } from "@/lib/db";
import { apiSuccess, apiError, safeJson } from "@/lib/api-response";
import {
apiError,
apiSuccess,
apiValidationError,
safeJson,
sanitiseZodIssues,
} from "@/lib/api-response";
import {
notificationChannelEnabledSchema,
ntfySettingsSchemaWith,
@@ -135,6 +141,9 @@ export const PUT = apiHandler(async (request: NextRequest) => {
const parsed = ntfySettingsSchema.safeParse(body);
if (!parsed.success) {
// Every shape refusal carries the issue list; the private-origin case
// adds the code and a message naming the operator's lever (#947).
const issues = sanitiseZodIssues(parsed.error.issues);
const candidate = (body as { serverUrl?: unknown } | null)?.serverUrl;
if (
typeof candidate === "string" &&
@@ -145,11 +154,11 @@ export const PUT = apiHandler(async (request: NextRequest) => {
action: { name: "settings.ntfy.update" },
meta: { refused: PRIVATE_ORIGIN_NOT_APPROVED },
});
return apiError(PRIVATE_ORIGIN_REFUSAL, 422, {
return apiValidationError(PRIVATE_ORIGIN_REFUSAL, issues, 422, {
errorCode: PRIVATE_ORIGIN_NOT_APPROVED,
});
}
return apiError("Invalid data", 422);
return apiValidationError("Invalid data", issues, 422);
}
const { serverUrl, topic, authToken, enabled } = parsed.data;
+12 -2
View File
@@ -1,5 +1,11 @@
import { prisma } from "@/lib/db";
import { apiSuccess, apiError, safeJson } from "@/lib/api-response";
import {
apiError,
apiSuccess,
apiValidationError,
safeJson,
sanitiseZodIssues,
} from "@/lib/api-response";
import { decrypt, encrypt } from "@/lib/crypto";
import { deleteTelegramWebhook, setTelegramWebhook } from "@/lib/telegram";
import { telegramSettingsSchema } from "@/lib/validations/telegram";
@@ -171,7 +177,11 @@ export const PUT = apiHandler(async (request: NextRequest) => {
const result = z.safeParse(telegramSettingsSchema, body);
if (!result.success) {
return apiError("Invalid input", 422);
return apiValidationError(
"Invalid input",
sanitiseZodIssues(result.error.issues),
422,
);
}
const { botToken, chatId, enabled } = result.data;
+12 -3
View File
@@ -1,5 +1,11 @@
import { prisma } from "@/lib/db";
import { apiSuccess, apiError, safeJson } from "@/lib/api-response";
import {
apiError,
apiSuccess,
apiValidationError,
safeJson,
sanitiseZodIssues,
} from "@/lib/api-response";
import {
notificationChannelEnabledSchema,
webhookSettingsSchemaWith,
@@ -129,6 +135,9 @@ export const PUT = apiHandler(async (request: NextRequest) => {
const parsed = webhookSettingsSchema.safeParse(body);
if (!parsed.success) {
// Every shape refusal carries the issue list; the private-origin case
// adds the code and a message naming the operator's lever (#947).
const issues = sanitiseZodIssues(parsed.error.issues);
const candidate = (body as { url?: unknown } | null)?.url;
if (
typeof candidate === "string" &&
@@ -139,11 +148,11 @@ export const PUT = apiHandler(async (request: NextRequest) => {
action: { name: "settings.webhook.update" },
meta: { refused: PRIVATE_ORIGIN_NOT_APPROVED },
});
return apiError(PRIVATE_ORIGIN_REFUSAL, 422, {
return apiValidationError(PRIVATE_ORIGIN_REFUSAL, issues, 422, {
errorCode: PRIVATE_ORIGIN_NOT_APPROVED,
});
}
return apiError("Invalid data", 422);
return apiValidationError("Invalid data", issues, 422);
}
const { url, headerName, headerValue, enabled } = parsed.data;