Merge pull request #151 from ajithsimons/update/keycloak

fix: set state issue fix in app layout
eclipse-tractusx · Jul 11, 2024 · deeee05 · deeee05
2 parents afd131b + 5cece1a
commit deeee05
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/src/components/layouts/AppLayout.tsx b/src/components/layouts/AppLayout.tsx
@@ -20,8 +20,6 @@
 import { Box } from '@mui/material';
 
 import { useGetPermissionsQuery, useGetUseCasesQuery } from '../../features/app/apiSlice';
-import { setLoggedInUser } from '../../features/app/slice';
-import { useAppDispatch } from '../../features/store';
 import Nav from '../Nav';
 import Sidebar from '../sidebar';
 
@@ -30,9 +28,6 @@ export default function AppLayout(props: any) {
   useGetUseCasesQuery({});
   useGetPermissionsQuery({});
 
-  const dispatch = useAppDispatch();
-  dispatch(setLoggedInUser(props.loggedUser));
-
   return (
     <Box sx={{ my: 0, mx: 'auto', overflowY: 'auto', overflowX: 'hidden', height: '100vh' }}>
       <Box>

diff --git a/src/features/app/slice.ts b/src/features/app/slice.ts
@@ -32,8 +32,6 @@ const initialState: IAppSlice = {
     company: '',
     bpn: '',
     tenant: '',
-    token: '',
-    parsedToken: {},
   },
   permissions: [],
   useCases: [],

diff --git a/src/features/app/types.ts b/src/features/app/types.ts
@@ -17,8 +17,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-import { KeycloakTokenParsed } from 'keycloak-js';
-
 import { IAlertColors } from '../notifiication/types';
 export interface IUser {
   userName: string;
@@ -27,8 +25,6 @@ export interface IUser {
   company: string;
   bpn: string;
   tenant: string;
-  token: string;
-  parsedToken: KeycloakTokenParsed;
 }
 export interface IAppSlice {
   pageLoading: boolean;

diff --git a/src/services/UserService.ts b/src/services/UserService.ts
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2021,2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2024 T-Systems International GmbH
+ * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -17,10 +17,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-
 import Keycloak from 'keycloak-js';
 
+import { setLoggedInUser } from '../features/app/slice';
 import { IUser } from '../features/app/types';
+import { store } from '../features/store';
 import { getCentralIdp, getClientId, getClientRealm } from './EnvironmentService';
 
 const keycloakConfig: Keycloak.KeycloakConfig = {
@@ -66,34 +67,33 @@ const getLoggedUser = () => ({
   company: getCompany(),
   bpn: getBpn(),
   tenant: getTenant(),
-  token: getToken(),
-  parsedToken: getParsedToken(),
 });
 
 const update = () => {
-  KC.updateToken(50)
+  KC.updateToken(600)
     .then((refreshed: boolean) => {
-      if (refreshed) console.log(`${getUsername()} token refreshed ${refreshed}`);
+      console.log(`${getUsername()} token refreshed ${refreshed}`);
     })
     .catch(() => {
       console.log(`${getUsername()} token refresh failed`);
     });
 };
 
-const initKeycloak = (onAuthenticatedCallback: (loggedUser: IUser) => unknown) => {
+const initKeycloak = (onAuthenticatedCallback: (loggedUser: IUser) => void) => {
   KC.init({
     onLoad: 'login-required',
     pkceMethod: 'S256',
+    enableLogging: true,
   })
     .then(authenticated => {
       if (authenticated) {
         onAuthenticatedCallback(getLoggedUser());
-        setInterval(update, 50000);
+        store.dispatch(setLoggedInUser(getLoggedUser()));
       } else {
-        doLogin();
+        console.log(`${getUsername()} authentication failed`);
       }
     })
-    .catch(console.error);
+    .catch(err => console.log(err));
 };
 
 KC.onTokenExpired = () => {