Merge pull request #623 from ita-social-projects/#584-LogOut

#584 log out
ita-social-projects · Jun 10, 2024 · 2936fdb · 2936fdb
2 parents 1045435 + 0952d80
commit 2936fdb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 40 deletions.
diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Logout.jsx b/FrontEnd/src/components/HeaderFooter/header/navbar/Logout.jsx
diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx b/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx
@@ -1,5 +1,5 @@
 import { Link, useNavigate } from 'react-router-dom';
-
+import axios from 'axios';
 import { useAuth } from '../../../../hooks';
 
 import DropdownMenu from './DropdownMenu';
@@ -8,12 +8,24 @@ import avatar_image from './Avatar.png';
 
 
 function Profile() {
-  const { user } = useAuth();
+  const { user, isAuth, logout } = useAuth();
   const navigate = useNavigate();
+
   const navigateToProfile = () => {
     navigate(`/profile-detail/${user.profile_id}`);
   };
 
+  const performLogout = async () => {
+    if (isAuth) {
+      try {
+        await axios.post(`${process.env.REACT_APP_BASE_API_URL}/api/auth/token/logout`);
+        await logout();
+      } catch (error) {
+        console.error('Error during logout', error);
+      }
+    }
+  };
+
   return (
     <div className={css['header-profile-section']}>
       <img
@@ -24,7 +36,7 @@ function Profile() {
       />
       <DropdownMenu toggleText="Профіль">
         <Link to="/profile/user-info">Профіль</Link>
-        <Link to="/logout">Вихід</Link>
+        <button onClick={performLogout}>Вихід</button>
       </DropdownMenu>
     </div>
   );

diff --git a/FrontEnd/src/components/basicPage/BasicPage.jsx b/FrontEnd/src/components/basicPage/BasicPage.jsx
@@ -9,7 +9,6 @@ import AuthorizationPage from '../authorization/AuthorizationPage';
 import CookiesPolicyComponent from '../CookiesPolicyPage/CookiesPolicyComponent';
 import Footer from '../HeaderFooter/footer/Footer';
 import Header from '../HeaderFooter/header/Header';
-import Logout from '../HeaderFooter/header/navbar/Logout';
 import Loader from '../loader/Loader';
 import MainPage from '../landing-page/MainPage';
 import PrivacyPolicy from '../PrivacyPolicyPage/PrivacyPolicyPage';
@@ -117,11 +116,6 @@ function BasicPage() {
         ) : (
           <Route path="/login" element={<AuthorizationPage />} />
         )}
-        {!isAuth ? (
-          <Route path="/logout" element={<Navigate to="/" />} />
-        ) : (
-          <Route path="/logout" element={<Logout />} />
-          )}
         {isAuth ? (
           <Route
             path="/sign-up"

diff --git a/FrontEnd/src/components/profileList/ProfileListPage.jsx b/FrontEnd/src/components/profileList/ProfileListPage.jsx
@@ -64,7 +64,7 @@ export default function ProfileListPage({ isAuthorized }) {
     data: fetchedProfiles,
     error,
     isLoading,
-  } = useSWR(filterSaved ? urlForSaved : urlForAll, fetcher);
+  } = useSWR(filterSaved && isAuthorized ? urlForSaved : urlForAll, fetcher);
 
   const handleRadioSelect = () => {
     if (!filterSaved) {

diff --git a/FrontEnd/src/context/AuthContextProvider.js b/FrontEnd/src/context/AuthContextProvider.js
@@ -1,5 +1,4 @@
 import { useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 import useSWR from 'swr';
 import axios from 'axios';
 import { AuthContext } from '../context';
@@ -9,7 +8,6 @@ export function AuthProvider({ children }) {
   const [user, setUser] = useState(null);
   const [isLoading, setLoading] = useState(true);
   const [authToken, setAuthToken] = useState(localStorage.getItem('Token'));
-  const navigate = useNavigate();
   const [isStaff, setIsStaff] = useState(false);
   const { data, error, mutate } = useSWR(
     authToken
@@ -47,7 +45,6 @@ export function AuthProvider({ children }) {
     setIsAuth(false);
     setIsStaff(false);
     setUser(null);
-    navigate('/', { replace: true });
   };
 
   useEffect(() => {