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

@@ -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

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

packages/trpc/lib/context.ts

@@ -23,7 +23,9 @@ type CreateContextOptions = {
   app: "scandic-web" | "partner-sas"
   getScandicUserToken: () => Promise<string | null>
   getUserPointsBalance: () => Promise<number | null>
-  getScandicUser: () => Promise<ScandicUser | null>
+  getScandicUser: (input?: {
+    withExtendedPartnerData: boolean
+  }) => Promise<ScandicUser | null>
 }
 
 export function createContext(opts: CreateContextOptions) {

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