From dc4b757a0248d6931756b789a7cb5e80f5e9bbda Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Sat, 12 Aug 2023 15:42:41 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fix(App.tsx):=20fix=20linting=20?= =?UTF-8?q?issues=20and=20add=20missing=20dependencies=20to=20useEffect=20?= =?UTF-8?q?hook=20=F0=9F=94=A7=20fix(authContext.tsx):=20change=20localSto?= =?UTF-8?q?rage=20to=20cookies=20for=20storing=20access=20token=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(api.tsx):=20remove=20console.log=20statement?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(AdminPage/index.tsx):=20add=20missing=20i?= =?UTF-8?q?mport=20for=20getLoggedUser=20function=20and=20useContext=20for?= =?UTF-8?q?=20AuthContext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/App.tsx | 13 +++++++++++++ src/frontend/src/contexts/authContext.tsx | 2 +- src/frontend/src/controllers/API/api.tsx | 3 +++ src/frontend/src/pages/AdminPage/index.tsx | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 2bf3064e7..052168628 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -127,6 +127,19 @@ export default function App() { ); }; + const { setUserData, getAuthentication, isAuthenticated } = useContext(AuthContext); + + useEffect(() => { + setTimeout(() => { + if(getAuthentication && !isLoginPage){ + getLoggedUser().then((user) => { + setUserData(user); + }).catch((error) => {}); + } + }, 1000); + },[]); + + return ( //need parent component with width and height
diff --git a/src/frontend/src/contexts/authContext.tsx b/src/frontend/src/contexts/authContext.tsx index d15c38e33..18baa0ae2 100644 --- a/src/frontend/src/contexts/authContext.tsx +++ b/src/frontend/src/contexts/authContext.tsx @@ -26,7 +26,7 @@ export function AuthProvider({ children }): React.ReactElement { const cookies = new Cookies(); useEffect(() => { - const storedAccessToken = localStorage.getItem("access_token"); + const storedAccessToken = cookies.get("access_token"); if (storedAccessToken) { setAccessToken(storedAccessToken); } diff --git a/src/frontend/src/controllers/API/api.tsx b/src/frontend/src/controllers/API/api.tsx index 0e1d52c41..6f3742bc7 100644 --- a/src/frontend/src/controllers/API/api.tsx +++ b/src/frontend/src/controllers/API/api.tsx @@ -18,6 +18,9 @@ function ApiInterceptor() { const navigate = useNavigate(); const cookies = new Cookies(); + console.log(accessToken); + + useEffect(() => { const interceptor = api.interceptors.response.use( (response) => response, diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx index 79bc75393..0a875e352 100644 --- a/src/frontend/src/pages/AdminPage/index.tsx +++ b/src/frontend/src/pages/AdminPage/index.tsx @@ -18,12 +18,14 @@ import { import { addUser, deleteUser, + getLoggedUser, getUsersPage, updateUser, } from "../../controllers/API"; import ConfirmationModal from "../../modals/ConfirmationModal"; import UserManagementModal from "../../modals/UserManagementModal"; import { alertContext } from "../../contexts/alertContext"; +import { AuthContext } from "../../contexts/authContext"; export default function AdminPage() { const [inputValue, setInputValue] = useState(""); @@ -33,6 +35,7 @@ export default function AdminPage() { const [loadingUsers, setLoadingUsers] = useState(true); const [totalRowsCount, setTotalRowsCount] = useState(0); const { setErrorData, setSuccessData } = useContext(alertContext); + const { setUserData, getAuthentication, isAuthenticated } = useContext(AuthContext); const userList = useRef([]);