Ryan/drop
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop.git synced 2025-11-10 04:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Server attempts to create setup executable and finds undefined #83 (#84)

Browse Source
This commit is contained in:
DecDuck
2025-06-06 09:18:58 +10:00
committed by GitHub
parent 9e929ddf98
commit c3005813a2
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/api/v1/admin/import/version/index.post.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype"; import { type } from "arktype";
import { readDropValidatedBody } from "~/server/arktype"; import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls"; import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database"; import prisma from "~/server/internal/db/database";
import libraryManager from "~/server/internal/library"; import libraryManager from "~/server/internal/library";
@ -17,7 +17,7 @@ const ImportVersion = type({
onlySetup: "boolean = false", onlySetup: "boolean = false",
delta: "boolean = false", delta: "boolean = false",
umuId: "string = ''", umuId: "string = ''",
}); }).configure(throwingArktype);
export default defineEventHandler(async (h3) => { export default defineEventHandler(async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, ["import:version:new"]); const allowed = await aclManager.allowSystemACL(h3, ["import:version:new"]);
@ -62,7 +62,7 @@ export default defineEventHandler(async (h3) => {
if (!delta && !launch) if (!delta && !launch)
throw createError({ throw createError({
statusCode: 400, statusCode: 400,
statusMessage: "Startup executable is required for non-update versions", statusMessage: "Launch executable is required for non-update versions",
}); });
} }

15
server/arktype.ts
View File

@ -19,9 +19,20 @@ export async function readDropValidatedBody<T>(
event: H3Event, event: H3Event,
validate: (data: object) => T, validate: (data: object) => T,
): Promise<T> { ): Promise<T> {
const _body = await readBody(event); const body = await readBody(event);
try { try {
return validate(_body); // Delete all values that are 'null'
if (typeof body === "object" && !Array.isArray(body) && body !== null) {
for (const [key, value] of Object.entries(body) as Array<
[string, unknown]
>) {
if (value === null) {
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete body[key];
}
}
}
return validate(body);
} catch (e) { } catch (e) {
const t = await useTranslation(event); const t = await useTranslation(event);