package-lock.json

@@ -44,8 +44,7 @@
 				"tslib": "^2.8.0",
 				"typescript": "^5.6.3",
 				"vite": "^5.4.9",
-				"vitest": "^2.1.3",
+				"vitest": "^2.1.3"
-				"zod": "^3.23.8"
 			}
 		},
 		"node_modules/@alloc/quick-lru": {
@@ -7619,16 +7618,6 @@
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
-		},
-		"node_modules/zod": {
-			"version": "3.23.8",
-			"resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
-			"integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/colinhacks"
-			}
 		}
 	}
 }

package.json

@@ -41,8 +41,7 @@
 		"tslib": "^2.8.0",
 		"typescript": "^5.6.3",
 		"vite": "^5.4.9",
-		"vitest": "^2.1.3",
+		"vitest": "^2.1.3"
-		"zod": "^3.23.8"
 	},
 	"type": "module",
 	"dependencies": {

src/routes/register/+server.ts

@@ -1,7 +1,6 @@
 import { ApiError, getJavaUuid, getNoAuthUuid, UserNotFoundError } from '$lib/server/minecraft';
 import { error, type RequestHandler } from '@sveltejs/kit';
 import { Settings, User } from '$lib/server/database';
-import { RegisterSchema } from './schema';
 
 export const POST = (async ({ request }) => {
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -10,33 +9,48 @@ export const POST = (async ({ request }) => {
 		throw error(400, 'Anmeldung geschlossen');
 	}
 
-	try {
+	const data = await request.formData();
-		var data = RegisterSchema.parse(await request.json());
+	const firstname = data.get('firstname') as string | null;
-	} catch (e) {
+	const lastname = data.get('lastname') as string | null;
-		console.error(e);
+	const birthday: number = Date.parse(data.get('birthday') as string);
+	const telephone = data.get('telephone') as string | null;
+	const username = data.get('username') as string | null;
+	const playertype = data.get('playertype') as string | null;
+	const password = data.get('password') as string | null;
+
+	if (
+		firstname == null ||
+		lastname == null ||
+		Number.isNaN(birthday) ||
+		username == null ||
+		playertype == null
+	) {
 		throw error(400, 'Ungültige Parameter');
 	}
 
 	let uuid: string | null;
 	try {
-		switch (data.playertype) {
+		// available playertypes are 'java', 'bedrock' and 'noauth'
+		switch (data.get('playertype')) {
 			case 'java':
-				uuid = await getJavaUuid(data.username);
+				uuid = await getJavaUuid(username);
 				break;
 			case 'bedrock':
 				uuid = null;
 				// uuid = await getBedrockUuid(username);
 				break;
 			case 'noauth':
-				uuid = getNoAuthUuid(data.username);
+				uuid = getNoAuthUuid(username);
 				break;
+			default:
+				throw new Error(`invalid player type (${playertype})`);
 		}
 	} catch (e) {
 		if (e instanceof UserNotFoundError) {
 			throw error(
 				400,
 				"Der Spielername '" +
-					data.username +
+					username +
 					"' existiert nicht. Hast Du Deinen Spielernamen korrekt geschrieben " +
 					'und besitzt Du einen Minecraft-Account?\n\nKontaktiere bitte einen Admin, falls Du Dich trotz korrekter ' +
 					'Angabe nicht registrieren kannst.'
@@ -60,9 +74,9 @@ export const POST = (async ({ request }) => {
 	} else if (
 		await User.findOne({
 			where: {
-				firstname: data.firstname,
+				firstname: firstname,
-				lastname: data.lastname,
+				lastname: lastname,
-				birthday: data.birthday.toUTCString()
+				birthday: new Date(birthday).toUTCString()
 			}
 		})
 	) {
@@ -75,13 +89,13 @@ export const POST = (async ({ request }) => {
 	}
 
 	await User.create({
-		firstname: data.firstname,
+		firstname: firstname,
-		lastname: data.lastname,
+		lastname: lastname,
-		birthday: data.birthday.toUTCString(),
+		birthday: new Date(birthday).toUTCString(),
-		telephone: data.telephone,
+		telephone: telephone,
-		username: data.username,
+		username: username,
-		playertype: data.playertype,
+		playertype: playertype,
-		password: null,
+		password: password,
 		uuid: uuid
 	});
 

src/routes/register/Register.svelte

@@ -4,7 +4,6 @@
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { env } from '$env/dynamic/public';
 	import { rulesShort } from '$lib/rules';
-	import { RegisterSchema } from './schema';
 
 	const dispatch = createEventDispatcher();
 
@@ -41,18 +40,21 @@
 	async function sendRegister() {
 		// eslint-disable-next-line no-async-promise-executor
 		registerRequest = new Promise<void>(async (resolve, reject) => {
-			const parseResult = RegisterSchema.safeParse(
+			if (
-				Object.fromEntries(new FormData(document.forms[0]))
+				(birthdayInput.valueAsDate || new Date()) >
-			);
+				new Date(Date.now() - 1000 * 60 * 60 * 24 * 365 * 6)
-
+			) {
-			if (!parseResult.success) {
+				reject(
-				reject(Error(parseResult.error.issues.map((i) => i.message).join('\n\n')));
+					Error(
+						'Bitte gib Deinen vollständigen Geburtstag und die korrekte Jahreszahl an. Du musst mindestens 6 Jahre alt sein.\n'
+					)
+				);
 				return;
 			}
 
 			const response = await fetch(`${env.PUBLIC_BASE_PATH}/register`, {
 				method: 'POST',
-				body: JSON.stringify(Object.fromEntries(new FormData(document.forms[0])))
+				body: new FormData(document.forms[0])
 			});
 			if (response.ok) {
 				dispatch('submit', {
@@ -78,7 +80,7 @@
 	let rulesAccepted = false;
 	let rulesModal: HTMLDialogElement;
 	let rulesModalSecondsOpened = 0;
-	let rulesModalTimer: number | NodeJS.Timeout | undefined = undefined;
+	let rulesModalTimer: number | null = null;
 
 	let inputsInvalidMessage: string | null = 'Bitte fülle alle erforderlichen Felder aus';
 	let registerRequest: Promise<void> | null = null;
@@ -246,7 +248,7 @@
 	class="modal"
 	on:close={() => {
 		clearInterval(rulesModalTimer);
-		rulesModalTimer = undefined;
+		rulesModalTimer = null;
 	}}
 	bind:this={rulesModal}
 >

src/routes/register/schema.ts

@@ -1,25 +0,0 @@
-import { z } from 'zod';
-
-export const RegisterSchema = z.object({
-	firstname: z
-		.string()
-		.min(
-			2,
-			'Bitte gib Deinen vollständigen Vornamen an, dieser muss mindestens aus 2 Zeichen bestehen'
-		),
-	lastname: z
-		.string()
-		.min(
-			2,
-			'Bitte gib Deinen vollständigen Nachnamen an, dieser muss mindestens aus 2 Zeichen bestehen'
-		),
-	birthday: z.coerce
-		.date()
-		.max(
-			new Date(Date.now() - 1000 * 60 * 60 * 24 * 365 * 6),
-			'Bitte gib Deinen vollständigen Geburtstag und die korrekte Jahreszahl an. Du musst mindestens 6 Jahre alt sein.'
-		),
-	telephone: z.string().optional(),
-	username: z.string(),
-	playertype: z.enum(['java', 'bedrock', 'noauth'])
-});