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

Merged in feat/SW-3549-pass-scandic-token (pull request #2989)

Browse Source 
Feat/SW-3549 pass scandic token

* WIP pass scandic token

* pass scandic token when booking

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* pass user token when doing availability search

* undo changes

* merge

* Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988)

fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages

* Merged in fix/update-promo-error-modal-text (pull request #2990)

fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall

* Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991)

fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar

* Merged in feat/lokalise-rebuild (pull request #2993)

Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood

* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994)

feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg

* merge

* replace getRedemptionTokenSafely() with context based instead

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* add booking scope

remove unused getMembershipNumber()


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
This commit is contained in:
Joakim Jäderberg
2025-10-24 13:17:02 +00:00
parent c473bbc8b0
commit 3b3e7308cc
36 changed files with 558 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/trpc/lib/routers/hotels/availability/enterDetails.ts
View File

@@ -9,8 +9,7 @@ import { SEARCH_TYPE_REDEMPTION } from "../../../constants/booking"
import { AvailabilityEnum } from "../../../enums/selectHotel"
import { unauthorizedError } from "../../../errors"
import { safeProtectedServiceProcedure } from "../../../procedures"
import { getRedemptionTokenSafely } from "../../../utils/getRedemptionTokenSafely"
import { getUserPointsBalance } from "../../../utils/getUserPointsBalance"
import { isValidSession } from "../../../utils/session"
import { baseBookingSchema, baseRoomSchema, selectedRoomSchema } from "../input"
import { getHotel } from "../services/getHotel"
import { getRoomsAvailability } from "../services/getRoomsAvailability"
@@ -32,18 +31,23 @@ export const enterDetailsRoomsAvailabilityInputSchema = z.object({
lang: z.nativeEnum(Lang),
})
type Context = {
userToken: string | null
userPoints?: number
}
const logger = createLogger("trpc:availability:enterDetails")
export const enterDetails = safeProtectedServiceProcedure
.input(enterDetailsRoomsAvailabilityInputSchema)
.use(async ({ ctx, input, next }) => {
const userToken = await ctx.getScandicUserToken()
if (input.booking.searchType === SEARCH_TYPE_REDEMPTION) {
if (ctx.session?.token.access_token) {
const pointsValue = await getUserPointsBalance(ctx.session)
const token = getRedemptionTokenSafely(ctx.session, ctx.serviceToken)
if (pointsValue !== undefined && token) {
return next({
if (isValidSession(ctx.session)) {
const pointsValue = await ctx.getUserPointsBalance()
if (pointsValue && userToken) {
return next<Context>({
ctx: {
token: token,
userToken,
userPoints: pointsValue,
},
input,
@@ -52,19 +56,20 @@ export const enterDetails = safeProtectedServiceProcedure
}
throw unauthorizedError()
}
return next({
return next<Context>({
ctx: {
token: ctx.serviceToken,
userToken,
},
})
})
.query(async function ({ ctx, input }) {
const availability = await getRoomsAvailability(
input,
ctx.token,
ctx.userToken,
ctx.serviceToken,
ctx.userPoints
)
const hotelData = await getHotel(
{
hotelId: input.booking.hotelId,

64
packages/trpc/lib/routers/hotels/availability/hotelsByCity.ts
View File

@@ -6,9 +6,7 @@ import { getCacheClient } from "@scandic-hotels/common/dataCache"
import { env } from "../../../../env/server"
import { unauthorizedError } from "../../../errors"
import { safeProtectedServiceProcedure } from "../../../procedures"
import { toApiLang } from "../../../utils"
import { getRedemptionTokenSafely } from "../../../utils/getRedemptionTokenSafely"
import { getUserPointsBalance } from "../../../utils/getUserPointsBalance"
import { isValidSession } from "../../../utils/session"
import { getHotelsAvailabilityByCity } from "../services/getHotelsAvailabilityByCity"
export type HotelsAvailabilityInputSchema = z.output<
@@ -64,35 +62,40 @@ export const hotelsAvailabilityInputSchema = z
}
)
type Context = {
userToken: string | null
userPoints?: number
}
export const hotelsByCity = safeProtectedServiceProcedure
.input(hotelsAvailabilityInputSchema)
.use(async ({ ctx, input, next }) => {
const userToken = await ctx.getScandicUserToken()
if (input.redemption) {
if (ctx.session?.token.access_token) {
const pointsValue = await getUserPointsBalance(ctx.session)
const token = getRedemptionTokenSafely(ctx.session, ctx.serviceToken)
if (pointsValue !== undefined && token) {
return next({
ctx: {
token: token,
userPoints: pointsValue,
},
input,
})
}
const hasValidSession = isValidSession(ctx.session)
if (!hasValidSession) {
throw unauthorizedError()
}
const pointsValue = await ctx.getUserPointsBalance()
if (pointsValue && userToken) {
return next<Context>({
ctx: {
userToken,
userPoints: pointsValue,
},
})
}
throw unauthorizedError()
}
return next({
return next<Context>({
ctx: {
token: ctx.serviceToken,
userToken,
},
input,
})
})
.query(async ({ ctx, input }) => {
const { lang } = ctx
const apiLang = toApiLang(lang)
const {
cityId,
roomStayStartDate,
@@ -105,19 +108,26 @@ export const hotelsByCity = safeProtectedServiceProcedure
// In case of redemption do not cache result
if (redemption) {
return getHotelsAvailabilityByCity(
return getHotelsAvailabilityByCity({
input,
apiLang,
ctx.token,
ctx.userPoints
)
lang: ctx.lang,
userToken: ctx.userToken,
serviceToken: ctx.serviceToken,
userPoints: ctx.userPoints,
})
}
const cacheClient = await getCacheClient()
return await cacheClient.cacheOrGet(
`${cityId}:${roomStayStartDate}:${roomStayEndDate}:${adults}:${children}:${bookingCode}`,
async () => {
return getHotelsAvailabilityByCity(input, apiLang, ctx.token)
return getHotelsAvailabilityByCity({
input,
lang: ctx.lang,
userToken: undefined,
serviceToken: ctx.serviceToken,
userPoints: undefined,
})
},
env.CACHE_TIME_CITY_SEARCH
)

26
packages/trpc/lib/routers/hotels/availability/hotelsByCityWithBookingCode.ts
View File

@@ -1,5 +1,4 @@
import { serviceProcedure } from "../../../procedures"
import { toApiLang } from "../../../utils"
import { getHotelsAvailabilityByCity } from "../services/getHotelsAvailabilityByCity"
import { getHotelsAvailabilityByHotelIds } from "../services/getHotelsAvailabilityByHotelIds"
import { hotelsAvailabilityInputSchema } from "./hotelsByCity"
@@ -7,14 +6,13 @@ import { hotelsAvailabilityInputSchema } from "./hotelsByCity"
export const hotelsByCityWithBookingCode = serviceProcedure
.input(hotelsAvailabilityInputSchema)
.query(async ({ input, ctx }) => {
const { lang } = ctx
const apiLang = toApiLang(lang)
const bookingCodeAvailabilityResponse = await getHotelsAvailabilityByCity(
const bookingCodeAvailabilityResponse = await getHotelsAvailabilityByCity({
input,
apiLang,
ctx.serviceToken
)
lang: ctx.lang,
userToken: undefined,
serviceToken: ctx.serviceToken,
userPoints: undefined,
})
// Get regular availability of hotels which don't have availability with booking code.
const unavailableHotelIds = bookingCodeAvailabilityResponse.availability
@@ -36,11 +34,13 @@ export const hotelsByCityWithBookingCode = serviceProcedure
bookingCode: "",
hotelIds: unavailableHotelIds,
}
const unavailableHotels = await getHotelsAvailabilityByHotelIds(
unavailableHotelsInput,
apiLang,
ctx.serviceToken
)
const unavailableHotels = await getHotelsAvailabilityByHotelIds({
input: unavailableHotelsInput,
lang: ctx.lang,
serviceToken: ctx.serviceToken,
userToken: undefined,
userPoints: undefined,
})
// No regular rates available due to network or API failure (no need to filter & merge).
if (!unavailableHotels) {

55
packages/trpc/lib/routers/hotels/availability/hotelsByHotelIds.ts
View File

@@ -3,9 +3,7 @@ import { z } from "zod"
import { unauthorizedError } from "../../../errors"
import { safeProtectedServiceProcedure } from "../../../procedures"
import { toApiLang } from "../../../utils"
import { getRedemptionTokenSafely } from "../../../utils/getRedemptionTokenSafely"
import { getUserPointsBalance } from "../../../utils/getUserPointsBalance"
import { isValidSession } from "../../../utils/session"
import { getHotelsAvailabilityByHotelIds } from "../services/getHotelsAvailabilityByHotelIds"
export type HotelsByHotelIdsAvailabilityInputSchema = z.output<
@@ -60,40 +58,45 @@ export const getHotelsByHotelIdsAvailabilityInputSchema = z
message: "FROMDATE_CANNOT_BE_IN_THE_PAST",
}
)
type Context = {
userToken: string | null
userPoints?: number
}
export const hotelsByHotelIds = safeProtectedServiceProcedure
.input(getHotelsByHotelIdsAvailabilityInputSchema)
.use(async ({ ctx, input, next }) => {
const userToken = await ctx.getScandicUserToken()
if (input.redemption) {
if (ctx.session?.token.access_token) {
const pointsValue = await getUserPointsBalance(ctx.session)
const token = getRedemptionTokenSafely(ctx.session, ctx.serviceToken)
if (pointsValue !== undefined && token) {
return next({
ctx: {
token: token,
userPoints: pointsValue,
},
input,
})
}
const hasValidSession = isValidSession(ctx.session)
if (!hasValidSession) {
throw unauthorizedError()
}
const pointsValue = await ctx.getUserPointsBalance()
if (pointsValue && userToken) {
return next<Context>({
ctx: {
userToken,
userPoints: pointsValue,
},
})
}
throw unauthorizedError()
}
return next({
return next<Context>({
ctx: {
token: ctx.serviceToken,
userToken,
},
input,
})
})
.query(async ({ input, ctx }) => {
const { lang } = ctx
const apiLang = toApiLang(lang)
return getHotelsAvailabilityByHotelIds(
return getHotelsAvailabilityByHotelIds({
input,
apiLang,
ctx.token,
ctx.userPoints
)
lang: ctx.lang,
userToken: ctx.userToken,
serviceToken: ctx.serviceToken,
userPoints: ctx.userPoints,
})
})

43
packages/trpc/lib/routers/hotels/availability/myStay.ts
View File

@@ -6,8 +6,7 @@ import { createLogger } from "@scandic-hotels/common/logger/createLogger"
import { SEARCH_TYPE_REDEMPTION } from "../../../constants/booking"
import { unauthorizedError } from "../../../errors"
import { safeProtectedServiceProcedure } from "../../../procedures"
import { getRedemptionTokenSafely } from "../../../utils/getRedemptionTokenSafely"
import { getUserPointsBalance } from "../../../utils/getUserPointsBalance"
import { isValidSession } from "../../../utils/session"
import { baseBookingSchema, baseRoomSchema, selectedRoomSchema } from "../input"
import { getRoomsAvailability } from "../services/getRoomsAvailability"
import { getSelectedRoomAvailability } from "../utils"
@@ -19,29 +18,37 @@ export const myStayRoomAvailabilityInputSchema = z.object({
lang: z.nativeEnum(Lang),
})
type Context = {
userToken: string | null
userPoints?: number
}
const logger = createLogger("trpc:availability:myStay")
export const myStay = safeProtectedServiceProcedure
.input(myStayRoomAvailabilityInputSchema)
.use(async ({ ctx, input, next }) => {
const userToken = await ctx.getScandicUserToken()
if (input.booking.searchType === SEARCH_TYPE_REDEMPTION) {
if (ctx.session?.token.access_token) {
const pointsValue = await getUserPointsBalance(ctx.session)
const token = getRedemptionTokenSafely(ctx.session, ctx.serviceToken)
if (pointsValue !== undefined && token) {
return next({
ctx: {
token: token,
userPoints: pointsValue,
},
input,
})
}
const hasValidSession = isValidSession(ctx.session)
if (!hasValidSession) {
throw unauthorizedError()
}
const pointsValue = await ctx.getUserPointsBalance()
if (pointsValue && userToken) {
return next<Context>({
ctx: {
userToken,
userPoints: pointsValue,
},
})
}
throw unauthorizedError()
}
return next({
return next<Context>({
ctx: {
token: ctx.serviceToken,
userToken,
},
})
})
@@ -54,7 +61,7 @@ export const myStay = safeProtectedServiceProcedure
},
lang: input.lang,
},
ctx.token,
ctx.userToken,
ctx.serviceToken,
ctx.userPoints
)

43
packages/trpc/lib/routers/hotels/availability/selectRate/room.ts
View File

@@ -5,8 +5,7 @@ import { Lang } from "@scandic-hotels/common/constants/language"
import { SEARCH_TYPE_REDEMPTION } from "../../../../constants/booking"
import { unauthorizedError } from "../../../../errors"
import { safeProtectedServiceProcedure } from "../../../../procedures"
import { getRedemptionTokenSafely } from "../../../../utils/getRedemptionTokenSafely"
import { getUserPointsBalance } from "../../../../utils/getUserPointsBalance"
import { isValidSession } from "../../../../utils/session"
import { baseBookingSchema, baseRoomSchema } from "../../input"
import { getRoomsAvailability } from "../../services/getRoomsAvailability"
import { mergeRoomTypes } from "../../utils"
@@ -18,28 +17,36 @@ export const selectRateRoomAvailabilityInputSchema = z.object({
lang: z.nativeEnum(Lang),
})
type Context = {
userToken: string | null
userPoints?: number
}
export const room = safeProtectedServiceProcedure
.input(selectRateRoomAvailabilityInputSchema)
.use(async ({ ctx, input, next }) => {
const userToken = await ctx.getScandicUserToken()
if (input.booking.searchType === SEARCH_TYPE_REDEMPTION) {
if (ctx.session?.token.access_token) {
const pointsValue = await getUserPointsBalance(ctx.session)
const token = getRedemptionTokenSafely(ctx.session, ctx.serviceToken)
if (pointsValue !== undefined && token) {
return next({
ctx: {
token: token,
userPoints: pointsValue,
},
input,
})
}
const hasValidSession = isValidSession(ctx.session)
if (!hasValidSession) {
throw unauthorizedError()
}
const pointsValue = await ctx.getUserPointsBalance()
if (pointsValue && userToken) {
return next<Context>({
ctx: {
userToken,
userPoints: pointsValue,
},
})
}
throw unauthorizedError()
}
return next({
return next<Context>({
ctx: {
token: ctx.serviceToken,
userToken,
},
})
})
@@ -52,7 +59,7 @@ export const room = safeProtectedServiceProcedure
},
lang: input.lang,
},
ctx.token,
ctx.userToken,
ctx.serviceToken,
ctx.userPoints
)

43
packages/trpc/lib/routers/hotels/availability/selectRate/rooms/index.ts
View File

@@ -3,34 +3,41 @@ import "server-only"
import { SEARCH_TYPE_REDEMPTION } from "../../../../../constants/booking"
import { unauthorizedError } from "../../../../../errors"
import { safeProtectedServiceProcedure } from "../../../../../procedures"
import { getRedemptionTokenSafely } from "../../../../../utils/getRedemptionTokenSafely"
import { getUserPointsBalance } from "../../../../../utils/getUserPointsBalance"
import { isValidSession } from "../../../../../utils/session"
import { getRoomsAvailability } from "../../../services/getRoomsAvailability"
import { mergeRoomTypes } from "../../../utils"
import { selectRateRoomsAvailabilityInputSchema } from "./schema"
type Context = {
userToken: string | null
userPoints?: number
}
export const rooms = safeProtectedServiceProcedure
.input(selectRateRoomsAvailabilityInputSchema)
.use(async ({ ctx, input, next }) => {
const userToken = await ctx.getScandicUserToken()
if (input.booking.searchType === SEARCH_TYPE_REDEMPTION) {
if (ctx.session?.token.access_token) {
const pointsValue = await getUserPointsBalance(ctx.session)
const token = getRedemptionTokenSafely(ctx.session, ctx.serviceToken)
if (pointsValue !== undefined && token) {
return next({
ctx: {
token: token,
userPoints: pointsValue,
},
input,
})
}
const hasValidSession = isValidSession(ctx.session)
if (!hasValidSession) {
throw unauthorizedError()
}
const pointsValue = await ctx.getUserPointsBalance()
if (pointsValue && userToken) {
return next<Context>({
ctx: {
userToken,
userPoints: pointsValue,
},
})
}
throw unauthorizedError()
}
return next({
return next<Context>({
ctx: {
token: ctx.serviceToken,
userToken,
},
})
})
@@ -42,7 +49,7 @@ export const rooms = safeProtectedServiceProcedure
const availability = await getRoomsAvailability(
input,
ctx.token,
ctx.userToken,
ctx.serviceToken,
ctx.userPoints
)

16
packages/trpc/lib/routers/hotels/services/getCountries.ts
View File

@@ -37,14 +37,26 @@ export async function getCountries({
)
if (!countryResponse.ok) {
throw new Error("Unable to fetch countries")
logger.error("Unable to fetch countries", {
status: countryResponse.status,
statusText: countryResponse.statusText,
})
throw new Error("Unable to fetch countries", {
cause: {
status: countryResponse.status,
statusText: countryResponse.statusText,
},
})
}
const countriesJson = await countryResponse.json()
const countries = countriesSchema.safeParse(countriesJson)
if (!countries.success) {
logger.error(`Validation for countries failed`, countries.error)
return null
throw new Error("Unable to parse country data", {
cause: countries.error,
})
}
return countries.data

30
packages/trpc/lib/routers/hotels/services/getHotelsAvailabilityByCity.ts
View File

@@ -2,16 +2,26 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
import * as api from "../../../api"
import { badRequestError } from "../../../errors"
import { toApiLang } from "../../../utils"
import { hotelsAvailabilitySchema } from "../output"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { HotelsAvailabilityInputSchema } from "../availability/hotelsByCity"
export async function getHotelsAvailabilityByCity(
input: HotelsAvailabilityInputSchema,
apiLang: string,
token: string, // Either service token or user access token in case of redemption search
userPoints: number = 0
) {
export async function getHotelsAvailabilityByCity({
input,
lang,
userToken,
serviceToken,
userPoints = 0,
}: {
input: HotelsAvailabilityInputSchema
lang: Lang
userToken: string | null | undefined
serviceToken: string
userPoints: number | undefined
}) {
const {
cityId,
roomStayStartDate,
@@ -22,7 +32,9 @@ export async function getHotelsAvailabilityByCity(
redemption,
} = input
const params: Record<string, string | number> = {
const apiLang = toApiLang(lang)
const params = {
roomStayStartDate,
roomStayEndDate,
adults,
@@ -30,7 +42,7 @@ export async function getHotelsAvailabilityByCity(
...(bookingCode && { bookingCode }),
...(redemption ? { isRedemption: "true" } : {}),
language: apiLang,
}
} satisfies Record<string, string | number>
const getHotelsAvailabilityByCityCounter = createCounter(
"hotel",
@@ -54,7 +66,7 @@ export async function getHotelsAvailabilityByCity(
api.endpoints.v1.Availability.city(cityId),
{
headers: {
Authorization: `Bearer ${token}`,
Authorization: `Bearer ${userToken ?? serviceToken}`,
},
},
params

26
packages/trpc/lib/routers/hotels/services/getHotelsAvailabilityByHotelIds.ts
View File

@@ -4,16 +4,26 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
import { env } from "../../../../env/server"
import * as api from "../../../api"
import { badRequestError } from "../../../errors"
import { toApiLang } from "../../../utils"
import { hotelsAvailabilitySchema } from "../output"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { HotelsByHotelIdsAvailabilityInputSchema } from "../availability/hotelsByHotelIds"
export async function getHotelsAvailabilityByHotelIds(
input: HotelsByHotelIdsAvailabilityInputSchema,
apiLang: string,
token: string,
userPoints: number = 0
) {
export async function getHotelsAvailabilityByHotelIds({
input,
lang,
userToken,
serviceToken,
userPoints = 0,
}: {
input: HotelsByHotelIdsAvailabilityInputSchema
lang: Lang
userToken: string | null | undefined
serviceToken: string
userPoints: number | undefined
}) {
const {
hotelIds,
roomStayStartDate,
@@ -24,6 +34,8 @@ export async function getHotelsAvailabilityByHotelIds(
redemption,
} = input
const apiLang = toApiLang(lang)
const params = new URLSearchParams([
["roomStayStartDate", roomStayStartDate],
["roomStayEndDate", roomStayEndDate],
@@ -72,7 +84,7 @@ export async function getHotelsAvailabilityByHotelIds(
api.endpoints.v1.Availability.hotels(),
{
headers: {
Authorization: `Bearer ${token}`,
Authorization: `Bearer ${userToken ?? serviceToken}`,
},
},
params

19
packages/trpc/lib/routers/hotels/services/getRoomsAvailability.ts
View File

@@ -17,7 +17,7 @@ import type { RoomsAvailabilityOutputSchema } from "../availability/selectRate/r
export async function getRoomsAvailability(
input: RoomsAvailabilityOutputSchema,
token: string,
userToken: string | null | undefined,
serviceToken: string,
userPoints: number | undefined
) {
@@ -42,12 +42,12 @@ export async function getRoomsAvailability(
const apiLang = toApiLang(lang)
const baseCacheKey = {
bookingCode,
fromDate,
hotelId,
lang,
searchType,
hotelId,
fromDate,
toDate,
searchType,
bookingCode,
}
const cacheClient = await getCacheClient()
@@ -57,6 +57,11 @@ export async function getRoomsAvailability(
...baseCacheKey,
room,
}
const token = userToken
? ({ type: "userToken", token: userToken } as const)
: ({ type: "serviceToken", token: serviceToken } as const)
const result = cacheClient.cacheOrGet(
stringify(cacheKey),
async function () {
@@ -78,7 +83,7 @@ export async function getRoomsAvailability(
{
cache: undefined, // overwrite default
headers: {
Authorization: `Bearer ${token}`,
Authorization: `Bearer ${token.token}`,
},
},
params
@@ -181,7 +186,7 @@ export async function getRoomsAvailability(
return validateAvailabilityData.data
}
},
"1m"
token.type === "userToken" ? "no cache" : "1m"
)
return result