From 2cfdbc19a95b3dd1668c6d0cb8caf7ea98d71401 Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Tue, 21 May 2024 13:05:29 +0200 Subject: [PATCH] feat: use v1 profile api --- server/routers/user/output.ts | 2 +- server/routers/user/query.ts | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/routers/user/output.ts b/server/routers/user/output.ts index 85e5e91da..f0333f2ba 100644 --- a/server/routers/user/output.ts +++ b/server/routers/user/output.ts @@ -11,7 +11,7 @@ export const getUserSchema = z.object({ }), dateOfBirth: z.string(), email: z.string().email(), - name: z.string(), + firstName: z.string(), language: z.string(), lastName: z.string(), membership: z diff --git a/server/routers/user/query.ts b/server/routers/user/query.ts index 659df59c2..3f8efdedc 100644 --- a/server/routers/user/query.ts +++ b/server/routers/user/query.ts @@ -22,7 +22,7 @@ function fakingRequest(payload: T): Promise { export const userQueryRouter = router({ get: protectedProcedure.query(async function ({ ctx }) { - const apiResponse = await api.get(api.endpoints.v0.profile, { + const apiResponse = await api.get(api.endpoints.v1.profile, { cache: "no-store", headers: { Authorization: `Bearer ${ctx.session.token.access_token}`, @@ -43,11 +43,11 @@ export const userQueryRouter = router({ } const apiJson = await apiResponse.json() - if (!apiJson.data?.length) { + if (!apiJson.data?.attributes) { throw notFound(apiJson) } - const verifiedData = getUserSchema.safeParse(apiJson.data[0].attributes) + const verifiedData = getUserSchema.safeParse(apiJson.data.attributes) if (!verifiedData.success) { throw internalServerError(verifiedData.error) } @@ -55,8 +55,7 @@ export const userQueryRouter = router({ return { ...extendedUser, ...verifiedData.data, - firstName: verifiedData.data.name, - name: `${verifiedData.data.name} ${verifiedData.data.lastName}`, + name: `${verifiedData.data.firstName} ${verifiedData.data.lastName}`, } }),