From ce3412b29f0e25fb296c85e008cf78d611b95bd1 Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Mon, 10 Nov 2025 13:06:51 +0000 Subject: [PATCH] Merged in feat/sw-3601-hookfix (pull request #3113) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Feat(SW-3601): useIsUserLoggedIn needs to check webview token * fix(SW-3601): useIsUserLoggedIn needs to check webview token * Check if we have webview token as well * . Approved-by: Joakim Jäderberg --- apps/scandic-web/hooks/useIsUserLoggedIn.ts | 5 +++-- .../tracking/lib/useTrackHardNavigationBasic.ts | 13 ++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/scandic-web/hooks/useIsUserLoggedIn.ts b/apps/scandic-web/hooks/useIsUserLoggedIn.ts index be2ee881a..95af76991 100644 --- a/apps/scandic-web/hooks/useIsUserLoggedIn.ts +++ b/apps/scandic-web/hooks/useIsUserLoggedIn.ts @@ -4,6 +4,7 @@ import { isValidSession } from "@scandic-hotels/trpc/utils/session" export function useIsUserLoggedIn() { const { data: session } = useSession() - const isUserLoggedIn = isValidSession(session) - return isUserLoggedIn + const hasWebviewToken = document?.cookie?.includes("webviewToken=") + + return isValidSession(session) || hasWebviewToken } diff --git a/packages/tracking/lib/useTrackHardNavigationBasic.ts b/packages/tracking/lib/useTrackHardNavigationBasic.ts index c3e30fadf..788b51732 100644 --- a/packages/tracking/lib/useTrackHardNavigationBasic.ts +++ b/packages/tracking/lib/useTrackHardNavigationBasic.ts @@ -23,6 +23,9 @@ export const useTrackHardNavigationBasic = ({ const sessionId = useSessionId() const { data: session } = useSession() const validSession = isValidSession(session) + const hasWebviewToken = global?.document?.cookie?.includes("webviewToken=") + + const isUserLoggedIn = validSession || !!hasWebviewToken useEffect(() => { if (hasTrackedHardNavigationBasic) return @@ -31,23 +34,23 @@ export const useTrackHardNavigationBasic = ({ pathName, sessionId, pageData, - validSession, + isUserLoggedIn, }) hasTrackedHardNavigationBasic = true - }, [pathName, pageData, sessionId, validSession]) + }, [pathName, pageData, sessionId, isUserLoggedIn]) } const trackBasicPageView = async ({ pathName, sessionId, pageData, - validSession, + isUserLoggedIn, }: { pathName: string sessionId: string | null pageData: TrackingSDKProps["pageData"] - validSession: boolean + isUserLoggedIn: boolean }) => { const trackingData = { ...pageData, pathName, sessionId } const pageObject = createSDKPageObject(trackingData) @@ -56,7 +59,7 @@ const trackBasicPageView = async ({ event: "pageViewBasic", pageInfo: pageObject, userInfo: { - loginStatus: validSession ? "logged in" : "Non-logged in", + loginStatus: isUserLoggedIn ? "logged in" : "Non-logged in", }, }) }