edit users

frontend/lib/schemas/admin.ts

@@ -1,9 +1,19 @@
-import z from 'zod';
+import { boolean, object, string } from 'yup';
 import { registerSchema } from './auth';
 
-export const createUserSchema = registerSchema.extend({
-    admin: z
-        .boolean()
-        .default(false)
-        .prefault(() => false),
+export const createUserSchema = registerSchema.concat(
+    object({
+        admin: boolean().default(false),
+    })
+);
+export const editUserSchema = object({
+    name: string().trim().min(1).required('required'),
+    email: string().email().trim().required('required'),
+    password: string()
+        .trim()
+        .min(12)
+        .max(32)
+        .transform((s: string) => (s.length > 0 ? s : undefined))
+        .optional(),
+    admin: boolean().required('required'),
 });

frontend/lib/schemas/auth.ts

@@ -1,23 +1,13 @@
-import z from 'zod';
+import { object, string } from 'yup';
 
-export const registerSchema = z.object({
-    name: z.string('This field is required').trim().min(1),
-    email: z
-        .email({
-            error: 'This field is required',
-            pattern: z.regexes.rfc5322Email,
-        })
-        .trim(),
-    password: z.string('This field is required').trim().min(12).max(32),
+export const registerSchema = object({
+    name: string().trim().min(1).required('required'),
+    email: string().trim().email('Expected a valid email').required('required'),
+    password: string().trim().min(12).max(32).required('required'),
 });
 
-export const loginSchema = z.object({
-    email: z
-        .email({
-            error: 'This field is required',
-            pattern: z.regexes.rfc5322Email,
-        })
-        .trim(),
+export const loginSchema = object({
+    email: string().trim().email('Expected a valid email').required('required'),
     // Don't include the min and max here to let bad actors waste their time
-    password: z.string('This field is required').trim(),
+    password: string().trim().required('required'),
 });