moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-admin-account-schema' into 'main' 

Make adminAccountSchema less strict

Closes #1766

See merge request soapbox-pub/soapbox!3174
This commit is contained in:
Alex Gleason 2024-10-22 02:29:46 +00:00
parent e5ec33ae88 e35efd60fc
commit c712167a27
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/schemas/admin-account.ts
View File

@ -2,18 +2,23 @@ import { z } from 'zod';
import { accountSchema } from './account'; import { accountSchema } from './account';
const adminIpSchema = z.object({
ip: z.string().ip(),
used_at: z.string().datetime(),
});
const adminAccountSchema = z.object({ const adminAccountSchema = z.object({
id: z.string(), id: z.string(),
account: accountSchema, account: accountSchema,
username: z.string(), username: z.string(),
domain: z.string(), domain: z.string().nullish().catch(null),
created_at: z.string().datetime(), created_at: z.string().datetime(),
email: z.string().email().nullish().catch(null), email: z.string().email().nullish().catch(null),
ip: z.string().ip().nullish(), ip: z.string().ip().nullish().catch(null),
ips: z.string().ip().array().nullish(), ips: adminIpSchema.array().nullish().catch(null),
locale: z.string(), locale: z.string().nullish().catch(null),
invite_request: z.string().nullish(), invite_request: z.string().nullish().catch(null),
role: z.string().nullish(), role: z.string().nullish().catch(null),
confirmed: z.boolean().catch(true), confirmed: z.boolean().catch(true),
approved: z.boolean().catch(true), approved: z.boolean().catch(true),
disabled: z.boolean().catch(false), disabled: z.boolean().catch(false),