fix: fix several issues related to the rauthy upgrade.

Author: zicklag

compose.yaml

@@ -33,11 +33,12 @@ services:
       - rauthy:/app/data
 
   rauthy:
-    image: ghcr.io/sebadob/rauthy:0.27.3
+    image: ghcr.io/sebadob/rauthy:0.28.3
     depends_on:
       - set-rauthy-volume-owner
       - smtp4dev
     environment:
+      LOCAL_TEST: 'true'
       PUB_URL: localhost:9523
       DATABASE_URL: 'sqlite:/app/data/rauthy.db'
       BOOTSTRAP_ADMIN_EMAIL: [email protected]

src/lib/rauthy/server.ts

@@ -67,7 +67,7 @@ export async function reset(opts: {
 		method: 'put',
 		headers: {
 			Cookie: cookie.serialize('rauthy-pwd-reset', opts.cookie),
-			'pwd-csrf-token': opts.csrfToken
+			'x-pwd-csrf-token': opts.csrfToken
 		},
 		body: JSON.stringify({
 			magic_link_id: opts.token,

src/routes/(app)/[username]/components/ManageAccountModal.svelte

@@ -38,7 +38,7 @@
 		};
 		const resp = await fetch(`/auth/v1/providers/${provider_id}/link`, {
 			method: 'POST',
-			headers: [['csrf-token', localStorage.getItem('csrfToken')!]],
+			headers: [['x-csrf-token', localStorage.getItem('csrfToken')!]],
 			body: JSON.stringify(data)
 		});
 		await checkResponse(resp);
@@ -58,7 +58,7 @@
 	async function unlinkAccount() {
 		await fetch(`/auth/v1/providers/link`, {
 			method: 'delete',
-			headers: [['csrf-token', localStorage.getItem('csrfToken')!]]
+			headers: [['x-csrf-token', localStorage.getItem('csrfToken')!]]
 		});
 		window.location.reload();
 	}

src/routes/(app)/account/forgot-password/+page.svelte

@@ -25,7 +25,7 @@
 				method: 'post',
 				body: JSON.stringify({ email }),
 				headers: [
-					['csrf-token', localStorage.getItem('csrfToken')!],
+					['x-csrf-token', localStorage.getItem('csrfToken')!],
 					['content-type', 'application/json']
 				]
 			});

src/routes/(app)/auth/v1/providers/callback/+page.svelte

@@ -21,7 +21,7 @@
 			method: 'post',
 			body: JSON.stringify(data),
 			headers: [
-				['csrf-token', localStorage.getItem('csrfToken')!],
+				['x-csrf-token', localStorage.getItem('csrfToken')!],
 				['content-type', 'application/json']
 			]
 		});

src/routes/(app)/auth/v1/users/[user]/reset/[token]/+page.svelte

@@ -11,7 +11,7 @@
 	const passwordValidityLabels: { [K in PolicyKey]: string } = {
 		include_digits: 'Include %s numbers',
 		include_lower_case: 'Include %s lowercase',
-		include_upper_case: 'Include &s uppercase',
+		include_upper_case: 'Include %s uppercase',
 		include_special: 'Include %s special characters',
 		length_max: 'Shorter than %s',
 		length_min: 'At least %s long',
@@ -23,14 +23,18 @@
 	let passwordValidity: { [K in PolicyKey]?: { label: string; valid?: boolean } } = $state(
 		Object.fromEntries(
 			Object.entries(data.passwordPolicy)
+				.filter(([key, _]) => !!passwordValidityLabels[key as PolicyKey])
 				.filter(([_, value]) => !!value)
-				.map(([key, value]) => [
-					key,
-					{
-						label: passwordValidityLabels[key as PolicyKey].replace('%s', value.toString()),
-						valid: false
-					}
-				])
+				.map(([key, value]) => {
+					console.log(key, value);
+					return [
+						key,
+						{
+							label: passwordValidityLabels[key as PolicyKey].replace('%s', value.toString()),
+							valid: false
+						}
+					];
+				})
 		)
 	);
 	let passwordValid = $derived(Object.values(passwordValidity).every((x) => x.valid !== false));
@@ -75,7 +79,10 @@
 		try {
 			const resp = await fetch(`/auth/v1/users/${data.user}/reset`, {
 				method: 'put',
-				headers: [['pwd-csrf-token', data.csrfToken!]],
+				headers: [
+					['x-pwd-csrf-token', data.csrfToken!],
+					['content-type', 'application/json']
+				],
 				body: JSON.stringify({ magic_link_id: data.token, password })
 			});
 			await checkResponse(resp);

src/routes/(app)/auth/v1/users/[user]/reset/[token]/+page.ts

@@ -13,26 +13,13 @@ export const load: PageLoad = async ({ params, fetch }) => {
 		not_recently_used?: number;
 	} = {};
 	try {
-		const initResp = await fetch(`/auth/v1/users/${user}/reset/${token}`, {});
-		const initContent = await initResp.text();
-		const csrfFind = 'name="rauthy-csrf-token" id="';
-		let contentSplit = initContent.split(csrfFind)[1];
-		csrfToken = contentSplit.split('"')[0];
-		const passwordPolicyFind = 'name="rauthy-data" id="';
-		contentSplit = initContent.split(passwordPolicyFind)[1];
-		const arr = contentSplit
-			.split('"')[0]
-			.split(',')
-			.map((x) => (x == '-1' ? undefined : Number.parseInt(x)));
-		passwordPolicy = {
-			length_min: arr[0],
-			length_max: arr[1],
-			include_lower_case: arr[2],
-			include_upper_case: arr[3],
-			include_digits: arr[4],
-			include_special: arr[5],
-			not_recently_used: arr[6]
-		};
+		const initResp = await fetch(`/auth/v1/users/${user}/reset/${token}`, {
+			headers: [['accept', 'application/json']]
+		});
+		console.log('resp', initResp);
+		const json = await initResp.json();
+		csrfToken = json.csrf_token;
+		passwordPolicy = json.password_policy;
 	} catch (e) {
 		console.error('error loading reset page', e);
 	}

src/routes/(app)/login/+page.svelte

@@ -76,7 +76,7 @@
 				method: 'post',
 				body: JSON.stringify(data),
 				headers: [
-					['csrf-token', localStorage.getItem('csrfToken')!],
+					['x-csrf-token', localStorage.getItem('csrfToken')!],
 					['content-type', 'application/json']
 				]
 			});
@@ -139,7 +139,7 @@
 					scopes
 				}),
 				headers: [
-					['csrf-token', localStorage.getItem('csrfToken')!],
+					['x-csrf-token', localStorage.getItem('csrfToken')!],
 					['content-type', 'application/json']
 				]
 			});
@@ -183,7 +183,7 @@
 			method: 'post',
 			body: JSON.stringify(req),
 			headers: [
-				['csrf-token', localStorage.getItem('csrfToken')!],
+				['x-csrf-token', localStorage.getItem('csrfToken')!],
 				['content-type', 'application/json']
 			]
 		});

src/routes/(app)/logout/+page.svelte

@@ -22,7 +22,7 @@
 			const resp = await fetch('/auth/v1/oidc/logout', {
 				method: 'post',
 				headers: [
-					['csrf-token', csrf!],
+					['x-csrf-token', csrf!],
 					['content-type', 'application/json']
 				],
 				body: JSON.stringify(req)