Fix: renew token only if user is logged in (#1036)

* renew token if user loged * fix test
InseeFr · Oct 15, 2024 · 5f9b4a9 · 5f9b4a9
1 parent dfd5af9
commit 5f9b4a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/packages/application/router/index.spec.tsx b/src/packages/application/router/index.spec.tsx
@@ -60,7 +60,7 @@ describe('RBACLink Component', () => {
 		);
 
 		screen.getByText('Child Component');
-		screen.getByText('TestApp - Front 1.0.0 - API 2.0.0');
+		screen.getByText('TestApp - IHM 1.0.0 - API 2.0.0');
 		screen.getByAltText('application logo');
 	});
 

diff --git a/src/packages/application/router/index.tsx b/src/packages/application/router/index.tsx
@@ -29,7 +29,7 @@ export const RBACLink = ({ children }: PropsWithChildren<unknown>) => {
 		properties: { authorizationHost },
 	} = useAppContext();
 	const { version } = useAppContext();
-	const footer = `${getEnvVar('NAME')} - Front ${getEnvVar(
+	const footer = `${getEnvVar('NAME')} - IHM ${getEnvVar(
 		'VERSION',
 	)} - API ${version}`;
 

diff --git a/src/packages/auth/open-id-connect-auth/use-oidc.tsx b/src/packages/auth/open-id-connect-auth/use-oidc.tsx
@@ -17,7 +17,7 @@ const LoginOidcComponent = ({
 	const { isUserLoggedIn, login, oidcTokens } = useOidc({
 		assertUserLoggedIn: false,
 	});
-	const { renewTokens } = useOidc({ assertUserLoggedIn: false });
+	const { renewTokens } = useOidc({ assertUserLoggedIn: true });
 	const [userInformationLoaded, setUserInformationLoaded] = useState(false);
 
 	if (!isUserLoggedIn) {
@@ -35,10 +35,10 @@ const LoginOidcComponent = ({
 				saveUserProps({ roles, stamp });
 				setUserInformationLoaded(true);
 			});
+			setInterval(() => {
+				renewTokens();
+			}, 120000);
 		}
-		setInterval(() => {
-			renewTokens();
-		}, 120000);
 	}, []);
 
 	useEffect(() => {

diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -11,10 +11,10 @@ type ImportMetaEnv = {
   VITE_OIDC_CLIENT_ID: string
   VITE_CONCEPTS_DOCUMENTATION: string
   VITE_OPERATIONS_DOCUMENTATION: string
-  VITE_DEV_TOOLS_ENABLED: boolean
+  VITE_DEV_TOOLS_ENABLED: string
+  VITE_INSEE: string
   VITE_NAME: string
   VITE_VERSION: string
-  VITE_INSEE: boolean
   BASE_URL: string
   MODE: string
   DEV: boolean