Merge remote-tracking branch 'origin' into feature/tracking

server/routers/user/output.ts

@@ -22,13 +22,16 @@ export const getUserSchema = z
   .object({
     data: z.object({
       attributes: z.object({
-        address: z.object({
-          city: z.string().optional(),
-          country: z.string().optional(),
-          countryCode: z.nativeEnum(countriesMap).optional(),
-          streetAddress: z.string().optional(),
-          zipCode: z.string().optional(),
-        }),
+        address: z
+          .object({
+            city: z.string().optional(),
+            country: z.string().optional(),
+            countryCode: z.nativeEnum(countriesMap).optional(),
+            streetAddress: z.string().optional(),
+            zipCode: z.string().optional(),
+          })
+          .optional()
+          .nullable(),
         dateOfBirth: z.string().optional().default("1900-01-01"),
         email: z.string().email(),
         firstName: z.string(),

server/routers/user/query.ts

@@ -34,7 +34,7 @@ import type {
   TrackingSDKUserData,
 } from "@/types/components/tracking"
 import { Transactions } from "@/types/enums/transactions"
-import { User } from "@/types/user"
+import type { User } from "@/types/user"
 import type { MembershipLevel } from "@/constants/membershipLevels"
 
 // OpenTelemetry metrics: User
@@ -170,15 +170,15 @@ export const getVerifiedUser = cache(
 )
 
 export function parsedUser(data: User, isMFA: boolean) {
-  const country = countries.find((c) => c.code === data.address.countryCode)
+  const country = countries.find((c) => c.code === data.address?.countryCode)
 
   const user = {
     address: {
-      city: data.address.city,
+      city: data.address?.city,
       country: country?.name ?? "",
-      countryCode: data.address.countryCode,
-      streetAddress: data.address.streetAddress,
-      zipCode: data.address.zipCode,
+      countryCode: data.address?.countryCode,
+      streetAddress: data.address?.streetAddress,
+      zipCode: data.address?.zipCode,
     },
     dateOfBirth: data.dateOfBirth,
     email: data.email,