From b5ace9871db1ed7934a4795666357ded7504b9db Mon Sep 17 00:00:00 2001
From: "Federico Pasqua (eisterman)" <federico.pasqua.96@gmail.com>
Date: Fri, 28 Mar 2025 17:12:54 +0100
Subject: [PATCH] Redirect invalid state between [qrcode] and status

---
 src/routes/[qrcode]/+page.ts        | 5 +++--
 src/routes/[qrcode]/status/+page.ts | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/routes/[qrcode]/+page.ts b/src/routes/[qrcode]/+page.ts
index 14a35e7..b44358c 100644
--- a/src/routes/[qrcode]/+page.ts
+++ b/src/routes/[qrcode]/+page.ts
@@ -3,11 +3,12 @@ import { redirect } from "@sveltejs/kit";
 
 export const load: PageLoad = async ({ parent }) => {
   const parentData = await parent();
-  if (parentData.user === null) return redirect(303, `${parentData.qrcode}/login`);
+  if (parentData.user === null) return redirect(303, `/${parentData.qrcode}/login`);
   else {
     if (!parentData.chargePermission.includes(parentData.qrcode)) {
-      return redirect(303, `${parentData.qrcode}/forbidden`);
+      return redirect(303, `/${parentData.qrcode}/forbidden`);
     }
   }
+  if (parentData.chargecontroller.active_charge !== null) return redirect(303, `/${parentData.qrcode}/status`);
   return parentData;
 };
diff --git a/src/routes/[qrcode]/status/+page.ts b/src/routes/[qrcode]/status/+page.ts
index e485217..3c4b185 100644
--- a/src/routes/[qrcode]/status/+page.ts
+++ b/src/routes/[qrcode]/status/+page.ts
@@ -3,6 +3,7 @@ import { redirect } from "@sveltejs/kit";
 
 export const load: PageLoad = async ({ parent }) => {
   const parentData = await parent();
-  if (parentData.user === null) return redirect(303, `${parentData.qrcode}/login`);
+  if (parentData.user === null) return redirect(303, `/${parentData.qrcode}/login`);
+  if (parentData.chargecontroller.active_charge === null) return redirect(303, `/${parentData.qrcode}`);
   return parentData;
 };