eisterman/re-test-chargere-svkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redirect invalid state between [qrcode] and status

Browse Source
This commit is contained in:
Federico Pasqua
2025-03-28 17:12:54 +01:00
parent 981566c3ba
commit b5ace9871d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/routes/[qrcode]/+page.ts
View File

@@ -3,11 +3,12 @@ import { redirect } from "@sveltejs/kit";
export const load: PageLoad = async ({ parent }) => { export const load: PageLoad = async ({ parent }) => {
const parentData = await 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 { else {
if (!parentData.chargePermission.includes(parentData.qrcode)) { 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; return parentData;
}; };

3
src/routes/[qrcode]/status/+page.ts
View File

@@ -3,6 +3,7 @@ import { redirect } from "@sveltejs/kit";
export const load: PageLoad = async ({ parent }) => { export const load: PageLoad = async ({ parent }) => {
const parentData = await 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; return parentData;
}; };