Merge branch 'master' of github.com:coinos/coinos-ui-v2

2 files changed, 25 insertions, 6 deletions

diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index ae1948f5..157c2821 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -1,4 +1,5 @@
 <script>
+	import { toast } from '@zerodevx/svelte-toast';
 	import { Icon } from '$comp';
 	import { post } from '$lib/utils';
 	import { user, token } from '$lib/store';
@@ -18,10 +19,15 @@
 	}[page];
 
 	let submit = async () => {
-		let r = await post(url, { username, password });
-		if (!r.token) r = await post('/login', { username, password });
-		$token = r.token;
-		auth();
+		try {
+			let r = await post(url, { username, password });
+			if (!r.token) r = await post('/login', { username, password });
+			$token = r.token;
+			auth();
+		} catch (e) {
+			if (!e.message) e.message = 'Login failed';
+			toast.push(e.message);
+		}
 	};
 
 	$: if ($user) goto(`/${username}/receive`);
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 6b728152..a812c136 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -14,7 +14,7 @@ export const get = (url, headers = { accept: 'application/json' }) =>
 			try {
 				return JSON.parse(body);
 			} catch (e) {
-				throw Error(body);
+				throw new Error(body);
 			}
 		});
 
@@ -23,7 +23,20 @@ export const post = (url, body) =>
 		method: 'POST',
 		body: JSON.stringify(body),
 		headers: { accept: 'application/json', 'content-type': 'application/json' }
-	}).then((r) => r.json());
+	})
+		.then((r) => r.text())
+		.then((body) => {
+			try {
+				body = JSON.parse(body);
+			} catch (e) {
+				throw new Error(body);
+			}
+
+			if (body instanceof Error) throw body;
+			if (body.name === 'Error') throw new Error(body.message);
+
+			return body;
+		});
 
 export const copy = (text) => {
 	navigator.clipboard.writeText(text);