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/availability/selectRate/room.ts
+++ b/packages/trpc/lib/routers/hotels/availability/selectRate/room.ts
@@ -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
    )
--- a/packages/trpc/lib/routers/hotels/availability/selectRate/rooms/index.ts
+++ b/packages/trpc/lib/routers/hotels/availability/selectRate/rooms/index.ts
@@ -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
    )