fix logout in producer area

benjaminpochat · Aug 26, 2024 · 7c8cddd · 7c8cddd
1 parent 91b2f03
commit 7c8cddd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/frontend/app/src/layouts/customer/CustomerLayout.tsx b/frontend/app/src/layouts/customer/CustomerLayout.tsx
@@ -7,14 +7,16 @@ import { AuthenticationService } from '../../authentication/service/Authenticati
 import { Login, Logout } from '@mui/icons-material'
 import { Navigate, Outlet, useLoaderData, useNavigate } from 'react-router-dom'
 import { ApiBuilder } from '../../api/ApiBuilder.ts'
+import { UrlService } from '../../domains/commons/service/UrlService.ts'
 
 
 export default function CustomerLayout() {
 
     const {keycloak} = useKeycloak()
     const authenticationService = new AuthenticationService(keycloak)
+    const urlService = new UrlService()
 
-    const data  = useLoaderData()
+    const data = useLoaderData()
     const authenticatedAsProducer = data.authenticatedAsProducer
     const customer = data.customer
 
@@ -25,11 +27,16 @@ export default function CustomerLayout() {
         return <Navigate to='/customer/registration'/>
     }
 
+    async function logout() {
+        const frontendUrl = await urlService.getCustomerFrontentUrl()
+        keycloak.logout({redirectUri: frontendUrl})
+    }
+
     function displayAuthenticationButton(): React.ReactNode {
         if (authenticationService.isAuthenticated()) {
             return <>
                 <Typography>{authenticationService.getCurrentUserFirstName() } {authenticationService.getCurrentUserLastName()}</Typography>
-                <IconButton onClick={keycloak.logout} color="inherit">
+                <IconButton onClick={logout} color="inherit">
                     <Logout/>
                 </IconButton>
             </>

diff --git a/frontend/app/src/layouts/producer/AuthenticatedLayout.tsx b/frontend/app/src/layouts/producer/AuthenticatedLayout.tsx
@@ -9,12 +9,14 @@ import {Close, Logout, Menu} from '@mui/icons-material'
 import SideMenu from './SideMenu.jsx'
 import { AuthenticationService } from '../../authentication/service/AuthenticationService.ts';
 import { Navigate, Outlet, useLoaderData } from 'react-router-dom';
+import { UrlService } from '../../domains/commons/service/UrlService.ts';
 
 
 export default function AuthenticatedLayout() {
     const { keycloak } = useKeycloak()
     const [sideMenuOpen, setSideMenuOpen] = useState(false)
     const authenticationService = new AuthenticationService(keycloak)
+    const urlService = new UrlService()
 
     const authenticatedAsCustomer: boolean = useLoaderData()
 
@@ -31,7 +33,11 @@ export default function AuthenticatedLayout() {
         return <Menu/>
       }
     }
-
+
+    async function logout() {
+      const frontendUrl = await urlService.getProducerFrontentUrl()
+      keycloak.logout({redirectUri: `${frontendUrl}/authentication`})
+    }
 
     function getAuthenticatedLayout() {
       return <Box sx={{ display: 'flex' }}>
@@ -60,7 +66,7 @@ export default function AuthenticatedLayout() {
                             Viande en direct
                         </Typography>
                         <Typography>{authenticationService.getCurrentUserFirstName() } {authenticationService.getCurrentUserLastName()}</Typography>
-                        <IconButton onClick={keycloak.logout} color="inherit">
+                        <IconButton onClick={logout} color="inherit">
                           <Logout/>
                         </IconButton>
                     </Toolbar>