From 6d869ceba713cddba76681344c53a5a44bba7afc Mon Sep 17 00:00:00 2001
From: Simon Emanuelsson <simon.emanuelsson@scandichotels.com>
Date: Thu, 3 Apr 2025 09:16:15 +0200
Subject: [PATCH] fix: unbreak toApiLang call that failed everytime

---
 .../hotelreservation/(standard)/select-rate/page.tsx |  6 ++++++
 .../Actions/ModifyStay/hooks/useModifyStay.ts        |  2 +-
 apps/scandic-web/server/routers/booking/mutation.ts  | 12 +++++-------
 apps/scandic-web/server/routers/hotels/input.ts      |  2 +-
 apps/scandic-web/server/routers/hotels/query.ts      |  8 ++++----
 apps/scandic-web/server/routers/hotels/utils.ts      |  3 +--
 apps/scandic-web/server/trpc.ts                      | 10 +++++-----
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
index f470875f9..9f17fcc27 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
@@ -34,6 +34,12 @@ export default async function SelectRatePage({
     return notFound()
   }
 
+  // If someone tries to update the url with
+  // a bookingCode also, then we need to remove it
+  if (isRedemption && searchParams.bookingCode) {
+    searchParams.bookingCode = ""
+  }
+
   return (
     <Suspense
       key={suspenseKey}
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/ManageStay/ActionPanel/Actions/ModifyStay/hooks/useModifyStay.ts b/apps/scandic-web/components/HotelReservation/MyStay/ManageStay/ActionPanel/Actions/ModifyStay/hooks/useModifyStay.ts
index 63b41ec77..da7769e8d 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/ManageStay/ActionPanel/Actions/ModifyStay/hooks/useModifyStay.ts
+++ b/apps/scandic-web/components/HotelReservation/MyStay/ManageStay/ActionPanel/Actions/ModifyStay/hooks/useModifyStay.ts
@@ -99,7 +99,7 @@ export default function useModifyStay({
           bookingCode: bookedRoom.bookingCode ?? undefined,
           rateCode: bookedRoom.rateDefinition.rateCode,
           roomTypeCode: bookedRoom.roomTypeCode,
-          inputLang: lang,
+          lang,
         })
 
         if (!data?.selectedRoom || data.selectedRoom.roomsLeft <= 0) {
diff --git a/apps/scandic-web/server/routers/booking/mutation.ts b/apps/scandic-web/server/routers/booking/mutation.ts
index d4e42f585..150b9be68 100644
--- a/apps/scandic-web/server/routers/booking/mutation.ts
+++ b/apps/scandic-web/server/routers/booking/mutation.ts
@@ -483,20 +483,18 @@ export const bookingMutationRouter = router({
   update: safeProtectedServiceProcedure
     .input(updateBookingInput)
     .mutation(async function ({ ctx, input }) {
-      const accessToken = ctx.serviceToken
+      const accessToken = ctx.session?.token.access_token || ctx.serviceToken
       const { confirmationNumber, ...body } = input
 
       updateBookingCounter.add(1, { confirmationNumber })
 
-      const headers = {
-        Authorization: `Bearer ${accessToken}`,
-      }
-
       const apiResponse = await api.put(
         api.endpoints.v1.Booking.booking(confirmationNumber),
         {
-          headers,
-          body: body,
+          body,
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+          },
         }
       )
 
diff --git a/apps/scandic-web/server/routers/hotels/input.ts b/apps/scandic-web/server/routers/hotels/input.ts
index 2522750b7..c55075676 100644
--- a/apps/scandic-web/server/routers/hotels/input.ts
+++ b/apps/scandic-web/server/routers/hotels/input.ts
@@ -61,7 +61,7 @@ export const selectedRoomAvailabilityInputSchema = z.object({
   roomTypeCode: z.string(),
   counterRateCode: z.string().optional(),
   packageCodes: z.array(z.nativeEnum(RoomPackageCodeEnum)).optional(),
-  inputLang: z.nativeEnum(Lang).optional(),
+  lang: z.nativeEnum(Lang).optional(),
   redemption: z.boolean().optional(),
 })
 
diff --git a/apps/scandic-web/server/routers/hotels/query.ts b/apps/scandic-web/server/routers/hotels/query.ts
index 504412a2d..42d0aa134 100644
--- a/apps/scandic-web/server/routers/hotels/query.ts
+++ b/apps/scandic-web/server/routers/hotels/query.ts
@@ -705,9 +705,10 @@ export const hotelQueryRouter = router({
         })
       })
       .query(async ({ input, ctx }) => {
+        const lang = toApiLang(input.lang || ctx.lang)
         let selectedRoomData = await getSelectedRoomAvailability(
           input,
-          toApiLang(ctx.lang),
+          lang,
           ctx.token,
           ctx.userPoints
         )
@@ -718,7 +719,6 @@ export const hotelQueryRouter = router({
           children,
           counterRateCode,
           hotelId,
-          inputLang,
           roomStayEndDate,
           roomStayStartDate,
           roomTypeCode,
@@ -797,7 +797,7 @@ export const hotelQueryRouter = router({
           {
             hotelId,
             isCardOnlyPayment: false,
-            language: inputLang ?? ctx.lang,
+            language: input.lang || ctx.lang,
           },
           ctx.serviceToken
         )
@@ -884,7 +884,7 @@ export const hotelQueryRouter = router({
                 adults,
                 ...(children && { children }),
                 ...(bookingCode && { bookingCode }),
-                language: inputLang ?? ctx.lang,
+                language: lang,
               },
             },
           })
diff --git a/apps/scandic-web/server/routers/hotels/utils.ts b/apps/scandic-web/server/routers/hotels/utils.ts
index 91208f79e..94adce3c6 100644
--- a/apps/scandic-web/server/routers/hotels/utils.ts
+++ b/apps/scandic-web/server/routers/hotels/utils.ts
@@ -618,7 +618,6 @@ export async function getSelectedRoomAvailability(
     bookingCode,
     children,
     hotelId,
-    inputLang,
     roomStayEndDate,
     roomStayStartDate,
     redemption,
@@ -631,7 +630,7 @@ export async function getSelectedRoomAvailability(
     ...(children && { children }),
     ...(bookingCode && { bookingCode }),
     ...(redemption && { isRedemption: "true" }),
-    language: inputLang ?? lang,
+    language: lang,
   }
 
   metrics.selectedRoomAvailability.counter.add(1, input)
diff --git a/apps/scandic-web/server/trpc.ts b/apps/scandic-web/server/trpc.ts
index 97c9ed2cf..d53dcd1d0 100644
--- a/apps/scandic-web/server/trpc.ts
+++ b/apps/scandic-web/server/trpc.ts
@@ -198,16 +198,16 @@ export const protectedServerActionProcedure = serverActionProcedure.use(
 // NOTE: This is actually safe to use, just the implementation could change
 // in minor version bumps. Please read: https://trpc.io/docs/faq#unstable
 export const contentStackUidWithServiceProcedure =
-  contentstackExtendedProcedureUID.unstable_concat(serviceProcedure)
+  contentstackExtendedProcedureUID.concat(serviceProcedure)
 
 export const contentStackBaseWithServiceProcedure =
-  contentstackBaseProcedure.unstable_concat(serviceProcedure)
+  contentstackBaseProcedure.concat(serviceProcedure)
 
 export const contentStackBaseWithProtectedProcedure =
-  contentstackBaseProcedure.unstable_concat(protectedProcedure)
+  contentstackBaseProcedure.concat(protectedProcedure)
 
 export const safeProtectedServiceProcedure =
-  safeProtectedProcedure.unstable_concat(serviceProcedure)
+  safeProtectedProcedure.concat(serviceProcedure)
 
 export const languageProtectedProcedure =
-  protectedProcedure.unstable_concat(languageProcedure)
+  protectedProcedure.concat(languageProcedure)