check for token

2 files changed, 12 insertions, 6 deletions

diff --git a/src/routes/(app)/[username]/receive/+page.server.js b/src/routes/(app)/[username]/receive/+page.server.js
index 8a4d754c..159a77a2 100644
--- a/src/routes/(app)/[username]/receive/+page.server.js
+++ b/src/routes/(app)/[username]/receive/+page.server.js
@@ -1,8 +1,14 @@
+import { redirect } from "@sveltejs/kit";
 import * as Qr from "qrcode-base64";
-export let load = async ({ cookies, url }) => {
-  let username = cookies.get("username");
-  let text = `${username}@${url.host}`;
-  let src = Qr.drawImg(text, { size: 500 });
 
-  return { src, text };
+export const load = async ({ cookies, params, url }) => {
+	const token = cookies.get("token");
+	if (!token) redirect(307, `/pay/${params.username}`);
+
+	const username = cookies.get("username");
+
+	const text = `${username}@${url.host}`;
+	const src = Qr.drawImg(text, { size: 500 });
+
+	return { src, text };
 };
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
index 9c8a6927..4dc077ca 100644
--- a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts
@@ -5,7 +5,7 @@ export async function load({ cookies, params, parent }) {
 	const { username } = params;
 	const { rates, user } = await parent();
 
-	if (user?.username === username) error(500, "Cannot send to self");
+	if (user?.username === username) redirect(307, `/${username}/receive`);
 	const subject = await get(`/users/${username}`);
 
 	let [amount, currency] = params.amount.split("/");