Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

properly navigate to login/onboarding #534

Merged
merged 2 commits into from
Apr 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker/jetson-nano/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ ARG JETPACK_VERSION_MAJOR
ARG JETPACK_VERSION_MINOR
ARG JETSON_NANO_FFMPEG_APT_VERSION
ENV \
LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu/tegra:/usr/lib/aarch64-linux-gnu/tegra-egl"
LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu/tegra:/usr/lib/aarch64-linux-gnu/tegra-egl" \
LD_PRELOAD="/usr/lib/aarch64-linux-gnu/libgomp.so.1"

RUN \
cd /usr/local/bin && \
Expand Down
26 changes: 19 additions & 7 deletions frontend/src/context/ViseronContext.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { useQueryClient } from "@tanstack/react-query";
import React, { FC, createContext, useEffect, useState } from "react";
import React, {
FC,
createContext,
useContext,
useEffect,
useState,
} from "react";
import { useNavigate } from "react-router-dom";

import { AuthContext } from "context/AuthContext";
import { toastIds, useToast } from "hooks/UseToast";
import { subscribeCameras, subscribeRecording } from "lib/commands";
import * as types from "lib/types";
Expand All @@ -27,17 +34,19 @@ export const ViseronContext =
export const ViseronProvider: FC<ViseronProviderProps> = ({
children,
}: ViseronProviderProps) => {
const [connection, setConnection] = useState<Connection | undefined>(
undefined
);
const [connected, setConnected] = useState<boolean>(false);
const { auth } = useContext(AuthContext);
const navigate = useNavigate();
const queryClient = useQueryClient();
const toast = useToast();

const [connection, setConnection] = useState<Connection | undefined>(
undefined
);
const [connected, setConnected] = useState<boolean>(false);
const onConnectRef = React.useRef<() => void>();
const onDisconnectRef = React.useRef<() => void>();
const onConnectionErrorRef = React.useRef<() => void>();

useEffect(() => {
if (connection) {
const cameraRegistered = async (camera: types.Camera) => {
Expand Down Expand Up @@ -71,8 +80,11 @@ export const ViseronProvider: FC<ViseronProviderProps> = ({
setConnected(false);
};
onConnectionErrorRef.current = async () => {
console.error("Connection error, redirecting to login");
navigate("/login");
if (auth.enabled) {
const url = auth.onboarding_complete ? "/login" : "/onboarding";
console.error(`Connection error, redirecting to ${url}`);
navigate(url);
}
};

connection.addEventListener("connected", onConnectRef.current);
Expand Down
19 changes: 15 additions & 4 deletions frontend/src/pages/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import Paper from "@mui/material/Paper";
import Typography from "@mui/material/Typography";
import { useEffect, useReducer, useRef } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import { useContext, useEffect, useReducer, useRef } from "react";
import { Navigate, useLocation, useNavigate } from "react-router-dom";
import { ReactComponent as ViseronLogo } from "viseron-logo.svg";

import { TextFieldItem, TextFieldItemState } from "components/TextFieldItem";
import { AuthContext } from "context/AuthContext";
import { useTitle } from "hooks/UseTitle";
import { useAuthLogin } from "lib/api/auth";
import queryClient from "lib/api/client";
Expand Down Expand Up @@ -42,12 +43,14 @@ function reducer(state: InputState, action: InputAction): InputState {

const Login = () => {
useTitle("Login");
const [inputState, dispatch] = useReducer(reducer, initialState);
const { auth } = useContext(AuthContext);
const location = useLocation();
const navigate = useNavigate();
const fromRef = useRef();
const login = useAuthLogin();

const [inputState, dispatch] = useReducer(reducer, initialState);
const fromRef = useRef();

queryClient.removeQueries({
predicate(query) {
return query.queryKey[0] !== "auth" && query.queryKey[1] !== "enabled";
Expand All @@ -68,6 +71,14 @@ const Login = () => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

if (auth.enabled && !auth.onboarding_complete) {
return <Navigate to="/onboarding" />;
}

if (!auth.enabled) {
return <Navigate to="/" />;
}

return (
<Container sx={{ marginTop: "2%" }}>
<Box display="flex" justifyContent="center" alignItems="center">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/Onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const Onboarding = () => {
const [inputState, dispatch] = useReducer(reducer, initialState);
const onboarding = useOnboarding();

if (auth.enabled && auth.onboarding_complete) {
if ((auth.enabled && auth.onboarding_complete) || !auth.enabled) {
return <Navigate to="/" />;
}

Expand Down