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

packages/trpc/lib/routers/user/query/index.ts

@@ -1,8 +1,10 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
+import { safeTry } from "@scandic-hotels/common/utils/safeTry"
 
 import { router } from "../../.."
 import * as api from "../../../api"
 import { Transactions } from "../../../enums/transactions"
+import { notFound } from "../../../errors"
 import {
   languageProtectedProcedure,
   protectedProcedure,
@@ -42,30 +44,25 @@ export const userQueryRouter = router({
       })
     })
     .query(async function getUser({ ctx }) {
-      const data = await getVerifiedUser({ session: ctx.session })
-
-      if (!data) {
-        return null
+      const user = await ctx.getScandicUser()
+      if (!user) {
+        throw notFound()
       }
 
-      if ("error" in data && data.error) {
-        return data
-      }
-
-      return parsedUser(data.data, !ctx.isMFA)
+      return parsedUser(user, !ctx.isMFA)
     }),
   getSafely: safeProtectedProcedure.query(async function getUser({ ctx }) {
     if (!isValidSession(ctx.session)) {
       return null
     }
 
-    const data = await getVerifiedUser({ session: ctx.session })
+    const user = await ctx.getScandicUser()
 
-    if (!data || "error" in data) {
+    if (!user) {
       return null
     }
 
-    return parsedUser(data.data, false)
+    return parsedUser(user, false)
   }),
   getWithExtendedPartnerData: safeProtectedProcedure.query(
     async function getUser({ ctx }) {
@@ -73,60 +70,49 @@ export const userQueryRouter = router({
         return null
       }
 
-      const data = await getVerifiedUser({
-        session: ctx.session,
-        includeExtendedPartnerData: true,
-      })
+      const user = await ctx.getScandicUser()
 
-      if (!data || "error" in data) {
+      if (!user) {
         return null
       }
 
-      return parsedUser(data.data, false)
+      return parsedUser(user, false)
     }
   ),
   name: safeProtectedProcedure.query(async function ({ ctx }) {
     if (!isValidSession(ctx.session)) {
       return null
     }
-    const verifiedData = await getVerifiedUser({ session: ctx.session })
+    const user = await ctx.getScandicUser()
 
-    if (!verifiedData || "error" in verifiedData) {
+    if (!user) {
       return null
     }
     return {
-      firstName: verifiedData.data.firstName,
-      lastName: verifiedData.data.lastName,
+      firstName: user.firstName,
+      lastName: user.lastName,
     }
   }),
   membershipLevel: protectedProcedure.query(async function ({ ctx }) {
-    const verifiedData = await getVerifiedUser({ session: ctx.session })
-    if (
-      !verifiedData ||
-      "error" in verifiedData ||
-      !verifiedData.data.loyalty
-    ) {
+    const user = await ctx.getScandicUser()
+    if (!user?.loyalty) {
       return null
     }
 
-    const membershipLevel = getFriendsMembership(verifiedData.data.loyalty)
+    const membershipLevel = getFriendsMembership(user.loyalty)
     return membershipLevel
   }),
   safeMembershipLevel: safeProtectedProcedure.query(async function ({ ctx }) {
     if (!isValidSession(ctx.session)) {
       return null
     }
-    const verifiedData = await getVerifiedUser({ session: ctx.session })
+    const user = await ctx.getScandicUser()
 
-    if (
-      !verifiedData ||
-      "error" in verifiedData ||
-      !verifiedData.data.loyalty
-    ) {
+    if (!user?.loyalty) {
       return null
     }
 
-    const membershipLevel = getFriendsMembership(verifiedData.data.loyalty)
+    const membershipLevel = getFriendsMembership(user.loyalty)
     return membershipLevel
   }),
   userTrackingInfo,
@@ -327,12 +313,14 @@ export const userQueryRouter = router({
     }),
 
   membershipCards: protectedProcedure.query(async function ({ ctx }) {
-    const userData = await getVerifiedUser({ session: ctx.session })
+    const [userData, error] = await safeTry(
+      getVerifiedUser({ token: ctx.session.token })
+    )
 
-    if (!userData || "error" in userData || !userData.data.loyalty) {
+    if (!userData?.loyalty || error) {
       return null
     }
 
-    return getMembershipCards(userData.data.loyalty)
+    return getMembershipCards(userData.loyalty)
   }),
 })

packages/trpc/lib/routers/user/query/userTrackingInfo.ts

@@ -47,13 +47,9 @@ async function getScandicFriendsUserTrackingData(session: Session | null) {
   }
 
   try {
-    const verifiedUserData = await getVerifiedUser({ session: session })
+    const verifiedUserData = await getVerifiedUser({ token: session.token })
 
-    if (
-      !verifiedUserData ||
-      "error" in verifiedUserData ||
-      !verifiedUserData.data.loyalty
-    ) {
+    if (!verifiedUserData || !verifiedUserData.loyalty) {
       metricsUserTrackingInfo.success({
         reason: "invalid user data",
         data: notLoggedInUserTrackingData,
@@ -61,12 +57,12 @@ async function getScandicFriendsUserTrackingData(session: Session | null) {
       return notLoggedInUserTrackingData
     }
 
-    const membership = getFriendsMembership(verifiedUserData.data.loyalty)
+    const membership = getFriendsMembership(verifiedUserData.loyalty)
 
     const loggedInUserTrackingData: TrackingUserData = {
       loginStatus: "logged in",
       loginType: session.token.loginType as LoginType,
-      memberId: verifiedUserData.data.profileId,
+      memberId: verifiedUserData.profileId,
       membershipNumber: membership?.membershipNumber,
       memberLevel: membership?.membershipLevel,
       loginAction: "login success",