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/user/utils/updateStaysBookingUrl.ts
+++ b/packages/trpc/lib/routers/user/utils/updateStaysBookingUrl.ts
@@ -1,6 +1,7 @@
 import "server-only"

 import { myStay } from "@scandic-hotels/common/constants/routes/myStay"
+import { safeTry } from "@scandic-hotels/common/utils/safeTry"

 import { env } from "../../../../env/server"
 import { encrypt } from "../../../utils/encryption"
@@ -28,42 +29,47 @@ export async function updateStaysBookingUrl(
  session: Session,
  lang: Lang
 ) {
-  const user = await getVerifiedUser({
-    session,
-  })
-
-  if (user && !("error" in user)) {
-    return data.map((d) => {
-      const originalString =
-        d.attributes.confirmationNumber.toString() + "," + user.data.lastName
-      const encryptedBookingValue = encrypt(originalString)
-
-      // Get base URL with fallback for ephemeral environments (like deploy previews).
-      const baseUrl = env.PUBLIC_URL || "https://www.scandichotels.com"
-
-      // Construct Booking URL.
-      const bookingUrl = new URL(myStay[lang], baseUrl)
-
-      // Add search parameters.
-      if (encryptedBookingValue) {
-        bookingUrl.searchParams.set("RefId", encryptedBookingValue)
-      } else {
-        bookingUrl.searchParams.set("lastName", user.data.lastName)
-        bookingUrl.searchParams.set(
-          "bookingId",
-          d.attributes.confirmationNumber.toString()
-        )
-      }
-
-      return {
-        ...d,
-        attributes: {
-          ...d.attributes,
-          bookingUrl: bookingUrl.toString(),
-        },
-      }
+  const [user, error] = await safeTry(
+    getVerifiedUser({
+      token: {
+        access_token: session.token.access_token,
+        expires_at: session.token.expires_at ?? 0,
+      },
    })
+  )
+
+  if (error || !user) {
+    return data
  }

-  return data
+  return data.map((d) => {
+    const originalString =
+      d.attributes.confirmationNumber.toString() + "," + user.lastName
+    const encryptedBookingValue = encrypt(originalString)
+
+    // Get base URL with fallback for ephemeral environments (like deploy previews).
+    const baseUrl = env.PUBLIC_URL || "https://www.scandichotels.com"
+
+    // Construct Booking URL.
+    const bookingUrl = new URL(myStay[lang], baseUrl)
+
+    // Add search parameters.
+    if (encryptedBookingValue) {
+      bookingUrl.searchParams.set("RefId", encryptedBookingValue)
+    } else {
+      bookingUrl.searchParams.set("lastName", user.lastName)
+      bookingUrl.searchParams.set(
+        "bookingId",
+        d.attributes.confirmationNumber.toString()
+      )
+    }
+
+    return {
+      ...d,
+      attributes: {
+        ...d.attributes,
+        bookingUrl: bookingUrl.toString(),
+      },
+    }
+  })
 }