refactoring part 2: mainly consolidation of token, ids and passwort

src/routes/(token-based)/+layout.server.ts

@@ -1,7 +1,7 @@
 import {
 	checkIfVorgangExists,
 	hasValidToken,
-	tokenValid,
+	passwordValid,
 	vorgangExists
 } from '$lib/server/vorgangService';
 import { redirect } from '@sveltejs/kit';
@@ -14,11 +14,11 @@ export const load: PageServerLoad = async ({ params, url, locals }) => {
 		};
 	}
 
-	const caseId = params.vorgang;
-	const caseToken = url.searchParams.get('token');
+	const caseToken = params.vorgang;
+	const casePassword = url.searchParams.get('pw');
 
-	const isVorgangValid = vorgangExists(caseId);
-	const isTokenValid = tokenValid(caseId, caseToken);
+	const isVorgangValid = vorgangExists(caseToken);
+	const isPasswordValid = passwordValid(caseToken, casePassword);
 
-	if (!isVorgangValid || !isTokenValid) throw redirect(303, `/anmeldung?vorgang=${caseId}`);
+	if (!isVorgangValid || !isPasswordValid) throw redirect(303, `/anmeldung?vorgang=${caseToken}`);
 };

src/routes/(token-based)/list/[vorgang]/+page.server.ts

@@ -1,16 +1,16 @@
-import { getVorgangByToken, getVorgangByCaseId } from '$lib/server/vorgangService';
+import { getVorgangByToken, getCrimesListByToken } from '$lib/server/vorgangService';
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ params, url }) => {
-	const caseId = params.vorgang;
-	const caseToken = url.searchParams.get('token');
+	const caseToken = params.vorgang;
+	const casePassword = url.searchParams.get('pw');
 
-	const crimesList = await getVorgangByCaseId(caseId);
-	const vorg = getVorgangByToken(caseId);
+	const crimesList = await getCrimesListByToken(caseToken);
+	const vorgang = getVorgangByToken(caseToken);
 
 	return {
 		crimesList,
-		caseToken,
-		vorg
+		casePassword,
+		vorgang
 	};
 };

src/routes/(token-based)/list/[vorgang]/+page.svelte

@@ -26,9 +26,9 @@
 		// add other properties as needed
 	}
 
-	const vorg = data.vorg;
+	const vorgang = data.vorgang;
 	const crimesList: ListItem[] = data.crimesList;
-	const token: string = data.caseToken;
+	const password: string = data.casePassword;
 
 	let open = false;
 	$: open;
@@ -141,9 +141,9 @@
 
 <div class="-z-10 bg-white">
 	<div class="flex flex-col items-center justify-center w-full">
-		<h1 class="text-xl">Vorgang {vorg.name}</h1>
+		<h1 class="text-xl">Vorgang {vorgang.name}</h1>
 		{#if data?.user?.admin}
-		Zugangspasswort: {vorg.pw}
+		Zugangspasswort: {vorgang.pw}
 		<Button on:click={() => setClipboard($page.url.toString().split('?')[0])}>Copy Link</Button>
 		{/if}
 	</div>
@@ -152,7 +152,7 @@
 			{#each crimesList as item, i}
 				<li>
 					<a
-						href="/view/{$page.params.vorgang}/{item.name}?token={token}"
+						href="/view/{$page.params.vorgang}/{item.name}?pw={password}"
 						class=" flex justify-between gap-x-6 py-5"
 						aria-label="zum 3D-modell"
 					>