From e35efd60fc51aeabc80b33131b211488e7b29b33 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 21 Oct 2024 21:24:29 -0500 Subject: [PATCH] Make adminAccountSchema less strict Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1766 --- src/schemas/admin-account.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/schemas/admin-account.ts b/src/schemas/admin-account.ts index 7ba039453..d84c19418 100644 --- a/src/schemas/admin-account.ts +++ b/src/schemas/admin-account.ts @@ -2,18 +2,23 @@ import { z } from 'zod'; import { accountSchema } from './account'; +const adminIpSchema = z.object({ + ip: z.string().ip(), + used_at: z.string().datetime(), +}); + const adminAccountSchema = z.object({ id: z.string(), account: accountSchema, username: z.string(), - domain: z.string(), + domain: z.string().nullish().catch(null), created_at: z.string().datetime(), email: z.string().email().nullish().catch(null), - ip: z.string().ip().nullish(), - ips: z.string().ip().array().nullish(), - locale: z.string(), - invite_request: z.string().nullish(), - role: z.string().nullish(), + ip: z.string().ip().nullish().catch(null), + ips: adminIpSchema.array().nullish().catch(null), + locale: z.string().nullish().catch(null), + invite_request: z.string().nullish().catch(null), + role: z.string().nullish().catch(null), confirmed: z.boolean().catch(true), approved: z.boolean().catch(true), disabled: z.boolean().catch(false),