Refactor code structure and remove redundant sections for improved readability and maintainability

app/auth/update-account/_components/update-account-form.tsx

@@ -8,8 +8,6 @@ import { ExternalLink } from '@/public/assets/external-link';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 
-import { onUpdateAccount } from '@kit/auth/actions/update-account-actions';
-import { UpdateAccountSchema } from '@kit/auth/schemas/update-account.schema';
 import { Button } from '@kit/ui/button';
 import { Checkbox } from '@kit/ui/checkbox';
 import {
@@ -23,6 +21,9 @@ import {
 import { Input } from '@kit/ui/input';
 import { Trans } from '@kit/ui/trans';
 
+import { UpdateAccountSchema } from '../_lib/schemas/update-account.schema';
+import { onUpdateAccount } from '../_lib/server/update-account';
+
 export function UpdateAccountForm({ user }: { user: User }) {
   const form = useForm({
     resolver: zodResolver(UpdateAccountSchema),
@@ -30,16 +31,15 @@ export function UpdateAccountForm({ user }: { user: User }) {
     defaultValues: {
       firstName: '',
       lastName: '',
-      personalCode: user.user_metadata.personalCode ?? '',
+      personalCode: '',
       email: user.email,
       phone: '',
       city: '',
-      weight: user.user_metadata.weight ?? undefined,
-      height: user.user_metadata.height ?? undefined,
+      weight: 0,
+      height: 0,
       userConsent: false,
     },
   });
-
   return (
     <Form {...form}>
       <form

app/auth/update-account/_lib/schemas/update-account.schema.ts

@@ -0,0 +1,44 @@
+import { z } from 'zod';
+
+export const UpdateAccountSchema = z.object({
+  firstName: z
+    .string({
+      required_error: 'First name is required',
+    })
+    .nonempty(),
+  lastName: z
+    .string({
+      required_error: 'Last name is required',
+    })
+    .nonempty(),
+  personalCode: z
+    .string({
+      required_error: 'Personal code is required',
+    })
+    .nonempty(),
+  email: z.string().email({
+    message: 'Email is required',
+  }),
+  phone: z
+    .string({
+      required_error: 'Phone number is required',
+    })
+    .nonempty(),
+  city: z.string().optional(),
+  weight: z
+    .number({
+      required_error: 'Weight is required',
+      invalid_type_error: 'Weight must be a number',
+    })
+    .gt(0, { message: 'Weight must be greater than 0' }),
+
+  height: z
+    .number({
+      required_error: 'Height is required',
+      invalid_type_error: 'Height must be a number',
+    })
+    .gt(0, { message: 'Height must be greater than 0' }),
+  userConsent: z.boolean().refine((val) => val === true, {
+    message: 'Must be true',
+  }),
+});

app/auth/update-account/_lib/server/update-account.ts

@@ -0,0 +1,60 @@
+'use server';
+
+import { redirect } from 'next/navigation';
+
+import { updateCustomer } from '@lib/data/customer';
+
+import { createAuthApi } from '@kit/auth/api';
+import { enhanceAction } from '@kit/next/actions';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+
+import pathsConfig from '~/config/paths.config';
+
+import { UpdateAccountSchema } from '../../schemas/update-account.schema';
+
+export interface AccountSubmitData {
+  firstName: string;
+  lastName: string;
+  personalCode: string;
+  email: string;
+  phone?: string;
+  city?: string;
+  weight: number | null;
+  height: number | null;
+  userConsent: boolean;
+}
+
+export const onUpdateAccount = enhanceAction(
+  async (params: AccountSubmitData) => {
+    const client = getSupabaseServerClient();
+    const api = createAuthApi(client);
+
+    try {
+      await api.updateAccount(params);
+      console.log('SUCCESS', pathsConfig.auth.updateAccountSuccess);
+    } catch (err: unknown) {
+      if (err instanceof Error) {
+        console.warn('On update account error: ' + err.message);
+      }
+      console.warn('On update account error: ', err);
+    }
+
+    await updateCustomer({
+      first_name: params.firstName,
+      last_name: params.lastName,
+      phone: params.phone,
+    });
+
+    const hasUnseenMembershipConfirmation =
+      await api.hasUnseenMembershipConfirmation();
+
+    if (hasUnseenMembershipConfirmation) {
+      redirect(pathsConfig.auth.membershipConfirmation);
+    } else {
+      redirect(pathsConfig.app.selectPackage);
+    }
+  },
+  {
+    schema: UpdateAccountSchema,
+  },
+);