fix: valid session check in rooms container

This commit is contained in:
Linus Flood
2025-01-08 15:24:20 +01:00
parent 1018b3ebcd
commit 8308d00464
4 changed files with 4 additions and 9 deletions

View File

@@ -1,8 +1,10 @@
"use client" "use client"
import { usePathname, useRouter, useSearchParams } from "next/navigation" import { usePathname, useRouter, useSearchParams } from "next/navigation"
import { useSession } from "next-auth/react"
import { useCallback, useEffect, useMemo, useRef } from "react" import { useCallback, useEffect, useMemo, useRef } from "react"
import { debounce } from "@/utils/debounce" import { debounce } from "@/utils/debounce"
import { isValidSession } from "@/utils/session"
import RateSummary from "./RateSummary" import RateSummary from "./RateSummary"
import RoomCard from "./RoomCard" import RoomCard from "./RoomCard"
@@ -20,7 +22,6 @@ import type { RoomSelectionProps } from "@/types/components/hotelReservation/sel
export default function RoomSelection({ export default function RoomSelection({
roomsAvailability, roomsAvailability,
roomCategories, roomCategories,
user,
availablePackages, availablePackages,
selectedPackages, selectedPackages,
setRateCode, setRateCode,
@@ -30,7 +31,8 @@ export default function RoomSelection({
const router = useRouter() const router = useRouter()
const pathname = usePathname() const pathname = usePathname()
const searchParams = useSearchParams() const searchParams = useSearchParams()
const isUserLoggedIn = !!user const session = useSession()
const isUserLoggedIn = isValidSession(session.data)
const roomRefs = useRef<HTMLLIElement[]>([]) const roomRefs = useRef<HTMLLIElement[]>([])
const { roomConfigurations, rateDefinitions } = roomsAvailability const { roomConfigurations, rateDefinitions } = roomsAvailability

View File

@@ -32,8 +32,6 @@ export async function RoomsContainer({
childArray, childArray,
lang, lang,
}: Props) { }: Props) {
const user = await getProfileSafely()
const fromDateString = dt(fromDate).format("YYYY-MM-DD") const fromDateString = dt(fromDate).format("YYYY-MM-DD")
const toDateString = dt(toDate).format("YYYY-MM-DD") const toDateString = dt(toDate).format("YYYY-MM-DD")
@@ -92,7 +90,6 @@ export async function RoomsContainer({
return ( return (
<Rooms <Rooms
user={user}
availablePackages={packages ?? []} availablePackages={packages ?? []}
roomsAvailability={roomsAvailability} roomsAvailability={roomsAvailability}
roomCategories={hotelData?.included?.rooms ?? []} roomCategories={hotelData?.included?.rooms ?? []}

View File

@@ -23,7 +23,6 @@ import type { RoomConfiguration } from "@/server/routers/hotels/output"
export default function Rooms({ export default function Rooms({
roomsAvailability, roomsAvailability,
roomCategories = [], roomCategories = [],
user,
availablePackages, availablePackages,
hotelType, hotelType,
}: SelectRateProps) { }: SelectRateProps) {
@@ -184,7 +183,6 @@ export default function Rooms({
<RoomSelection <RoomSelection
roomsAvailability={rooms} roomsAvailability={rooms}
roomCategories={roomCategories} roomCategories={roomCategories}
user={user}
availablePackages={availablePackages} availablePackages={availablePackages}
selectedPackages={selectedPackages} selectedPackages={selectedPackages}
setRateCode={setSelectedRate} setRateCode={setSelectedRate}

View File

@@ -7,7 +7,6 @@ import type { Rate, RateCode } from "./selectRate"
export interface RoomSelectionProps { export interface RoomSelectionProps {
roomsAvailability: RoomsAvailability roomsAvailability: RoomsAvailability
roomCategories: RoomData[] roomCategories: RoomData[]
user: SafeUser
availablePackages: RoomPackageData | undefined availablePackages: RoomPackageData | undefined
selectedPackages: RoomPackageCodes[] selectedPackages: RoomPackageCodes[]
setRateCode: React.Dispatch<React.SetStateAction<RateCode | undefined>> setRateCode: React.Dispatch<React.SetStateAction<RateCode | undefined>>
@@ -18,7 +17,6 @@ export interface RoomSelectionProps {
export interface SelectRateProps { export interface SelectRateProps {
roomsAvailability: RoomsAvailability roomsAvailability: RoomsAvailability
roomCategories: RoomData[] roomCategories: RoomData[]
user: SafeUser
availablePackages: RoomPackageData availablePackages: RoomPackageData
hotelType: string | undefined hotelType: string | undefined
} }