diff --git a/apps/partner-sas/app/[lang]/(auth)/logout/route.ts b/apps/partner-sas/app/[lang]/(auth)/logout/route.ts index a4984c591..f47d62ea4 100644 --- a/apps/partner-sas/app/[lang]/(auth)/logout/route.ts +++ b/apps/partner-sas/app/[lang]/(auth)/logout/route.ts @@ -1,4 +1,4 @@ -import { type NextRequest } from "next/server" +import { type NextRequest, NextResponse } from "next/server" import { getPublicURL } from "@/server/utils" @@ -13,5 +13,7 @@ export async function GET( const publicURL = getPublicURL(request) const redirectTo: string = publicURL - await signOut({ redirectTo, redirect: true }) + await signOut({ redirectTo, redirect: false }) + + return NextResponse.redirect(redirectTo) } diff --git a/apps/partner-sas/components/Menu/UserMenu/index.tsx b/apps/partner-sas/components/Menu/UserMenu/index.tsx index 735151fa0..3d93a34a2 100644 --- a/apps/partner-sas/components/Menu/UserMenu/index.tsx +++ b/apps/partner-sas/components/Menu/UserMenu/index.tsx @@ -14,7 +14,6 @@ import { useIntl } from "react-intl" import { Avatar } from "@scandic-hotels/design-system/Avatar" import { Button } from "@scandic-hotels/design-system/Button" import { Divider } from "@scandic-hotels/design-system/Divider" -import Link from "@scandic-hotels/design-system/Link" import SkeletonShimmer from "@scandic-hotels/design-system/SkeletonShimmer" import { Typography } from "@scandic-hotels/design-system/Typography" import { trpc } from "@scandic-hotels/trpc/client" @@ -188,13 +187,12 @@ function UserMenuContent({

- - {intl.formatMessage({ defaultMessage: "Logout" })} - + + {/* Link triggers rsc which doesn't reload complete page and shows logged in even after logout */} + + {intl.formatMessage({ defaultMessage: "Logout" })} + + ) } diff --git a/apps/partner-sas/components/Menu/UserMenu/user-menu.module.css b/apps/partner-sas/components/Menu/UserMenu/user-menu.module.css index 7b5cd4504..f335a5e5c 100644 --- a/apps/partner-sas/components/Menu/UserMenu/user-menu.module.css +++ b/apps/partner-sas/components/Menu/UserMenu/user-menu.module.css @@ -33,10 +33,19 @@ .logoutLink, .loginLink { color: var(--Text-sas-20); - font-weight: 400; text-decoration: none; } +.userDetailsContainer .logoutLink { + text-decoration: none; + font-weight: normal; + + &:hover { + color: var(--Text-sas-20); + text-decoration: none; + } +} + .modal { position: fixed; top: calc(var(--main-menu-mobile-height) + var(--sitewide-alert-height));