From 1668baf04b318136bfe27ac37770fec3bd09ba99 Mon Sep 17 00:00:00 2001
From: Linus Flood <linus.flood@scandichotels.com>
Date: Fri, 10 Oct 2025 10:42:23 +0000
Subject: [PATCH] Merged in fix/getProfile (pull request #2950)

Fix/getProfile

* fix(mypages): do not fetch SAS data on overview page and use correct mfa value when masking personal data

* Merge branch 'master' into fix/getProfile

* feat(profile): revert and dont mask data :O


Approved-by: Anton Gunnarsson
---
 packages/trpc/lib/routers/user/query/index.ts | 54 ++++++-------------
 .../trpc/lib/routers/user/utils/parsedUser.ts |  4 +-
 2 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/packages/trpc/lib/routers/user/query/index.ts b/packages/trpc/lib/routers/user/query/index.ts
index 18407e4c4..94bbe1fd5 100644
--- a/packages/trpc/lib/routers/user/query/index.ts
+++ b/packages/trpc/lib/routers/user/query/index.ts
@@ -54,46 +54,21 @@ export const userQueryRouter = router({
 
       return parsedUser(data.data, ctx.isMFA)
     }),
-  getSafely: safeProtectedProcedure
-    .use(async function (opts) {
-      return opts.next({
-        ctx: {
-          ...opts.ctx,
-          isMFA:
-            !!opts.ctx.session &&
-            !!opts.ctx.session.token.mfa_scope &&
-            !!opts.ctx.session.token.mfa_expires_at &&
-            opts.ctx.session.token.mfa_expires_at > Date.now(),
-        },
-      })
-    })
-    .query(async function getUser({ ctx }) {
-      if (!isValidSession(ctx.session)) {
-        return null
-      }
+  getSafely: safeProtectedProcedure.query(async function getUser({ ctx }) {
+    if (!isValidSession(ctx.session)) {
+      return null
+    }
 
-      const data = await getVerifiedUser({ session: ctx.session })
+    const data = await getVerifiedUser({ session: ctx.session })
 
-      if (!data || "error" in data) {
-        return null
-      }
+    if (!data || "error" in data) {
+      return null
+    }
 
-      return parsedUser(data.data, ctx.isMFA)
-    }),
-  getWithExtendedPartnerData: safeProtectedProcedure
-    .use(async function (opts) {
-      return opts.next({
-        ctx: {
-          ...opts.ctx,
-          isMFA:
-            !!opts.ctx.session &&
-            !!opts.ctx.session.token.mfa_scope &&
-            !!opts.ctx.session.token.mfa_expires_at &&
-            opts.ctx.session.token.mfa_expires_at > Date.now(),
-        },
-      })
-    })
-    .query(async function getUser({ ctx }) {
+    return parsedUser(data.data, true)
+  }),
+  getWithExtendedPartnerData: safeProtectedProcedure.query(
+    async function getUser({ ctx }) {
       if (!isValidSession(ctx.session)) {
         return null
       }
@@ -107,8 +82,9 @@ export const userQueryRouter = router({
         return null
       }
 
-      return parsedUser(data.data, ctx.isMFA)
-    }),
+      return parsedUser(data.data, true)
+    }
+  ),
   name: safeProtectedProcedure.query(async function ({ ctx }) {
     if (!isValidSession(ctx.session)) {
       return null
diff --git a/packages/trpc/lib/routers/user/utils/parsedUser.ts b/packages/trpc/lib/routers/user/utils/parsedUser.ts
index 42138eeba..83c766dea 100644
--- a/packages/trpc/lib/routers/user/utils/parsedUser.ts
+++ b/packages/trpc/lib/routers/user/utils/parsedUser.ts
@@ -5,7 +5,7 @@ import { getFriendsMembership } from "../helpers"
 
 import type { User } from "../../../types/user"
 
-export function parsedUser(data: User, isMFA: boolean) {
+export function parsedUser(data: User, maskValues: boolean) {
   const country = countries.find((c) => c.code === data.address?.countryCode)
 
   const user = {
@@ -31,7 +31,7 @@ export function parsedUser(data: User, isMFA: boolean) {
     promotions: data.promotions || null,
   } satisfies User
 
-  if (!isMFA) {
+  if (maskValues) {
     if (user.address.city) {
       user.address.city = maskValue.text(user.address.city)
     }