scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/SW-3578-user-is-forced-to-login- (pull request #3044)

Browse Source 
fix(SW-3578): Fixed session issue when sas session expires

* fix(SW-3578): Fixed session issue when sas session expires

* base socialLogin auto-features on validSession and being linked

* remove unused object

* remove 'import server-only' for isValidSession() since it's only using passed data

* remove isValidClientSession()


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
This commit is contained in:
Hrishikesh Vaipurkar
2025-11-03 12:50:25 +00:00
committed by Joakim Jäderberg
parent 15a2da333d
commit 1c7f72e95d
8 changed files with 80 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/scandic-web/components/Header/MainMenu/MyPagesMenuWrapper/index.tsx
View File

@@ -9,9 +9,9 @@ import { Avatar } from "@scandic-hotels/design-system/Avatar"
import { LoginButton } from "@scandic-hotels/design-system/LoginButton"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { trpc } from "@scandic-hotels/trpc/client"
import { isValidSession } from "@scandic-hotels/trpc/utils/session"
import useLang from "@/hooks/useLang"
import { isValidClientSession } from "@/utils/clientSession"
import { trackLoginClick } from "@/utils/tracking"
import MyPagesMenu, { MyPagesMenuSkeleton } from "../MyPagesMenu"
@@ -27,7 +27,7 @@ export default function MyPagesMenuWrapper() {
const loginPathname = useLazyPathname({ includeSearchParams: true })
const { data: session } = useSession()
const isUserLoggedIn = isValidClientSession(session)
const isUserLoggedIn = isValidSession(session)
const { data: user, isLoading: isLoadingUser } = trpc.user.name.useQuery()
const { data: membership, isLoading: isLoadingMembership } =