Redirect invalid state between [qrcode] and status
This commit is contained in:
@@ -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;
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user