catch registration errors

2 files changed, 14 insertions, 3 deletions

diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index cbaad236..2463f47f 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -18,12 +18,14 @@
 	}[page];
 
 	let submit = async () => {
+    console.log("HI")
 		let r = await post(url, { username, password });
 		if (!r.token) r = await post('/login', { username, password });
 		$token = r.token;
 		auth();
-		user.subscribe(({ username }) => goto(`/${username}/receive`));
 	};
+
+	$: if ($user) goto(`/${username}/receive`);
 </script>
 
 <div class="pt-10">
@@ -40,6 +42,7 @@
 			<form class="space-y-5" on:submit|preventDefault={submit}>
 				<div>
 					<label for="username" class="font-semibold">Username</label>
+          <!-- svelte-ignore a11y-autofocus -->
 					<input
 						type="text"
 						required
diff --git a/src/routes/register.js b/src/routes/register.js
index 9f79f94e..86f12dda 100644
--- a/src/routes/register.js
+++ b/src/routes/register.js
@@ -1,6 +1,14 @@
 import { post } from '$lib/utils';
 
 export async function POST({ request }) {
-	let user = await request.json();
-	return { body: await post('/register', { user }) };
+	try {
+		let user = await request.json();
+		let body = await post('/register', { user });
+		return { body };
+	} catch (e) {
+		return {
+			status: 500,
+			body: e,
+		};
+	}
 }