From d827bf04d05701c25e80580b15b7f0c77a957539 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@scandichotels.com>
Date: Wed, 16 Apr 2025 13:05:57 +0200
Subject: [PATCH] fix(SW-2210): Checking for session inside MyPagesMenu to sync
 session state

---
 .../Header/MainMenu/MyPagesMenuWrapper/index.tsx       |  7 ++++++-
 apps/scandic-web/utils/clientSession.ts                | 10 +++++++++-
 apps/scandic-web/utils/session.ts                      |  1 -
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/scandic-web/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx b/apps/scandic-web/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx
index b275b47f6..7480979ed 100644
--- a/apps/scandic-web/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx
+++ b/apps/scandic-web/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx
@@ -1,5 +1,6 @@
 "use client"
 
+import { useSession } from "next-auth/react"
 import { useIntl } from "react-intl"
 
 import { MembershipLevelEnum } from "@/constants/membershipLevels"
@@ -7,6 +8,7 @@ import { trpc } from "@/lib/trpc/client"
 
 import LoginButton from "@/components/LoginButton"
 import useLang from "@/hooks/useLang"
+import { isValidClientSession } from "@/utils/clientSession"
 
 import Avatar from "../Avatar"
 import MyPagesMenu, { MyPagesMenuSkeleton } from "../MyPagesMenu"
@@ -20,6 +22,9 @@ export default function MyPagesMenuWrapper() {
   const intl = useIntl()
   const lang = useLang()
 
+  const { data: session } = useSession()
+  const isUserLoggedIn = isValidClientSession(session)
+
   const { data: user, isLoading: isLoadingUser } = trpc.user.name.useQuery()
   const { data: membership, isLoading: isLoadingMembership } =
     trpc.user.safeMembershipLevel.useQuery()
@@ -41,7 +46,7 @@ export default function MyPagesMenuWrapper() {
 
   return (
     <>
-      {user ? (
+      {isUserLoggedIn && user ? (
         <>
           <MyPagesMenu
             membershipLevel={membershipLevel ?? null}
diff --git a/apps/scandic-web/utils/clientSession.ts b/apps/scandic-web/utils/clientSession.ts
index abb2dcc6b..5556e3212 100644
--- a/apps/scandic-web/utils/clientSession.ts
+++ b/apps/scandic-web/utils/clientSession.ts
@@ -2,7 +2,6 @@ import type { Session } from "next-auth"
 
 export function isValidClientSession(session: Session | null) {
   if (!session) {
-    console.log("No session available (user not authenticated).")
     return false
   }
   if (session.error) {
@@ -10,5 +9,14 @@ export function isValidClientSession(session: Session | null) {
     return false
   }
 
+  if (session.token.error) {
+    console.log(`Session token error: ${session.token.error}`)
+    return false
+  }
+  if (session.token.expires_at && session.token.expires_at < Date.now()) {
+    console.log(`Session expired: ${session.token.expires_at}`)
+    return false
+  }
+
   return true
 }
diff --git a/apps/scandic-web/utils/session.ts b/apps/scandic-web/utils/session.ts
index fc818a24b..e345468b8 100644
--- a/apps/scandic-web/utils/session.ts
+++ b/apps/scandic-web/utils/session.ts
@@ -4,7 +4,6 @@ import type { Session } from "next-auth"
 
 export function isValidSession(session: Session | null): session is Session {
   if (!session) {
-    console.log("No session available (user not authenticated).")
     return false
   }
   if (session.error) {