diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 53a4d8d..cb7eb27 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -3,8 +3,20 @@ import { Route, Routes } from "react-router-dom"; import Login from "../views/home/auth/Login"; import Register from "../views/home/auth/Register"; import Menu from "../views/home/menu/Menu"; +import { useAppDispatch, useAppSelector } from "../redux/hooks"; +import { useEffect } from "react"; +import { fetchWhoAmI } from "../redux/slices/auth"; const Home = () => { + const name = useAppSelector((state) => state.auth.username); + const jwt = useAppSelector((state) => state.auth.jwt); + const dispatch = useAppDispatch(); + + useEffect(() => { + dispatch(fetchWhoAmI()); + }, [jwt]) + + return (
@@ -15,7 +27,7 @@ const Home = () => { } /> } /> } /> - +
diff --git a/src/redux/slices/auth.ts b/src/redux/slices/auth.ts index c526bd0..ba9e681 100644 --- a/src/redux/slices/auth.ts +++ b/src/redux/slices/auth.ts @@ -98,6 +98,7 @@ const authSlice = createSlice({ }); builder.addCase(registerUser.fulfilled, (state, action: PayloadAction<{ jwt: string; refreshToken: string }>) => { state.status = "succeeded"; + axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`; state.jwt = action.payload.jwt; state.refreshToken = action.payload.refreshToken; }); @@ -113,6 +114,7 @@ const authSlice = createSlice({ }); builder.addCase(loginUser.fulfilled, (state, action: PayloadAction<{ jwt: string; refreshToken: string }>) => { state.status = "succeeded"; + axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`; state.jwt = action.payload.jwt; state.refreshToken = action.payload.refreshToken; }); diff --git a/src/views/home/auth/Register.tsx b/src/views/home/auth/Register.tsx index 9d4008e..fb5c38e 100644 --- a/src/views/home/auth/Register.tsx +++ b/src/views/home/auth/Register.tsx @@ -24,7 +24,7 @@ const Register = () => { useEffect(() => { dispatch(setMenuActivePage("account")); if (jwt) { - navigate("/home/offices"); + navigate("/home"); } }, [jwt]);