renaming pw to vorgangPIN, case to vorgang, password to vorgangToken

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

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

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

@@ -2,15 +2,15 @@ import { getVorgangByToken, getCrimesListByToken } from '$lib/server/vorgangServ
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ params, url }) => {
-	const caseToken = params.vorgang;
-	const casePassword = url.searchParams.get('pw');
+	const vorgangToken = params.vorgang;
+	const vorgangPIN = url.searchParams.get('vorgangPIN');
 
-	const crimesList = await getCrimesListByToken(caseToken);
-	const vorgang = getVorgangByToken(caseToken);
+	const crimesList = await getCrimesListByToken(vorgangToken);
+	const vorgang = getVorgangByToken(vorgangToken);
 
 	return {
 		crimesList,
-		casePassword,
+		vorgangPIN,
 		vorgang
 	};
 };

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

@@ -28,7 +28,7 @@
 
 	const vorgang = data.vorgang;
 	const crimesList: ListItem[] = data.crimesList;
-	const password: string = data.casePassword;
+	const vorgangPIN: string = data.vorgangPIN;
 
 	let open = false;
 	$: open;
@@ -143,7 +143,7 @@
 	<div class="flex flex-col items-center justify-center w-full">
 		<h1 class="text-xl">Vorgang {vorgang.name}</h1>
 		{#if data?.user?.admin}
-		Zugangspasswort: {vorgang.pw}
+		Zugangs-PIN: {vorgang.pin}
 		<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}?pw={password}"
+						href="/view/{$page.params.vorgang}/{item.name}?pin={vorgangPIN}"
 						class=" flex justify-between gap-x-6 py-5"
 						aria-label="zum 3D-modell"
 					>

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

@@ -3,9 +3,9 @@ import { redirect } from '@sveltejs/kit';
 export const actions = {
 	default: async ({request}: {request: Request}) => {
 		const data = await request.formData();
-		const caseId = data.get('case-id');
-		const caseToken = data.get('case-token');
+		const vorgangId = data.get('vorgang-id');
+		const vorgangToken = data.get('vorgang-token');
 	
-		if( caseId && caseToken) throw redirect(303, `/list/${caseId}?token=${caseToken}`);
+		if( vorgangId && vorgangToken) throw redirect(303, `/list/${vorgangId}?token=${vorgangToken}`);
 	} 
 }

src/routes/(token-based)/view/+page.svelte

@@ -16,19 +16,19 @@
 	</p>
 	<form method="POST">
 		<BaseInputField
-			id="case-id"
-			name="case-id"
+			id="vorgang-id"
+			name="vorgang-id"
 			label="Vorgangskennung"
 			type="text"
-			value={form?.caseId}
+			value={form?.vorgangId}
 		/>
 		<div class="mt-5">
 			<BaseInputField
-				id="case-token"
-				name="case-token"
-				label="Zugangscode"
+				id="vorgang-token"
+				name="vorgang-token"
+				label="Zugangstoken"
 				type="text"
-				value={form?.token}
+				value={form?.vorgangToken}
 				error={form?.error?.message}
 			/>
 		</div>