Merged in fix/isloggedin-topmenu (pull request #1184)

feat: avoid calling api to check if we have valid session

* feat: avoid calling api to check if we have valid session


Approved-by: Erik Tiekstra

components/Header/TopMenu/index.tsx

@@ -1,13 +1,11 @@
-import {
-  getHeader,
-  getLanguageSwitcher,
-  getName,
-} from "@/lib/trpc/memoizedRequests"
+import { getHeader, getLanguageSwitcher } from "@/lib/trpc/memoizedRequests"
 
+import { auth } from "@/auth"
 import LanguageSwitcher from "@/components/LanguageSwitcher"
 import SkeletonShimmer from "@/components/SkeletonShimmer"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 import { getIntl } from "@/i18n"
+import { isValidSession } from "@/utils/session"
 
 import HeaderLink from "../HeaderLink"
 import TopLink from "../TopLink"
@@ -22,7 +20,8 @@ export default async function TopMenu() {
   // both preloaded
   const languages = await getLanguageSwitcher()
   const header = await getHeader()
-  const user = await getName()
+  const session = await auth()
+  const isLoggedIn = isValidSession(session)
 
   if (!languages || !header) {
     return null
@@ -31,7 +30,7 @@ export default async function TopMenu() {
   return (
     <div className={styles.topMenu}>
       <div className={styles.content}>
-        <TopLink isLoggedIn={!!user} topLink={header.data.topLink} />
+        <TopLink isLoggedIn={isLoggedIn} topLink={header.data.topLink} />
         <div className={styles.options}>
           <LanguageSwitcher type="desktopHeader" urls={languages.urls} />
 
@@ -50,6 +49,7 @@ export function TopMenuSkeleton() {
   return (
     <div className={styles.topMenu}>
       <div className={styles.content}>
+        <SkeletonShimmer width="11ch" height="1.2em" />
         <div className={styles.options}>
           <SkeletonShimmer width="25ch" height="1.2em" />
         </div>