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

30
apps/partner-sas/components/BookingFlowProviders.tsx
View File

@@ -3,15 +3,11 @@
import { useSession } from "next-auth/react"
import { BookingFlowContextProvider } from "@scandic-hotels/booking-flow/BookingFlowContextProvider"
import { dt } from "@scandic-hotels/common/dt"
import { createLogger } from "@scandic-hotels/common/logger/createLogger"
import { trpc } from "@scandic-hotels/trpc/client"
import { isValidSession } from "@scandic-hotels/trpc/utils/session"
import type { Session } from "next-auth"
import type { ComponentProps, ReactNode } from "react"
const logger = createLogger("BookingFlowProviders")
export function BookingFlowProviders({ children }: { children: ReactNode }) {
const user = useBookingFlowUser()
const isLinkedUser =
@@ -36,7 +32,7 @@ type BookingFlowUser = BookingFlowContextData["user"]
function useBookingFlowUser(): BookingFlowUser {
const { data: session } = useSession()
const hasValidSession = isValidClientSession(session)
const hasValidSession = isValidSession(session)
const {
data: euroBonusProfile,
@@ -66,25 +62,3 @@ function useBookingFlowUser(): BookingFlowUser {
},
}
}
function isValidClientSession(session: Session | null) {
if (!session) {
return false
}
if (session.error) {
logger.error(`Session error: ${session.error}`)
return false
}
if (session.token.error) {
logger.error(`Session token error: ${session.token.error}`)
return false
}
const expiresAt = dt(session.token.expires_at)
if (session.token.expires_at && expiresAt.isBefore(dt())) {
logger.warn(`Session expired: ${expiresAt.toISOString()}`)
return false
}
return true
}