scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/getProfile (pull request #2945)

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

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


Approved-by: Anton Gunnarsson
This commit is contained in:
Linus Flood
2025-10-10 07:45:06 +00:00
parent eba6319ebe
commit f70d4d7c7f
2 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx
View File

@@ -2,7 +2,7 @@ import { Divider } from "@scandic-hotels/design-system/Divider"
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
import { env } from "@/env/server" import { env } from "@/env/server"
import { getProfileWithExtendedPartnerData } from "@/lib/trpc/memoizedRequests" import { getProfile } from "@/lib/trpc/memoizedRequests"
import { TeamMemberCardTrigger } from "@/components/DigitalTeamMemberCard/Trigger" import { TeamMemberCardTrigger } from "@/components/DigitalTeamMemberCard/Trigger"
import DigitalTeamMemberCard from "@/components/MyPages/DigitalTeamMemberCard" import DigitalTeamMemberCard from "@/components/MyPages/DigitalTeamMemberCard"
@@ -30,7 +30,7 @@ export default async function Overview({
title, title,
}: AccountPageComponentProps) { }: AccountPageComponentProps) {
const intl = await getIntl() const intl = await getIntl()
const user = await getProfileWithExtendedPartnerData() const user = await getProfile()
if (!user || "error" in user) { if (!user || "error" in user) {
return null return null
} }

54
packages/trpc/lib/routers/user/query/index.ts
View File

@@ -54,21 +54,46 @@ export const userQueryRouter = router({
return parsedUser(data.data, ctx.isMFA) return parsedUser(data.data, ctx.isMFA)
}), }),
getSafely: safeProtectedProcedure.query(async function getUser({ ctx }) { getSafely: safeProtectedProcedure
if (!isValidSession(ctx.session)) { .use(async function (opts) {
return null 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
}
const data = await getVerifiedUser({ session: ctx.session }) const data = await getVerifiedUser({ session: ctx.session })
if (!data || "error" in data) { if (!data || "error" in data) {
return null return null
} }
return parsedUser(data.data, true) return parsedUser(data.data, ctx.isMFA)
}), }),
getWithExtendedPartnerData: safeProtectedProcedure.query( getWithExtendedPartnerData: safeProtectedProcedure
async function getUser({ ctx }) { .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)) { if (!isValidSession(ctx.session)) {
return null return null
} }
@@ -82,9 +107,8 @@ export const userQueryRouter = router({
return null return null
} }
return parsedUser(data.data, true) return parsedUser(data.data, ctx.isMFA)
} }),
),
name: safeProtectedProcedure.query(async function ({ ctx }) { name: safeProtectedProcedure.query(async function ({ ctx }) {
if (!isValidSession(ctx.session)) { if (!isValidSession(ctx.session)) {
return null return null