From 60ddf4495e52b194ba9af32542afc7cdbf274258 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Thu, 21 Nov 2024 23:46:31 -0800
Subject: redirect if not authed

---
 src/lib/parse.ts                                      | 5 +++--
 src/routes/(app)/send/[...text]/+page.svelte          | 4 +---
 src/routes/(app)/send/ecash/+page.server.ts           | 7 ++++---
 src/routes/(app)/send/ecash/[request]/+page.server.ts | 8 ++++++--
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lib/parse.ts b/src/lib/parse.ts
index 03d21943..5082cc16 100644
--- a/src/lib/parse.ts
+++ b/src/lib/parse.ts
@@ -1,5 +1,5 @@
 import { PUBLIC_DOMAIN } from "$env/static/public";
-import { get, isLiquid, auth, post, sats } from "$lib/utils";
+import { get, isLiquid, post, sats } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 import bip21 from "bip21";
 import { validate } from "bitcoin-address-validation";
@@ -65,7 +65,8 @@ export default async (s, host) => {
 		redirect(307, `/ecash/${id}`);
 	}
 
-  if (t.startsWith("creq")) redirect(307, `/send/ecash/${t}`);
+	console.log("HI", t);
+	if (t.startsWith("creq")) redirect(307, `/send/ecash/${t}`);
 
 	// user
 	try {
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 6b93b94b..2ce9d538 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -1,6 +1,4 @@
 <script>
-  import { run } from "svelte/legacy";
-
   import { page } from "$app/stores";
   import { fly } from "svelte/transition";
   import { enhance } from "$app/forms";
@@ -31,7 +29,7 @@
     pasted = true;
   };
 
-  run(() => {
+  $effect(() => {
     if (browser && pasted && text) el.click() && (pasted = false);
   });
 </script>
diff --git a/src/routes/(app)/send/ecash/+page.server.ts b/src/routes/(app)/send/ecash/+page.server.ts
index 6a535524..d65c0046 100644
--- a/src/routes/(app)/send/ecash/+page.server.ts
+++ b/src/routes/(app)/send/ecash/+page.server.ts
@@ -1,5 +1,5 @@
+import { auth, fd, post } from "$lib/utils";
 import { error, redirect } from "@sveltejs/kit";
-import { auth, post, fd } from "$lib/utils";
 
 export const actions = {
 	default: async ({ cookies, request }) => {
@@ -8,9 +8,10 @@ export const actions = {
 
 		try {
 			({ id } = await post("/mint", body, auth(cookies)));
-		} catch (e: any) {
+		} catch (e) {
+			const { message } = e as Error;
 			console.log("problem creating ecash", e);
-			error(400, { message: e.message });
+			error(400, { message });
 		}
 
 		redirect(307, `/ecash/${id}`);
diff --git a/src/routes/(app)/send/ecash/[request]/+page.server.ts b/src/routes/(app)/send/ecash/[request]/+page.server.ts
index c1c44ab9..5ab3e9c0 100644
--- a/src/routes/(app)/send/ecash/[request]/+page.server.ts
+++ b/src/routes/(app)/send/ecash/[request]/+page.server.ts
@@ -1,7 +1,11 @@
-import { fd, get} from "$lib/utils";
+import { fd, get } from "$lib/utils";
 import { decodePaymentRequest } from "@cashu/cashu-ts";
+import { redirect } from "@sveltejs/kit";
+
+export async function load({ cookies, params, url }) {
+	if (!cookies.get("token"))
+		redirect(307, `/login?redirect=${encodeURIComponent(url.pathname)}`);
 
-export async function load({ params }) {
 	const req = { ...decodePaymentRequest(params.request) };
 	const { target } = req.transport[0];
 	const recipient = await get(`/profile/${target}`);
-- 
cgit v1.2.3