From 0b569e28cea8dd95ae8c3f53fe6ee6c9018e6524 Mon Sep 17 00:00:00 2001 From: Anton Gunnarsson Date: Mon, 10 Nov 2025 15:23:07 +0000 Subject: [PATCH] Merged in fix/add-missing-partner-data (pull request #3116) fix: Add param to getScandicUser for extended data * Add param to getScandicUser for extended data Approved-by: Linus Flood --- apps/partner-sas/lib/trpc/index.ts | 3 ++- apps/scandic-web/lib/trpc/server.ts | 3 ++- packages/trpc/lib/context.ts | 4 +++- packages/trpc/lib/routers/user/query/index.ts | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/partner-sas/lib/trpc/index.ts b/apps/partner-sas/lib/trpc/index.ts index 78a43078d..7b3e01b42 100644 --- a/apps/partner-sas/lib/trpc/index.ts +++ b/apps/partner-sas/lib/trpc/index.ts @@ -45,7 +45,7 @@ export async function createAppContext() { return euroBonusProfile.points.total }, - getScandicUser: async () => { + getScandicUser: async (input) => { const session = await getSocialSession() if (!session) return null @@ -54,6 +54,7 @@ export async function createAppContext() { expires_at: dt(session.expires_at).unix() * 1000, access_token: session.access_token, }, + includeExtendedPartnerData: input?.withExtendedPartnerData, }) return user ?? null diff --git a/apps/scandic-web/lib/trpc/server.ts b/apps/scandic-web/lib/trpc/server.ts index be0f34bef..576bcdbfc 100644 --- a/apps/scandic-web/lib/trpc/server.ts +++ b/apps/scandic-web/lib/trpc/server.ts @@ -73,7 +73,7 @@ export async function createAppContext() { return user.membership?.currentPoints ?? 0 }, - getScandicUser: async () => { + getScandicUser: async (input) => { const session = await getUserSession() if (!session) return null @@ -82,6 +82,7 @@ export async function createAppContext() { expires_at: session.token.expires_at ?? 0, access_token: session.token.access_token, }, + includeExtendedPartnerData: input?.withExtendedPartnerData, }) return user ?? null diff --git a/packages/trpc/lib/context.ts b/packages/trpc/lib/context.ts index 8760cfe3c..9d9f50944 100644 --- a/packages/trpc/lib/context.ts +++ b/packages/trpc/lib/context.ts @@ -23,7 +23,9 @@ type CreateContextOptions = { app: "scandic-web" | "partner-sas" getScandicUserToken: () => Promise getUserPointsBalance: () => Promise - getScandicUser: () => Promise + getScandicUser: (input?: { + withExtendedPartnerData: boolean + }) => Promise } export function createContext(opts: CreateContextOptions) { diff --git a/packages/trpc/lib/routers/user/query/index.ts b/packages/trpc/lib/routers/user/query/index.ts index d3755d79b..eefba1fe0 100644 --- a/packages/trpc/lib/routers/user/query/index.ts +++ b/packages/trpc/lib/routers/user/query/index.ts @@ -70,7 +70,7 @@ export const userQueryRouter = router({ return null } - const user = await ctx.getScandicUser() + const user = await ctx.getScandicUser({ withExtendedPartnerData: true }) if (!user) { return null