Logout user

OpenConext · Jan 28, 2025 · 2f5dd12 · 2f5dd12
1 parent 4ab05cb
commit 2f5dd12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/servicedesk-gui/src/App.jsx b/servicedesk-gui/src/App.jsx
@@ -51,15 +51,16 @@ const App = () => {
                 {isAuthenticated &&
                     <Routes>
                         <Route path="/" element={<Navigate replace to="home"/>}/>
-                        <Route path="home/:tab?" element={<Home/>}/>
-                        <Route path="refresh-route/:path" element={<RefreshRoute/>}/>
+                        <Route path="/home/:tab?" element={<Home/>}/>
+                        <Route path="/refresh-route/:path" element={<RefreshRoute/>}/>
+                        <Route path="/login" element={<Login/>}/>
                         <Route path="*" element={<NotFound/>}/>
                     </Routes>}
                 {!isAuthenticated &&
                     <Routes>
                         <Route path="/" element={<Navigate replace to="login"/>}/>
                         <Route path="/home" element={<Navigate replace to="login"/>}/>
-                        <Route path="login" element={<Login/>}/>
+                        <Route path="/login" element={<Login/>}/>
                         <Route path="/*" element={<NotFound/>}/>
                     </Routes>}
             </div>

diff --git a/servicedesk-gui/src/api/index.js b/servicedesk-gui/src/api/index.js
@@ -68,18 +68,12 @@ export function me() {
     return fetchJson("/myconext/api/sp/me");
 }
 
-export function forgetMe() {
-    return fetchDelete("/myconext/api/sp/forget");
-}
-
 export function logout() {
     const fetchOptions = {
         credentials: "same-origin",
         redirect: "manual"
     };
-    return forgetMe().then(() =>
-        fetchJson("/myconext/api/sp/logout").then(() => fetch("/Shibboleth.sso/Logout", fetchOptions))
-    );
+    return fetchJson("/myconext/api/sp/logout").then(() => fetch("/Shibboleth.sso/Logout", fetchOptions));
 }
 
 //Service Desk

diff --git a/servicedesk-gui/src/components/UserMenu.jsx b/servicedesk-gui/src/components/UserMenu.jsx
@@ -16,8 +16,8 @@ export const UserMenu = ({user}) => {
     const logoutUser = e => {
         stopEvent(e);
         logout().then(() => {
-            useAppStore.setState(() => ({breadcrumbPath: []}));
-            navigate("/login", {state: "force"});
+            useAppStore.setState(() => ({breadcrumbPath: [], user: {}, controlCode: {}}));
+            navigate("/login");
             setTimeout(() =>
                 useAppStore.setState(() => ({user: null, breadcrumbPath: []})), 125);
         });

diff --git a/servicedesk-gui/src/pages/Login.jsx b/servicedesk-gui/src/pages/Login.jsx
@@ -10,7 +10,7 @@ export const Login = () => {
 
     const doLogin = () => {
         const path = window.location.origin;
-        window.location.href = `${path}/Shibboleth.sso/Login?target=/home`;
+        window.location.href = `${path}/Shibboleth.sso/Login?target=/`;
     }
 
     return (