Merge branch 'develop' into feature/tracking

server/routers/user/mutation.ts

@@ -35,16 +35,19 @@ export const userMutationRouter = router({
         "api.user.creditCard.add start",
         JSON.stringify({ query: { language: input.language } })
       )
-      const apiResponse = await api.post(api.endpoints.v1.initiateSaveCard, {
-        headers: {
-          Authorization: `Bearer ${ctx.session.token.access_token}`,
-        },
-        body: {
-          language: input.language,
-          mobileToken: false,
-          redirectUrl: `api/web/add-card-callback/${input.language}`,
-        },
-      })
+      const apiResponse = await api.post(
+        api.endpoints.v1.Profile.CreditCards.initiateSaveCard,
+        {
+          headers: {
+            Authorization: `Bearer ${ctx.session.token.access_token}`,
+          },
+          body: {
+            language: input.language,
+            mobileToken: false,
+            redirectUrl: `api/web/add-card-callback/${input.language}`,
+          },
+        }
+      )
 
       if (!apiResponse.ok) {
         const text = await apiResponse.text()
@@ -85,7 +88,7 @@ export const userMutationRouter = router({
       .mutation(async function ({ ctx, input }) {
         console.info("api.user.creditCard.save start", JSON.stringify({}))
         const apiResponse = await api.post(
-          `${api.endpoints.v1.creditCards}/${input.transactionId}`,
+          api.endpoints.v1.Profile.CreditCards.transaction(input.transactionId),
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -118,7 +121,9 @@ export const userMutationRouter = router({
           JSON.stringify({ query: {} })
         )
         const apiResponse = await api.remove(
-          `${api.endpoints.v1.creditCards}/${input.creditCardId}`,
+          api.endpoints.v1.Profile.CreditCards.deleteCreditCard(
+            input.creditCardId
+          ),
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -149,7 +154,7 @@ export const userMutationRouter = router({
     ctx,
   }) {
     generatePreferencesLinkCounter.add(1)
-    const apiResponse = await api.get(api.endpoints.v1.subscriberId, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.subscriberId, {
       headers: {
         Authorization: `Bearer ${ctx.session.token.access_token}`,
       },

server/routers/user/query.ts

@@ -89,7 +89,7 @@ export const getVerifiedUser = cache(
     }
     getVerifiedUserCounter.add(1)
     console.info("api.user.profile getVerifiedUser start", JSON.stringify({}))
-    const apiResponse = await api.get(api.endpoints.v1.profile, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
       headers: {
         Authorization: `Bearer ${session.token.access_token}`,
       },
@@ -163,7 +163,7 @@ export const getVerifiedUser = cache(
   }
 )
 
-function parsedUser(data: User, isMFA: boolean) {
+export function parsedUser(data: User, isMFA: boolean) {
   const country = countries.find((c) => c.code === data.address.countryCode)
 
   const user = {
@@ -211,7 +211,7 @@ function parsedUser(data: User, isMFA: boolean) {
 async function getCreditCards(session: Session) {
   getCreditCardsCounter.add(1)
   console.info("api.profile.creditCards start", JSON.stringify({}))
-  const apiResponse = await api.get(api.endpoints.v1.creditCards, {
+  const apiResponse = await api.get(api.endpoints.v1.Profile.creditCards, {
     headers: {
       Authorization: `Bearer ${session.token.access_token}`,
     },
@@ -354,7 +354,7 @@ export const userQueryRouter = router({
       JSON.stringify({ query: { params } })
     )
     const previousStaysResponse = await api.get(
-      api.endpoints.v1.previousStays,
+      api.endpoints.v1.Booking.Stays.past,
       {
         headers: {
           Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -430,7 +430,7 @@ export const userQueryRouter = router({
         )
 
         const apiResponse = await api.get(
-          api.endpoints.v1.previousStays,
+          api.endpoints.v1.Booking.Stays.past,
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -525,7 +525,7 @@ export const userQueryRouter = router({
           JSON.stringify({ query: { params } })
         )
         const apiResponse = await api.get(
-          api.endpoints.v1.upcomingStays,
+          api.endpoints.v1.Booking.Stays.future,
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -611,13 +611,16 @@ export const userQueryRouter = router({
           "api.transaction.friendTransactions start",
           JSON.stringify({})
         )
-        const apiResponse = await api.get(api.endpoints.v1.friendTransactions, {
-          cache: undefined, // override defaultOptions
-          headers: {
-            Authorization: `Bearer ${ctx.session.token.access_token}`,
-          },
-          next: { revalidate: 30 * 60 * 1000 },
-        })
+        const apiResponse = await api.get(
+          api.endpoints.v1.Profile.Transaction.friendTransactions,
+          {
+            cache: undefined, // override defaultOptions
+            headers: {
+              Authorization: `Bearer ${ctx.session.token.access_token}`,
+            },
+            next: { revalidate: 30 * 60 * 1000 },
+          }
+        )
 
         if (!apiResponse.ok) {
           // switch (apiResponse.status) {
@@ -740,7 +743,7 @@ export const userQueryRouter = router({
   membershipCards: protectedProcedure.query(async function ({ ctx }) {
     getProfileCounter.add(1)
     console.info("api.profile start", JSON.stringify({}))
-    const apiResponse = await api.get(api.endpoints.v1.profile, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
       cache: "no-store",
       headers: {
         Authorization: `Bearer ${ctx.session.token.access_token}`,

server/routers/user/utils.ts

@@ -35,7 +35,7 @@ async function updateStaysBookingUrl(
   // Temporary API call needed till we have user name in ctx session data
   getProfileCounter.add(1)
   console.info("api.user.profile updatebookingurl start", JSON.stringify({}))
-  const apiResponse = await api.get(api.endpoints.v1.profile, {
+  const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
     cache: "no-store",
     headers: {
       Authorization: `Bearer ${token}`,