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

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
2025-10-24 13:17:02 +00:00
parent c473bbc8b0
commit 3b3e7308cc
36 changed files with 558 additions and 503 deletions
--- a/packages/trpc/lib/routers/hotels/services/getCountries.ts
+++ b/packages/trpc/lib/routers/hotels/services/getCountries.ts
@@ -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
--- a/packages/trpc/lib/routers/hotels/services/getHotelsAvailabilityByCity.ts
+++ b/packages/trpc/lib/routers/hotels/services/getHotelsAvailabilityByCity.ts
@@ -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
--- a/packages/trpc/lib/routers/hotels/services/getHotelsAvailabilityByHotelIds.ts
+++ b/packages/trpc/lib/routers/hotels/services/getHotelsAvailabilityByHotelIds.ts
@@ -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
--- a/packages/trpc/lib/routers/hotels/services/getRoomsAvailability.ts
+++ b/packages/trpc/lib/routers/hotels/services/getRoomsAvailability.ts
@@ -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