Merged in fix/SW-3578-user-is-forced-to-login- (pull request #3044)
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:
committed by
Joakim Jäderberg
parent
15a2da333d
commit
1c7f72e95d
@@ -1,11 +1,9 @@
|
||||
import "server-only"
|
||||
|
||||
import { createLogger } from "@scandic-hotels/common/logger/createLogger"
|
||||
|
||||
import type { Session } from "next-auth"
|
||||
|
||||
const sessionLogger = createLogger("session")
|
||||
export function isValidSession(session: Session | null): session is Session {
|
||||
const sessionLogger = createLogger("session")
|
||||
if (!session) {
|
||||
return false
|
||||
}
|
||||
@@ -15,13 +13,12 @@ export function isValidSession(session: Session | null): session is Session {
|
||||
return false
|
||||
}
|
||||
|
||||
const token = session.token
|
||||
|
||||
if (token?.error) {
|
||||
sessionLogger.error(`Session token error: ${token.error}`)
|
||||
if (session.token?.error) {
|
||||
sessionLogger.error(`Session token error: ${session.token.error}`)
|
||||
return false
|
||||
}
|
||||
if (token?.expires_at && token.expires_at < Date.now()) {
|
||||
|
||||
if (session.token?.expires_at && session.token.expires_at < Date.now()) {
|
||||
sessionLogger.debug(`Session expired: ${session.token.expires_at}`)
|
||||
return false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user