Merged in feat/profile-consent-feature-branch (pull request #2900)

feat(LOY-268): Feature branch for profiling consent work * feat: Add feature branch for profile and consent work * Merged in feat/LOY-268-profile-consent-banner-comp (pull request #2908) Feat/LOY-358 profile consent banner component * feat: Add feature branch for profile and consent work * feat(LOY-268): create banner * feat(LOY-268): Create personalization banner component Approved-by: Chuma Mcphoy (We Ahead) * feat(LOY-268): create banner * feat(LOY-268): Create personalization banner component * Merged in feat/profile-consent-contentstack (pull request #2921) Feat(LOY-389): Profile consent in Contentstack * feat(LOY-268): create banner * feat(LOY-268): Create personalization banner component * chore(LOY-348): add profiling consent as CS entry * chore(LOY-348): add banner as dynamic content Approved-by: Chuma Mcphoy (We Ahead) * Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901) Feat(LOY-347): Profiling Consent Modal (phase 1) * feat(LOY-347): Profile Consent Modal base functionality * feat(LOY-347): Add Icon * feat(LOY-347): Add Benefit Cards to Profile consent modal * feat(LOY-347): Add accordion to profile consent modal * fix(LOY-347): scroll behaviour * Fix(LOY-347): fade in/out animations of profile consent modal * fix(LOY-347): White Ellipsis Around Icons * feat(LOY-347): Implement ability to open modal from banner * fix(LOY-347): minor fixes * fix(LOY-347): replace old spa icon * fix(LOY-347): re-add env vars * fix(LOY-347): File renaming and cleanup * chore(LOY-347): Update readme * fix(LOY-347): use correct space var * fix(LOY-347): Add TODO comment for adding link to accordion Approved-by: Matilda Landström * Merged in fix/LOY-386-profiling-consent-modal-contentstack (pull request #2930) Fix(LOY-386): profiling consent modal contentstack * feat(LOY-347): Profile Consent Modal base functionality * feat(LOY-347): Add Icon * feat(LOY-347): Add Benefit Cards to Profile consent modal * feat(LOY-347): Add accordion to profile consent modal * fix(LOY-347): scroll behaviour * Fix(LOY-347): fade in/out animations of profile consent modal * fix(LOY-347): White Ellipsis Around Icons * feat(LOY-347): Implement ability to open modal from banner * fix(LOY-347): minor fixes * fix(LOY-347): replace old spa icon * fix(LOY-347): re-add env vars * fix(LOY-347): File renaming and cleanup * fix(LOY-386): Use contentstack content for profile consent modal * fix(LOY-386): beneift cards schema transform * chore(LOY-386): remove usememo * fix(LOY-386): fix modalcontent check * fix(LOY-386): remove uneeded vars Approved-by: Matilda Landström * Merged in feat/LOY-412-profiling-consent-in-signup (pull request #2976) Feat(LOY-412): profiling consent in signup * feat(LOY-268): create banner * feat(LOY-268): Create personalization banner component * Merged in feat/profile-consent-contentstack (pull request #2921) Feat(LOY-389): Profile consent in Contentstack * feat(LOY-268): create banner * feat(LOY-268): Create personalization banner component * chore(LOY-348): add profiling consent as CS entry * chore(LOY-348): add banner as dynamic content Approved-by: Chuma Mcphoy (We Ahead) * Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901) Feat(LOY-347): Profiling Consent Modal (phase 1) * feat(LOY-347): Profile Consent Modal base functionality * feat(LOY-347): Add Icon * feat(LOY-347): Add Benefit Cards to Profile consent modal * feat(LOY-347): Add accordion to profile consent modal * fix(LOY-347): scroll behaviour * Fix(LOY-347): fade in/out animations of profile consent modal * fix(LOY-347): White Ellipsis Around Ico… * Merged in fix/lokalise-ids (pull request #3013) fix: add ids to translations in Profiling Consent * fix: add ids to translations Approved-by: Erik Tiekstra Approved-by: Chuma Mcphoy (We Ahead) * Merged in LOY-436-my-pages-profiling-consent (pull request #3011) LOY-436: Profiling Consent on My Profile, no api Approved-by: Chuma Mcphoy (We Ahead) * Merged in feat/LOY-418-profiling-consent-ui-text-update (pull request #3080) Feat/LOY-418: Profiling consent ui and text update * chore(LOY-418): update /consent buttons * chore(LOY-418): update legal texts Approved-by: Chuma Mcphoy (We Ahead) * Merged in feat/LOY-268-profiling-consent-api (pull request #3088) Approved-by: Chuma Mcphoy (We Ahead) * Merged in feat/LOY-413-Signup-API-Profiling-Consent (pull request #3105) Feat/LOY-413 Signup API Profiling Consent * feat(LOY-413): signup profiling consent * chore(LOY-413): remove todo * fix(LOY-413): only pass in profilingConsent if true * fix(LOY-413): proper spread of profilingConsent in signup input Approved-by: Christel Westerberg * Merged in fix/LOY-413-use-v2-for-signup-call (pull request #3112) fix(LOY-413): use v2 endpoint for profile POST in signup * fix(LOY-413): use v2 endpoint for profile POST in signup Approved-by: Erik Tiekstra * Merged in feat/LOY-268-profiling-consent-improvements (pull request #3094) Feat/LOY-268: Profiling consent improvements * Merged in feat/profile-consent-contentstack (pull request #2921) Feat(LOY-389): Profile consent in Contentstack * feat(LOY-268): create banner * feat(LOY-268): Create personalization banner component * chore(LOY-348): add profiling consent as CS entry * chore(LOY-348): add banner as dynamic content Approved-by: Chuma Mcphoy (We Ahead) * Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901) Feat(LOY-347): Profiling Consent Modal (phase 1) * feat(LOY-347): Profile Consent Modal base functionality * feat(LOY-347): Add Icon * feat(LOY-347): Add Benefit Cards to Profile consent modal * feat(LOY-347): Add accordion to profile consent modal * fix(LOY-347): scroll behaviour * Fix(LOY-347): fade in/out animations of profile consent modal * fix(LOY-347): White Ellipsis Around Icons * feat(LOY-347): Implement ability to open modal from banner * fix(LOY-347): min… * Merged in fix/update-graphql (pull request #3130) fix: update graphql * fix: update graphql Approved-by: Chuma Mcphoy (We Ahead) * Merged in feat/LOY-414-prof-consent-tracking (pull request #3127) Feat/LOY-414 profile consent tracking + credit card ui update * chore(LOY-414): create track link function * chore(LOY-414): add cta tracking * chore(LOY-414): add profileConsent to userInfo datalayer * chore(LOY-414): update credit card ui * chore(LOY-414): update tracking specs * chore(LOY-414): add pageView tracking to modal Approved-by: Chuma Mcphoy (We Ahead) * fix: remove old flag * Merged in fix/LOY-268-prof-consent-button-fix (pull request #3162) fix(LOY-268): add button as link * fix(LOY-268): add button as link Approved-by: Chuma Mcphoy (We Ahead) Approved-by: Matilda Landström
2025-11-14 13:28:56 +00:00
parent 9260cc0f81
commit 494bfe10f3
79 changed files with 9332 additions and 268 deletions
--- a/packages/trpc/lib/routers/contentstack/index.ts
+++ b/packages/trpc/lib/routers/contentstack/index.ts
@@ -16,6 +16,7 @@ import { loyaltyPageRouter } from "./loyaltyPage"
 import { metadataRouter } from "./metadata"
 import { pageSettingsRouter } from "./pageSettings"
 import { partnerRouter } from "./partner"
+import { profilingConsentRouter } from "./profilingConsent"
 import { promoCampaignPageRouter } from "./promoCampaignPage"
 import { rewardRouter } from "./reward"
 import { startPageRouter } from "./startPage"
@@ -41,4 +42,5 @@ export const contentstackRouter = router({
  startPage: startPageRouter,
  partner: partnerRouter,
  promoCampaignPage: promoCampaignPageRouter,
+  profilingConsent: profilingConsentRouter,
 })
--- a/packages/trpc/lib/routers/contentstack/profilingConsent/index.ts
+++ b/packages/trpc/lib/routers/contentstack/profilingConsent/index.ts
@@ -0,0 +1,4 @@
+import { mergeRouters } from "../../.."
+import { profilingConsentQueryRouter } from "./query"
+
+export const profilingConsentRouter = mergeRouters(profilingConsentQueryRouter)
--- a/packages/trpc/lib/routers/contentstack/profilingConsent/output.ts
+++ b/packages/trpc/lib/routers/contentstack/profilingConsent/output.ts
@@ -0,0 +1,48 @@
+import { z } from "zod"
+
+export const bannerSchema = z.object({
+  button_text: z.string(),
+  header: z.string(),
+  sub_header: z.string(),
+})
+
+export const modalSchema = z
+  .object({
+    header: z.string(),
+    sub_header: z.string(),
+    cards: z.object({
+      card: z.array(
+        z.object({
+          image_type: z.string(),
+          preamble: z.string(),
+          title: z.string(),
+        })
+      ),
+    }),
+  })
+  .transform(({ header, sub_header, cards }) => ({
+    header,
+    sub_header,
+    cards: cards.card,
+  }))
+
+export const profilingConsentSchema = z
+  .object({
+    all_profiling_consent: z.object({
+      items: z.array(
+        z.object({
+          main_icon: z.string(),
+          profiling_consent_banner: bannerSchema,
+          profiling_consent_modal: modalSchema,
+        })
+      ),
+    }),
+  })
+  .transform((data) => {
+    const profiling_consent = data.all_profiling_consent.items[0]
+    return {
+      icon: profiling_consent.main_icon,
+      banner: profiling_consent.profiling_consent_banner,
+      modal: profiling_consent.profiling_consent_modal,
+    }
+  })
--- a/packages/trpc/lib/routers/contentstack/profilingConsent/query.ts
+++ b/packages/trpc/lib/routers/contentstack/profilingConsent/query.ts
@@ -0,0 +1,61 @@
+import { createCounter } from "@scandic-hotels/common/telemetry"
+
+import { router } from "../../.."
+import { notFound } from "../../../errors"
+import { GetProfilingConsent } from "../../../graphql/Query/ProfilingConsent.graphql"
+import { request } from "../../../graphql/request"
+import { contentstackBaseProcedure } from "../../../procedures"
+import { langInput } from "../../../utils"
+import { profilingConsentSchema } from "./output"
+
+import type { GetProfilingConsentData } from "../../../types/profilingConsent"
+
+export const profilingConsentQueryRouter = router({
+  get: contentstackBaseProcedure
+    .input(langInput.optional())
+    .query(async ({ input, ctx }) => {
+      const lang = input?.lang ?? ctx.lang
+
+      const tag = `${lang}:profiling_consent`
+
+      const getProfilingConsentCounter = createCounter(
+        "trpc.contentstack",
+        "profilingConsent.get"
+      )
+      const metricsGetProfilingConsent = getProfilingConsentCounter.init({
+        lang,
+      })
+
+      metricsGetProfilingConsent.start()
+
+      const response = await request<GetProfilingConsentData>(
+        GetProfilingConsent,
+        {
+          locale: lang,
+        },
+        {
+          key: tag,
+          ttl: "max",
+        }
+      )
+      if (!response.data) {
+        const notFoundError = notFound(response)
+        metricsGetProfilingConsent.noDataError()
+        throw notFoundError
+      }
+      const validatedResponse = profilingConsentSchema.safeParse(response.data)
+
+      if (!validatedResponse.success) {
+        metricsGetProfilingConsent.validationError(validatedResponse.error)
+        return null
+      }
+
+      const profiling_consent = validatedResponse.data
+
+      metricsGetProfilingConsent.success()
+
+      return {
+        profiling_consent,
+      }
+    }),
+})
--- a/packages/trpc/lib/routers/types.ts
+++ b/packages/trpc/lib/routers/types.ts
@@ -44,6 +44,7 @@ type UserDataScandicLoggedIn = {
  membershipNumber?: string
  memberLevel?: MembershipLevel
  loginAction?: "login success"
+  profileConsent?: boolean
  memberType: "scandic-friends"
 }

@@ -58,6 +59,7 @@ type UserDataEurobonusLoggedIn = {
  memberId?: string
  membershipNumber?: string
  memberLevel?: MembershipLevel
+  profileConsent?: boolean
 }

 export type TrackingUserData =
--- a/packages/trpc/lib/routers/user/input.ts
+++ b/packages/trpc/lib/routers/user/input.ts
@@ -44,7 +44,7 @@ export const signupInput = signUpSchema
    language: z.nativeEnum(Lang),
  })
  .omit({ termsAccepted: true })
