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

Custom readValidatedBody util to return more specific error #69 (#78)

Browse Source 
* feat: add readDropValidatedBody w/ special handler for ArkErrors

* fix: lint
This commit is contained in:
DecDuck
2025-06-03 17:40:41 +10:00
committed by GitHub
parent f264fd0971
commit 4f8ea3e4ff
11 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/api/v1/admin/auth/invitation/index.delete.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
@ -15,7 +15,7 @@ export default defineEventHandler<{
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, DeleteInvite);
const body = await readDropValidatedBody(h3, DeleteInvite);
await prisma.invitation.delete({ where: { id: body.id } });
return {};

4
server/api/v1/admin/auth/invitation/index.post.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
@ -18,7 +18,7 @@ export default defineEventHandler<{
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, CreateInvite);
const body = await readDropValidatedBody(h3, CreateInvite);
const invitation = await prisma.invitation.create({
data: body,

4
server/api/v1/admin/game/image/index.delete.ts
View File

@ -2,7 +2,7 @@ import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
import objectHandler from "~/server/internal/objects";
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
const DeleteGameImage = type({
gameId: "string",
@ -15,7 +15,7 @@ export default defineEventHandler<{
const allowed = await aclManager.allowSystemACL(h3, ["game:image:delete"]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, DeleteGameImage);
const body = await readDropValidatedBody(h3, DeleteGameImage);
const gameId = body.gameId;
const imageId = body.imageId;

4
server/api/v1/admin/game/version/index.delete.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
@ -15,7 +15,7 @@ export default defineEventHandler<{ body: typeof DeleteVersion }>(
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, DeleteVersion);
const body = await readDropValidatedBody(h3, DeleteVersion);
const gameId = body.id.toString();
const version = body.versionName.toString();

4
server/api/v1/admin/game/version/index.patch.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
@ -15,7 +15,7 @@ export default defineEventHandler<{ body: typeof UpdateVersionOrder }>(
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, UpdateVersionOrder);
const body = await readDropValidatedBody(h3, UpdateVersionOrder);
const gameId = body.id;
// We expect an array of the version names for this game
const versions = body.versions;

4
server/api/v1/admin/import/game/index.post.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import libraryManager from "~/server/internal/library";
import metadataHandler from "~/server/internal/metadata";
@ -19,7 +19,7 @@ export default defineEventHandler<{ body: typeof ImportGameBody.infer }>(
const allowed = await aclManager.allowSystemACL(h3, ["import:game:new"]);
if (!allowed) throw createError({ statusCode: 403 });
const { library, path, metadata } = await readValidatedBody(
const { library, path, metadata } = await readDropValidatedBody(
h3,
ImportGameBody,
);

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

@ -1,4 +1,5 @@
import { type } from "arktype";
import { readDropValidatedBody } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
import libraryManager from "~/server/internal/library";
@ -33,7 +34,7 @@ export default defineEventHandler(async (h3) => {
onlySetup,
delta,
umuId,
} = await readValidatedBody(h3, ImportVersion);
} = await readDropValidatedBody(h3, ImportVersion);
const platformParsed = parsePlatform(platform);
if (!platformParsed)

4
server/api/v1/admin/library/sources/index.delete.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
@ -14,7 +14,7 @@ export default defineEventHandler<{ body: typeof DeleteLibrarySource.infer }>(
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, DeleteLibrarySource);
const body = await readDropValidatedBody(h3, DeleteLibrarySource);
return await prisma.library.delete({
where: {

4
server/api/v1/admin/library/sources/index.patch.ts
View File

@ -1,5 +1,5 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
import libraryManager from "~/server/internal/library";
@ -19,7 +19,7 @@ export default defineEventHandler<{ body: typeof UpdateLibrarySource.infer }>(
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, UpdateLibrarySource);
const body = await readDropValidatedBody(h3, UpdateLibrarySource);
const source = await prisma.library.findUnique({ where: { id: body.id } });
if (!source)

4
server/api/v1/admin/library/sources/index.post.ts
View File

@ -1,7 +1,7 @@
import { type } from "arktype";
import { randomUUID } from "crypto";
import { LibraryBackend } from "~/prisma/client";
import { throwingArktype } from "~/server/arktype";
import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
import libraryManager from "~/server/internal/library";
@ -21,7 +21,7 @@ export default defineEventHandler<{ body: typeof CreateLibrarySource.infer }>(
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readValidatedBody(h3, CreateLibrarySource);
const body = await readDropValidatedBody(h3, CreateLibrarySource);
const backend = Object.values(LibraryBackend).find(
(e) => e == body.backend,
);

23
server/arktype.ts
View File

@ -1,4 +1,6 @@
import { ArkErrors } from "arktype";
import { configure } from "arktype/config";
import type { H3Event } from "h3";
export const throwingArktype = configure({
onFail: (errors) => errors.throw(),
@ -12,3 +14,24 @@ declare global {
onFail: typeof throwingArktype.onFail;
}
}
export async function readDropValidatedBody<T>(
event: H3Event,
validate: (data: object) => T,
): Promise<T> {
const _body = await readBody(event);
try {
return validate(_body);
} catch (e) {
if (e instanceof ArkErrors) {
throw createError({
statusCode: 400,
statusMessage: `Invalid request body: ${e.summary}`,
});
}
throw createError({
statusCode: 400,
statusMessage: `Invalid request body: ${e}`,
});
}
}