Merged in fix/my-stay-webview-2 (pull request #2191)

fix: webview - mystay - check if we have webviewToken

* fix: webview - mystay - check if we have webviewToken

* Cleanup


Approved-by: Joakim Jäderberg

apps/scandic-web/components/Header/MainMenu/MobileMenuWrapper/index.tsx

@@ -1,7 +1,6 @@
 import { getHeader } from "@/lib/trpc/memoizedRequests"
 
-import { auth } from "@/auth"
-import { isValidSession } from "@/utils/session"
+import { isLoggedInUser } from "@/utils/isLoggedInUser"
 
 import MobileMenu from "../MobileMenu"
 
@@ -10,17 +9,15 @@ export default async function MobileMenuWrapper({
 }: React.PropsWithChildren) {
   // preloaded
   const header = await getHeader()
-  const session = await auth()
 
   if (!header) {
     return null
   }
 
+  const isLoggedIn = await isLoggedInUser()
+
   return (
-    <MobileMenu
-      topLink={header.data.topLink}
-      isLoggedIn={isValidSession(session)}
-    >
+    <MobileMenu topLink={header.data.topLink} isLoggedIn={isLoggedIn}>
       {children}
     </MobileMenu>
   )

apps/scandic-web/components/Header/TopMenu/index.tsx

@@ -5,14 +5,13 @@ import {
 import { env } from "@/env/server"
 import { getHeader } from "@/lib/trpc/memoizedRequests"
 
-import { auth } from "@/auth"
 import { IconName } from "@/components/Icons/iconName"
 import LanguageSwitcher from "@/components/LanguageSwitcher"
 import SkeletonShimmer from "@/components/SkeletonShimmer"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
-import { isValidSession } from "@/utils/session"
+import { isLoggedInUser } from "@/utils/isLoggedInUser"
 import { getCurrentWebUrl } from "@/utils/url"
 
 import HeaderLink from "../HeaderLink"
@@ -25,8 +24,7 @@ export default async function TopMenu() {
   const intl = await getIntl()
   // both preloaded
   const header = await getHeader()
-  const session = await auth()
-  const isLoggedIn = isValidSession(session)
+  const isLoggedIn = await isLoggedInUser()
 
   if (!header) {
     return null