-  .transform((data) => ({
+  .transform(({ profilingConsent, ...data }) => ({
    ...data,
    phoneNumber: data.phoneNumber.replace(/\s+/g, ""),
    address: {
@@ -53,8 +53,13 @@ export const signupInput = signUpSchema
      country: "",
      streetAddress: "",
    },
+    ...(profilingConsent ? { profilingConsent } : {}),
  }))

+export const profilingConsentInput = z.object({
+  profilingConsent: z.boolean(),
+})
+
 export const getSavedPaymentCardsInput = z.object({
  supportedCards: z.array(z.string()),
 })
--- a/packages/trpc/lib/routers/user/mutation.ts
+++ b/packages/trpc/lib/routers/user/mutation.ts
@@ -11,6 +11,7 @@ import {
  addCreditCardInput,
  addPromoCampaignInput,
  deleteCreditCardInput,
+  profilingConsentInput,
  saveCreditCardInput,
  signupInput,
 } from "./input"
@@ -197,7 +198,7 @@ export const userMutationRouter = router({
    const signupCounter = createCounter("trpc.user", "signup")
    const metricsSignup = signupCounter.init()

-    const apiResponse = await api.post(api.endpoints.v1.Profile.profile, {
+    const apiResponse = await api.post(api.endpoints.v2.Profile.profile, {
      body: input,
      headers: {
        Authorization: `Bearer ${ctx.serviceToken}`,
@@ -217,6 +218,34 @@ export const userMutationRouter = router({
      redirectUrl: signupVerify[input.language],
    }
  }),
+  profilingConsent: router({
+    update: protectedProcedure
+      .input(profilingConsentInput)
+      .mutation(async function ({ ctx, input }) {
+        const profilingConsentCounter = createCounter(
+          "trpc.user",
+          "profilingConsent"
+        )
+        const metricsProfilingConsent = profilingConsentCounter.init()
+
+        const apiResponse = await api.patch(api.endpoints.v2.Profile.profile, {
+          body: input,
+          headers: {
+            Authorization: `Bearer ${ctx.session.token.access_token}`,
+          },
+        })
+
+        if (!apiResponse.ok) {
+          await metricsProfilingConsent.httpError(apiResponse)
+          const text = await apiResponse.text()
+          throw serverErrorByStatus(apiResponse.status, text)
+        }
+
+        metricsProfilingConsent.success()
+
+        return true
+      }),
+  }),
  promoCampaign: router({
    add: protectedProcedure
      .input(addPromoCampaignInput)
--- a/packages/trpc/lib/routers/user/output.ts
+++ b/packages/trpc/lib/routers/user/output.ts
@@ -113,6 +113,8 @@ export const getUserSchema = z
          .nullable(),
        loyalty: userLoyaltySchema.optional(),
        employmentDetails: employmentDetailsSchema,
+        profilingConsent: z.boolean().optional(),
+        profilingConsentUpdate: z.string().optional(),
        promotions: z.array(z.string()).nullish(),
      }),
      type: z.string(),
--- a/packages/trpc/lib/routers/user/schemas.ts
+++ b/packages/trpc/lib/routers/user/schemas.ts
@@ -51,6 +51,7 @@ export const signUpSchema = z.object({
      .regex(/^[A-Za-z0-9-\s]{1,9}$/g, signupErrors.ZIP_CODE_INVALID),
  }),
  password: passwordValidator(signupErrors.PASSWORD_REQUIRED),
+  profilingConsent: z.boolean(),
  termsAccepted: z
    .boolean()
    .refine((value) => value === true, signupErrors.TERMS_REQUIRED),
--- a/packages/trpc/lib/routers/user/utils/parsedUser.ts
+++ b/packages/trpc/lib/routers/user/utils/parsedUser.ts
@@ -28,6 +28,8 @@ export function parsedUser(data: User, maskValues: boolean) {
    name: `${data.firstName} ${data.lastName}`,
    phoneNumber: data.phoneNumber,
    profileId: data.profileId,
+    profilingConsent: data.profilingConsent,
+    profilingConsentUpdate: data.profilingConsentUpdate,
    promotions: data.promotions || null,
  } satisfies User