handle login/registration errors

2 files changed, 10 insertions, 4 deletions

diff --git a/src/routes/register/+page.server.js b/src/routes/register/+page.server.js
index 26f4475f..5667914b 100644
--- a/src/routes/register/+page.server.js
+++ b/src/routes/register/+page.server.js
@@ -1,4 +1,4 @@
-import { redirect } from '@sveltejs/kit';
+import { invalid, redirect } from '@sveltejs/kit';
 import { post, login } from '$lib/utils';
 
 export const actions = {
@@ -7,8 +7,13 @@ export const actions = {
 		let { username, password, redirect: r } = form;
 
 		let user = { username, password };
-		await post('/register', { user });
-		await login(user, cookies);
+
+		try {
+			await post('/register', { user });
+			await login(user, cookies);
+		} catch (e) {
+			return invalid(400, { error: e.message });
+		}
 
 		throw redirect(303, r || `/${user.username}/dashboard`);
 	}
diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
index 82acb53b..747b3f8b 100644
--- a/src/routes/register/+page.svelte
+++ b/src/routes/register/+page.svelte
@@ -1,5 +1,6 @@
 <script>
 	import { RegisterOrLogin } from '$comp';
+  export let form;
 </script>
 
-<RegisterOrLogin pageID="register" />
+<RegisterOrLogin pageID="register" bind:form />