From 5152336591750b5424f6aea3153c3aec6c9fee58 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 6 Feb 2026 23:31:07 +0000 Subject: [PATCH] fix validation, derrive teamID and Roles from tokens --- client/src/Hooks/useRegisterForm.ts | 3 -- client/src/Pages/Auth/Register/index.tsx | 37 ++++++++++++++++++++-- client/src/Routes/index.jsx | 8 ++++- client/src/Validation/register.ts | 3 -- server/src/service/business/userService.ts | 5 +-- server/src/validation/joi.ts | 4 +-- 6 files changed, 45 insertions(+), 15 deletions(-) diff --git a/client/src/Hooks/useRegisterForm.ts b/client/src/Hooks/useRegisterForm.ts index 3b5189995..99337a28b 100644 --- a/client/src/Hooks/useRegisterForm.ts +++ b/client/src/Hooks/useRegisterForm.ts @@ -7,9 +7,6 @@ export const useRegisterForm = () => { email: "", password: "", confirm: "", - teamId: "", - inviteToken: "", - role: ["superadmin"], }; return { diff --git a/client/src/Pages/Auth/Register/index.tsx b/client/src/Pages/Auth/Register/index.tsx index 99ef19951..80cee579f 100644 --- a/client/src/Pages/Auth/Register/index.tsx +++ b/client/src/Pages/Auth/Register/index.tsx @@ -8,11 +8,17 @@ import { useTranslation } from "react-i18next"; import { usePost } from "@/Hooks/UseApi"; import { setAuthState } from "@/Features/Auth/authSlice"; import { useDispatch } from "react-redux"; -import { useNavigate } from "react-router-dom"; +import { useNavigate, useParams } from "react-router-dom"; import type { AuthResponse } from "@/Types/User"; +import { useEffect, useRef } from "react"; interface RegisterPayload { user: Omit; + token?: string; +} + +interface InviteVerifyResponse { + email: string; } const RegisterPage = () => { @@ -21,17 +27,41 @@ const RegisterPage = () => { const { post, loading } = usePost(); const dispatch = useDispatch(); const navigate = useNavigate(); + const { token } = useParams<{ token?: string }>(); - const { control, handleSubmit, setError } = useForm({ + const { post: verifyToken } = usePost<{ token: string }, InviteVerifyResponse>(); + const hasVerified = useRef(false); + + const { control, handleSubmit, setError, reset } = useForm({ resolver: zodResolver(schema), defaultValues: defaults, }); + useEffect(() => { + if (!token || hasVerified.current) return; + hasVerified.current = true; + + verifyToken("/invite/verify", { token }).then((result) => { + if (result?.success && result?.data) { + reset({ + ...defaults, + email: result.data.email ?? "", + }); + } else { + navigate("/register", { replace: true }); + } + }); + }, [token]); + const onSubmit = async (data: RegisterFormData) => { if (loading) return; const { confirm, ...userData } = data; - const result = await post("/auth/register", { user: userData }); + const payload: RegisterPayload = { user: userData }; + if (token) { + payload.token = token; + } + const result = await post("/auth/register", payload); if (result?.success) { dispatch(setAuthState(result)); @@ -82,6 +112,7 @@ const RegisterPage = () => { render={({ field, fieldState }) => ( { } + element={ + <> + + + + + } /> specialCharPattern.test(val), "Password must contain a special character" ), - teamId: z.string().optional(), - inviteToken: z.string().optional(), confirm: z.string().min(1, "Please confirm your password"), - role: z.array(z.string()).min(1, "Role is required"), }) .refine((data) => data.password === data.confirm, { message: "Passwords do not match", diff --git a/server/src/service/business/userService.ts b/server/src/service/business/userService.ts index 315c62bb0..281c03ab7 100644 --- a/server/src/service/business/userService.ts +++ b/server/src/service/business/userService.ts @@ -87,10 +87,10 @@ class UserService { const superAdminExists = await this.usersRepository.findSuperAdmin(); if (superAdminExists) { const invite = await this.invitesRepository.findByTokenAndDelete(inviteToken); - user.role = invite.role; + user.role = invite.role ?? ["user"]; user.teamId = invite.teamId; + user.email = invite.email; } else { - console.log("WHITFUSKALG"); // This is the first account, create JWT secret to use if one is not supplied by env const jwtSecret = this.crypto.randomBytes(64).toString("hex"); await this.settingsRepository.update({ jwtSecret }); @@ -100,6 +100,7 @@ class UserService { } const team = await this.teamsRepository.create(user.email); user.teamId = team.id; + user.role = ["superadmin"]; } const newUser = await this.usersRepository.create({ ...user }, file); diff --git a/server/src/validation/joi.ts b/server/src/validation/joi.ts index 49f919a4a..c1e945961 100755 --- a/server/src/validation/joi.ts +++ b/server/src/validation/joi.ts @@ -51,9 +51,7 @@ const registrationBodyValidation = joi.object({ }), password: joi.string().min(8).required().pattern(passwordPattern), profileImage: joi.any(), - role: joi.array().items(joi.string().valid("superadmin", "admin", "user", "demo")), - teamId: joi.string().allow("").required(), - inviteToken: joi.string().allow("").required(), + inviteToken: joi.string().allow("").optional(), }); const editUserBodyValidation = joi.object({