From 6f03b268aa82dbed2a6bef5ce40d126a383dfcc1 Mon Sep 17 00:00:00 2001 From: Luke Vella Date: Wed, 23 Apr 2025 12:42:30 +0100 Subject: [PATCH] Use zod for validation --- apps/web/src/app/[locale]/setup/page.tsx | 7 ++++--- apps/web/src/features/setup/utils.ts | 11 ----------- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 apps/web/src/features/setup/utils.ts diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsx index 4c13473ba..07f45b528 100644 --- a/apps/web/src/app/[locale]/setup/page.tsx +++ b/apps/web/src/app/[locale]/setup/page.tsx @@ -5,14 +5,15 @@ import { Logo } from "@/components/logo"; import { Trans } from "@/components/trans"; import { getUser } from "@/data/get-user"; import { SetupForm } from "@/features/setup/components/setup-form"; -import { isUserOnboarded } from "@/features/setup/utils"; +import { onboardedUserSchema } from "@/features/setup/schema"; import { getTranslation } from "@/i18n/server"; export default async function SetupPage() { const user = await getUser(); - if (isUserOnboarded(user)) { - // User is already onboarded, redirect to dashboard + const isUserOnboarded = onboardedUserSchema.safeParse(user).success; + + if (!isUserOnboarded) { redirect("/"); } diff --git a/apps/web/src/features/setup/utils.ts b/apps/web/src/features/setup/utils.ts deleted file mode 100644 index 657c64888..000000000 --- a/apps/web/src/features/setup/utils.ts +++ /dev/null @@ -1,11 +0,0 @@ -export function isUserOnboarded({ - name, - timeZone, - locale, -}: { - name?: string | null; - timeZone?: string | null; - locale?: string | null; -}) { - return name && timeZone && locale; -}