From 7961a9a88ede0275f4825d0750bc2235a94d8710 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sat, 27 Dec 2025 16:07:57 +0000 Subject: [PATCH] cleanup register and login --- .../src/hooks/forms/UseInitRegisterForm.tsx | 2 +- client/src/pages/auth/Login.tsx | 8 ++------ client/src/pages/auth/Register.tsx | 2 +- client/src/pages/auth/RegisterForm.tsx | 13 ++----------- client/src/pages/auth/RegisterInvite.tsx | 2 +- client/src/validation/index.ts | 3 +++ client/src/validation/login.ts | 7 +++++++ client/src/validation/register.ts | 19 +++++++++++++++++++ client/src/validation/zod.ts | 17 ----------------- 9 files changed, 36 insertions(+), 37 deletions(-) create mode 100644 client/src/validation/index.ts create mode 100644 client/src/validation/login.ts create mode 100644 client/src/validation/register.ts diff --git a/client/src/hooks/forms/UseInitRegisterForm.tsx b/client/src/hooks/forms/UseInitRegisterForm.tsx index 60a1e0c1e..2d080285d 100644 --- a/client/src/hooks/forms/UseInitRegisterForm.tsx +++ b/client/src/hooks/forms/UseInitRegisterForm.tsx @@ -1,4 +1,4 @@ -import { registerSchema } from "@/validation/zod"; +import { registerSchema } from "@/validation"; import { useMemo } from "react"; import { z } from "zod"; diff --git a/client/src/pages/auth/Login.tsx b/client/src/pages/auth/Login.tsx index 4b55079bd..c9a3e716a 100644 --- a/client/src/pages/auth/Login.tsx +++ b/client/src/pages/auth/Login.tsx @@ -15,13 +15,11 @@ import { logout, } from "@/features/authSlice"; import { z } from "zod"; +import { loginSchema } from "@/validation"; import { useForm, Controller } from "react-hook-form"; import type { IUser } from "@/types/user"; -const schema = z.object({ - email: z.email("Invalid email address"), - password: z.string().min(6, "Password must be at least 6 characters"), -}); +const schema = loginSchema; type FormData = z.infer; @@ -99,7 +97,6 @@ const Login = () => { ( { ( ; const Register = () => { diff --git a/client/src/pages/auth/RegisterForm.tsx b/client/src/pages/auth/RegisterForm.tsx index ab7ed37af..fa28fadd9 100644 --- a/client/src/pages/auth/RegisterForm.tsx +++ b/client/src/pages/auth/RegisterForm.tsx @@ -12,7 +12,7 @@ import { useTranslation } from "react-i18next"; import { useTheme } from "@mui/material/styles"; import { useInitForm } from "@/hooks/forms/UseInitRegisterForm"; -import { registerSchema } from "@/validation/zod"; +import { registerSchema } from "@/validation"; type FormData = z.infer; export const RegisterForm = ({ @@ -41,11 +41,7 @@ export const RegisterForm = ({ formState: { errors }, } = useForm({ resolver: zodResolver(registerSchema), - defaultValues: { - email: "", - password: "", - confirmPassword: "", - }, + defaultValues: defaults, }); useEffect(() => { @@ -83,7 +79,6 @@ export const RegisterForm = ({ ( ( ( ( ( data.password === data.confirmPassword, { + path: ["confirmPassword"], + message: "Passwords must match", + }); + diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index 07ab8bb93..ce90c5a6a 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -3,23 +3,6 @@ import humanInterval from "human-interval"; import { ChannelTypes } from "@/types/notification-channel"; import { MaintenanceRepeats } from "@/types/maintenance"; -export const registerSchema = z - .object({ - email: z.email({ message: "Invalid email address" }), - firstName: z.string().min(1, { message: "First Name is required" }), - lastName: z.string().min(1, { message: "Last Name is required" }), - password: z - .string() - .min(6, { message: "Password must be at least 6 characters" }), - confirmPassword: z - .string() - .min(6, { message: "Confirm Password must be at least 6 characters" }), - }) - .refine((data) => data.password === data.confirmPassword, { - path: ["confirmPassword"], - message: "Passwords must match", - }); - const urlRegex = /^(https?:\/\/)?(localhost|([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}|[a-zA-Z0-9-]+|(\d{1,3}\.){3}\d{1,3})(:\d{1,5})?(\/.*)?$/;