Merge pull request #1490 from navikt/cookies-skjermdeling-lazyload

Use cookies instead of localStorage to check screensharing user state
navikt · Sep 13, 2023 · 0298a0d · 0298a0d
2 parents d2bc244 + c20fcbd
commit 0298a0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/komponenter/header/Header.tsx b/src/komponenter/header/Header.tsx
@@ -97,7 +97,9 @@ export const Header = () => {
         }
     }, [menypunkt]);
 
-    useLoadIfActiveSession();
+    useLoadIfActiveSession({
+        userState: cookies['psCurrentState']
+    });
 
     // Handle enforced login
     useEffect(() => {

diff --git a/src/utils/hooks/useScreenSharing.ts b/src/utils/hooks/useScreenSharing.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 
-import { VNGAGE_ID, VngageUserState, vendorScripts } from 'komponenter/header/vendorScripts';
+import { vendorScripts } from 'komponenter/header/vendorScripts';
 import { loadExternalScript } from 'utils/external-scripts';
 
 type UseScreenSharingOptions = {
@@ -45,13 +45,10 @@ export function useScreenSharing({ enabled }: UseScreenSharingOptions): UseScree
     };
 }
 
-export function useLoadIfActiveSession() {
+export function useLoadIfActiveSession({ userState }: { userState: string | undefined }) {
     useEffect(() => {
-        const userState = localStorage.getItem(`vngage_${VNGAGE_ID.toLowerCase()}`);
-        const parsedUserState = userState ? (JSON.parse(userState) as VngageUserState) : undefined;
-
-        if (parsedUserState && parsedUserState.user.state !== 'Ready') {
+        if (userState && userState !== 'Ready') {
             loadExternalScript(vendorScripts.skjermdeling);
         }
-    }, []);
+    }, [userState]);
 }