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

chore: move more admin over to arktype validators

Browse Source
This commit is contained in:
DecDuck
2025-05-30 13:17:21 +10:00
parent 83a9b22d82
commit 85edc4cca2
16 changed files with 193 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -34,3 +34,4 @@ deploy-template/*
# generated prisma client
/prisma/client
/prisma/validate

1
nuxt.config.ts
View File

@ -79,6 +79,7 @@ export default defineNuxtConfig({
openAPI: {
// tracking for dynamic openapi schema https://github.com/nitrojs/nitro/issues/2974
// create body from types: https://github.com/nitrojs/nitro/issues/3275
meta: {
title: "Drop",
description:

1
package.json
View File

@ -19,6 +19,7 @@
"@drop-oss/droplet": "^0.7.2",
"@headlessui/vue": "^1.7.23",
"@heroicons/vue": "^2.1.5",
"@lobomfz/prismark": "0.0.3",
"@nuxt/fonts": "^0.11.0",
"@nuxt/image": "^1.10.0",
"@prisma/client": "^6.7.0",

8
pages/auth/register.vue
View File

@ -211,17 +211,19 @@ const confirmPassword = ref(undefined);
const emailValidator = type("string.email");
const validEmail = computed(
() => !(emailValidator(email.value) instanceof type.errors),
() => !((emailValidator(email.value) as unknown) instanceof type.errors),
);
const usernameValidator = type("string.alphanumeric >= 5").to("string.lower");
const validUsername = computed(
() => !(usernameValidator(username.value) instanceof type.errors),
() =>
!((usernameValidator(username.value) as unknown) instanceof type.errors),
);
const passwordValidator = type("string >= 14");
const validPassword = computed(
() => !(passwordValidator(password.value) instanceof type.errors),
() =>
!((passwordValidator(password.value) as unknown) instanceof type.errors),
);
const validConfirmPassword = computed(
() => password.value == confirmPassword.value,

9
prisma/schema.prisma
View File

@ -9,6 +9,15 @@ generator client {
binaryTargets = ["native", "debian-openssl-3.0.x"]
}
/**
* generator arktype {
* provider = "yarn prismark"
* output = "./validate"
* fileName = "schema.ts"
* nullish = true
* }
*/
datasource db {
provider = "postgresql"
url = env("DATABASE_URL")

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

@ -1,10 +1,11 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
const DeleteInvite = type({
id: "string",
});
}).configure(throwingArktype);
export default defineEventHandler<{
body: typeof DeleteInvite.infer;
@ -14,16 +15,7 @@ export default defineEventHandler<{
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = DeleteInvite(await readBody(h3));
if (body instanceof type.errors) {
// hover out.summary to see validation errors
console.error(body.summary);
throw createError({
statusCode: 400,
statusMessage: body.summary,
});
}
const body = await readValidatedBody(h3, DeleteInvite);
await prisma.invitation.delete({ where: { id: body.id } });
return {};

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

@ -1,13 +1,14 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
const CreateInvite = type({
isAdmin: "boolean",
username: "string",
email: "string.email",
isAdmin: "boolean?",
username: "string?",
email: "string.email?",
expires: "string.date.iso.parse",
});
}).configure(throwingArktype);
export default defineEventHandler<{
body: typeof CreateInvite.infer;
@ -17,16 +18,7 @@ export default defineEventHandler<{
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = CreateInvite(await readBody(h3));
if (body instanceof type.errors) {
// hover out.summary to see validation errors
console.error(body.summary);
throw createError({
statusCode: 400,
statusMessage: body.summary,
});
}
const body = await readValidatedBody(h3, CreateInvite);
const invitation = await prisma.invitation.create({
data: body,

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

@ -2,11 +2,12 @@ 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";
const DeleteGameImage = type({
gameId: "string",
imageId: "string",
});
}).configure(throwingArktype);
export default defineEventHandler<{
body: typeof DeleteGameImage.infer;
@ -14,14 +15,8 @@ export default defineEventHandler<{
const allowed = await aclManager.allowSystemACL(h3, ["game:image:delete"]);
if (!allowed) throw createError({ statusCode: 403 });
const body = DeleteGameImage(await readBody(h3));
if (body instanceof type.errors) {
console.error(h3.path, body.summary);
throw createError({
statusCode: 400,
statusMessage: body.summary,
});
}
const body = await readValidatedBody(h3, DeleteGameImage);
const gameId = body.gameId;
const imageId = body.imageId;

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

@ -1,7 +1,7 @@
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
export default defineEventHandler(async (h3) => {
export default defineEventHandler<{ query: { id: string } }>(async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, ["game:delete"]);
if (!allowed) throw createError({ statusCode: 403 });

1
server/api/v1/admin/game/metadata.post.ts
View File

@ -3,6 +3,7 @@ import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
import { handleFileUpload } from "~/server/internal/utils/handlefileupload";
export default defineEventHandler(async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, ["game:update"]);
if (!allowed) throw createError({ statusCode: 403 });

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

@ -1,18 +1,24 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
export default defineEventHandler(async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, ["game:version:delete"]);
const DeleteVersion = type({
id: "string",
versionName: "string",
}).configure(throwingArktype);
export default defineEventHandler<{ body: typeof DeleteVersion }>(
async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, [
"game:version:delete",
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readBody(h3);
const body = await readValidatedBody(h3, DeleteVersion);
const gameId = body.id.toString();
const version = body.versionName.toString();
if (!gameId || !version)
throw createError({
statusCode: 400,
statusMessage: "Missing ID or versionName in body",
});
await prisma.gameVersion.delete({
where: {
@ -24,4 +30,5 @@ export default defineEventHandler(async (h3) => {
});
return {};
});
},
);

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

@ -1,19 +1,24 @@
import { type } from "arktype";
import { throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
export default defineEventHandler(async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, ["game:version:update"]);
const UpdateVersionOrder = type({
id: "string",
versions: "string[]",
}).configure(throwingArktype);
export default defineEventHandler<{ body: typeof UpdateVersionOrder }>(
async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, [
"game:version:update",
]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readBody(h3);
const gameId = body.id?.toString();
const body = await readValidatedBody(h3, UpdateVersionOrder);
const gameId = body.id;
// We expect an array of the version names for this game
const versions: string[] | undefined = body.versions;
if (!gameId || !versions || !Array.isArray(versions))
throw createError({
statusCode: 400,
statusMessage: "Missing id, versions or versions is not an array",
});
const versions = body.versions;
const newVersions = await prisma.$transaction(
versions.map((versionName, versionIndex) =>
@ -38,4 +43,5 @@ export default defineEventHandler(async (h3) => {
);
return newVersions;
});
},
);

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

@ -1,33 +1,39 @@
import { type } from "arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
import libraryManager from "~/server/internal/library";
import { parsePlatform } from "~/server/internal/utils/parseplatform";
const ImportVersion = type({
id: "string",
version: "string",
platform: "string",
launch: "string?",
launchArgs: "string?",
setup: "string?",
setupArgs: "string?",
onlySetup: "boolean?",
delta: "boolean?",
umuId: "string?",
});
export default defineEventHandler(async (h3) => {
const allowed = await aclManager.allowSystemACL(h3, ["import:version:new"]);
if (!allowed) throw createError({ statusCode: 403 });
const body = await readBody(h3);
const body = await readValidatedBody(h3, ImportVersion);
const gameId = body.id;
const versionName = body.version;
const platform = body.platform as string | undefined;
const launch = (body.launch ?? "") as string;
const launchArgs = (body.launchArgs ?? "") as string;
const setup = (body.setup ?? "") as string;
const setupArgs = (body.setupArgs ?? "") as string;
const onlySetup = body.onlySetup ?? (false as boolean);
const delta = (body.delta ?? false) as boolean;
const umuId = (body.umuId ?? "") as string;
if (!gameId || !versionName)
throw createError({
statusCode: 400,
statusMessage: "Game ID and version are required.",
});
if (!platform)
throw createError({ statusCode: 400, statusMessage: "Missing platform." });
const platform = body.platform;
const launch = body.launch ?? "";
const launchArgs = body.launchArgs ?? "";
const setup = body.setup ?? "";
const setupArgs = body.setupArgs ?? "";
const onlySetup = body.onlySetup ?? false;
const delta = body.delta ?? false;
const umuId = body.umuId ?? "";
const platformParsed = parsePlatform(platform);
if (!platformParsed)

2
server/api/v1/client/chunk.get.ts
View File

@ -59,5 +59,5 @@ export default defineEventHandler(async (h3) => {
const gameReadStream = fs.createReadStream(gameFile, { start, end: end - 1 }); // end needs to be offset by 1
return gameReadStream;
return sendStream(h3, gameReadStream);
});

14
server/arktype.ts Normal file
View File

@ -0,0 +1,14 @@
import { configure } from "arktype/config";
export const throwingArktype = configure({
onFail: (errors) => errors.throw(),
actual: () => ""
});
// be sure to specify both the runtime and static configs
declare global {
interface ArkEnv {
onFail: typeof throwingArktype.onFail;
}
}

52
yarn.lock
View File

@ -34,11 +34,23 @@
dependencies:
"@ark/util" "0.45.5"
"@ark/schema@0.46.0":
version "0.46.0"
resolved "https://registry.yarnpkg.com/@ark/schema/-/schema-0.46.0.tgz#81a1a0dc1ff0f2faa098cba05de505a174bdc64e"
integrity sha512-c2UQdKgP2eqqDArfBqQIJppxJHvNNXuQPeuSPlDML4rjw+f1cu0qAlzOG4b8ujgm9ctIDWwhpyw6gjG5ledIVQ==
dependencies:
"@ark/util" "0.46.0"
"@ark/util@0.45.5":
version "0.45.5"
resolved "https://registry.yarnpkg.com/@ark/util/-/util-0.45.5.tgz#7742fa3973bfeea253442a44b51a0ea492c43e51"
integrity sha512-BbuDOKJJYZ2dzZDNhBavkhgGD2hv4/idEhXpEPA5weOlE9/kU7XwAvEWn74tCuySHrD7peDqe2Ct/EDUlM40qg==
"@ark/util@0.46.0":
version "0.46.0"
resolved "https://registry.yarnpkg.com/@ark/util/-/util-0.46.0.tgz#aee240bdaf413793e5ca4c4e8e3707aa965f4be3"
integrity sha512-JPy/NGWn/lvf1WmGCPw2VGpBg5utZraE84I7wli18EDF3p3zc/e9WolT35tINeZO3l7C77SjqRJeAUoT0CvMRg==
"@babel/code-frame@^7.26.2":
version "7.26.2"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
@ -752,6 +764,14 @@
resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919"
integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==
"@lobomfz/prismark@^0.0.3":
version "0.0.3"
resolved "https://registry.yarnpkg.com/@lobomfz/prismark/-/prismark-0.0.3.tgz#8b4eb34963e96cf3fff01432e62de22f184f2f2d"
integrity sha512-g2xfR/F+sRBRUhWYlpUkafqZjqsQBetjfzdWvQndRU4wdoavn3zblM3OQwb7vrsrKB6Wmbs+DtLGaD5XBQ2v8A==
dependencies:
"@prisma/generator-helper" "^6.5.0"
arktype "^2.1.9"
"@mapbox/node-pre-gyp@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-2.0.0.tgz#16d1d9049c0218820da81a12ae084e7fe67790d1"
@ -1390,6 +1410,16 @@
resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-6.7.0.tgz#a955174e4f481b0ca5d7c0fd458ef848432afd59"
integrity sha512-RabHn9emKoYFsv99RLxvfG2GHzWk2ZI1BuVzqYtmMSIcuGboHY5uFt3Q3boOREM9de6z5s3bQoyKeWnq8Fz22w==
"@prisma/debug@6.8.2":
version "6.8.2"
resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-6.8.2.tgz#59fb9e0ccb0f431fe7011c36c95f9bfcbe051749"
integrity sha512-4muBSSUwJJ9BYth5N8tqts8JtiLT8QI/RSAzEogwEfpbYGFo9mYsInsVo8dqXdPO2+Rm5OG5q0qWDDE3nyUbVg==
"@prisma/dmmf@6.8.2":
version "6.8.2"
resolved "https://registry.yarnpkg.com/@prisma/dmmf/-/dmmf-6.8.2.tgz#46632cfeda537b37f616febc68fb1ea7ef656fe4"
integrity sha512-okGJF/7hQZam/2wt+Y0hPyNxyY5S+L0FzAgtL932Q3YxUWHusRllrN39bCV45oF3QWY992g7rTWYdL2Rynt1qg==
"@prisma/engines-version@6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed":
version "6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed"
resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed.tgz#4ec7c8ee187924a910ec244e3790412d1069d723"
@ -1414,6 +1444,20 @@
"@prisma/engines-version" "6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed"
"@prisma/get-platform" "6.7.0"
"@prisma/generator-helper@^6.5.0":
version "6.8.2"
resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-6.8.2.tgz#09a72522384690223d4a047f71667eeb36d5ae70"
integrity sha512-KBLW47sbwFBKKYMiICIAEWsG6TdpPapPT7e7hpmpF3xMgYAm6YIXu4JGwfQVDY9Vbcb+0vPdPdSEQtInYOOe5g==
dependencies:
"@prisma/debug" "6.8.2"
"@prisma/dmmf" "6.8.2"
"@prisma/generator" "6.8.2"
"@prisma/generator@6.8.2":
version "6.8.2"
resolved "https://registry.yarnpkg.com/@prisma/generator/-/generator-6.8.2.tgz#6b523cc9107293d848cd59482271806dafe629bc"
integrity sha512-yExkvgqiKg1WHzjYttz40g5DsOtud8RhapM0Mum6pw+wrDoQyhSAxs5NHyFCV+9VPvRd2v+jAP2CTT07bsibjw==
"@prisma/get-platform@6.7.0":
version "6.7.0"
resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-6.7.0.tgz#967f21f8ad966b941dcb47b153b84958655390d1"
@ -2376,6 +2420,14 @@ arktype@^2.1.10:
"@ark/schema" "0.45.5"
"@ark/util" "0.45.5"
arktype@^2.1.9:
version "2.1.20"
resolved "https://registry.yarnpkg.com/arktype/-/arktype-2.1.20.tgz#dd46726b0faf23c2753369876c77bb037e7089d9"
integrity sha512-IZCEEXaJ8g+Ijd59WtSYwtjnqXiwM8sWQ5EjGamcto7+HVN9eK0C4p0zDlCuAwWhpqr6fIBkxPuYDl4/Mcj/+Q==
dependencies:
"@ark/schema" "0.46.0"
"@ark/util" "0.46.0"
ast-kit@^1.0.1, ast-kit@^1.4.0:
version "1.4.2"
resolved "https://registry.yarnpkg.com/ast-kit/-/ast-kit-1.4.2.tgz#75d3706c12549573c7de9e7c38ed04fb7d0cc10f"