mirror of https://github.com/jetkvm/kvm.git
Switch to throwing redirect for welcome or login-local needed
Also cleaned up the loader function error-state returns
This commit is contained in:
parent
8e9e3e242f
commit
ffb5bb544b
|
|
@ -73,10 +73,10 @@ export async function checkDeviceAuth() {
|
|||
.GET(`${DEVICE_API}/device/status`)
|
||||
.then(res => res.json() as Promise<DeviceStatus>);
|
||||
|
||||
if (!res.isSetup) return redirect("/welcome");
|
||||
if (!res.isSetup) throw redirect("/welcome");
|
||||
|
||||
const deviceRes = await api.GET(`${DEVICE_API}/device`);
|
||||
if (deviceRes.status === 401) return redirect("/login-local");
|
||||
if (deviceRes.status === 401) throw redirect("/login-local");
|
||||
if (deviceRes.ok) {
|
||||
const device = (await deviceRes.json()) as LocalDevice;
|
||||
return { authMode: device.authMode };
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ const loader: LoaderFunction = async ({ params }: LoaderFunctionArgs) => {
|
|||
return { device, user };
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
return { devices: [] };
|
||||
return { user };
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ const loader: LoaderFunction = async ({ params }: LoaderFunctionArgs) => {
|
|||
return { device, user };
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
return { devices: [] };
|
||||
return { user };
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -78,10 +78,8 @@ const deviceLoader = async () => {
|
|||
|
||||
const cloudLoader = async (params: Params<string>): Promise<CloudLoaderResp> => {
|
||||
const user = await checkAuth();
|
||||
|
||||
const iceResp = await api.POST(`${CLOUD_API}/webrtc/ice_config`);
|
||||
const iceConfig = await iceResp.json();
|
||||
|
||||
const deviceResp = await api.GET(`${CLOUD_API}/devices/${params.id}`);
|
||||
|
||||
if (!deviceResp.ok) {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ interface LoaderData {
|
|||
devices: { id: string; name: string; online: boolean; lastSeen: string }[];
|
||||
user: User;
|
||||
}
|
||||
const loader: LoaderFunction = async ()=> {
|
||||
const loader: LoaderFunction = async () => {
|
||||
const user = await checkAuth();
|
||||
|
||||
try {
|
||||
|
|
@ -30,7 +30,7 @@ const loader: LoaderFunction = async ()=> {
|
|||
return { devices, user };
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
return { devices: [] };
|
||||
return { devices: [], user };
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue