Implemented protected route component, added protected routes. Fixed redircts. Removed token from localstorage, not being used

This commit is contained in:
Alex Holliday committed 2024-06-24 13:03:42 -07:00
1 parent 5beaa8dfe1
commit b84a5e017d
4 files changed
+26 -14

No files matched your search

+18 -7
View File
@@ -27,14 +27,25 @@ function App() {
path="/monitors"
element={<ProtectedRoute Component={Monitors} />}
/>
<Route path="incidents" element={<Incidents />} />
<Route path="status" element={<Status />} />
<Route path="integrations" element={<Integrations />} />
<Route path="settings" element={<Settings />} />
<Route
path="incidents"
element={<ProtectedRoute Component={Incidents} />}
/>
<Route
path="status"
element={<ProtectedRoute Component={Status} />}
/>
<Route
path="integrations"
element={<ProtectedRoute Component={Integrations} />}
/>
<Route
path="settings"
element={<ProtectedRoute Component={Settings} />}
/>
<Route exact path="/login" element={<Login />} />
<Route exact path="/register" element={<Register />} />
</Route>
<Route exact path="/register" element={<Register />} />
<Route exact path="/login" element={<Login />} />
<Route exact path="/demo" element={<Demo />} />
{/* <Route path="/toast" element={<ToastComponent />} /> */}
<Route path="*" element={<NotFound />} />
+1 -1
View File
@@ -55,7 +55,7 @@ function NavBar() {
// Clear auth state
dispatch(clearAuthState());
dispatch(clearMonitorState());
navigate("/");
navigate("/login");
};
/**
@@ -1,4 +1,4 @@
import { Route, Navigate } from "react-router-dom";
import { Navigate } from "react-router-dom";
import { useSelector } from "react-redux";
import PropTypes from "prop-types";
@@ -15,9 +15,12 @@ import PropTypes from "prop-types";
const ProtectedRoute = ({ Component, ...rest }) => {
const authState = useSelector((state) => state.auth);
console.log(authState);
return true ? <Component {...rest} /> : <Navigate to="/login" replace />;
return authState.authToken ? (
<Component {...rest} />
) : (
<Navigate to="/login" replace />
);
};
ProtectedRoute.propTypes = {
+1 -3
View File
@@ -52,9 +52,7 @@ const Login = () => {
await loginValidation.validateAsync(form, { abortEarly: false });
const action = await dispatch(login(form));
if (action.meta.requestStatus === "fulfilled") {
const token = action.payload.data;
localStorage.setItem("token", token);
navigate("/");
navigate("/monitors");
}
if (action.meta.requestStatus === "rejected") {
const error = new Error("Request rejected");