diff --git a/server/routers/user/output.ts b/server/routers/user/output.ts index f0333f2ba..85e5e91da 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(), - firstName: z.string(), + name: 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 3f8efdedc..659df59c2 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.v1.profile, { + const apiResponse = await api.get(api.endpoints.v0.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?.attributes) { + if (!apiJson.data?.length) { throw notFound(apiJson) } - const verifiedData = getUserSchema.safeParse(apiJson.data.attributes) + const verifiedData = getUserSchema.safeParse(apiJson.data[0].attributes) if (!verifiedData.success) { throw internalServerError(verifiedData.error) } @@ -55,7 +55,8 @@ export const userQueryRouter = router({ return { ...extendedUser, ...verifiedData.data, - name: `${verifiedData.data.firstName} ${verifiedData.data.lastName}`, + firstName: verifiedData.data.name, + name: `${verifiedData.data.name} ${verifiedData.data.lastName}`, } }), diff --git a/types/user.ts b/types/user.ts index c4599e579..c62d2e3a9 100644 --- a/types/user.ts +++ b/types/user.ts @@ -22,7 +22,7 @@ type Victory = { * we have to get the values from elsewhere */ export interface User extends z.infer { - name: string + firstName: string journeys: Journey[] nights: number shortcuts: ShortcutLink[]