@greatapps/common 1.1.98 → 1.1.100

package/src/components/account/hooks/useTwoFactorAuthForm.tsx

@@ -1,114 +1,101 @@
-'use client';
-
-import { useState, useCallback, useEffect } from 'react';
-import { useMutation } from '@tanstack/react-query';
-import { toast } from 'sonner';
-import { Toast } from '../../ui/feedback/Toast';
-import { copyToClipboard } from '../../../utils/browser/clipboard';
-import {
-  generateTwoFactorAction,
-  confirmTwoFactorAction,
-} from '../../../modules/accounts/actions/account-management.action';
-
-type Step = 'code' | 'recovery';
-
-interface UseTwoFactorAuthFormProps {
-  onSuccess?: () => void;
-  open?: boolean;
-}
-
-export default function useTwoFactorAuthForm({ onSuccess, open }: UseTwoFactorAuthFormProps = {}) {
-  const [code, setCode] = useState('');
-  const [step, setStep] = useState<Step>('code');
-
-  const generateMutation = useMutation({
-    mutationFn: generateTwoFactorAction,
-    onSuccess: (result) => {
-      if (!result.success) {
-        toast.custom((t) => (
-          <Toast variant="error" message={result.error ?? 'Erro ao gerar QR Code. Tente novamente.'} toastId={t} />
-        ));
-      }
-    },
-    onError: () => {
-      toast.custom((t) => (
-        <Toast variant="error" message="Erro ao gerar QR Code. Tente novamente." toastId={t} />
-      ));
-    },
-  });
-
-  const confirmMutation = useMutation({
-    mutationFn: (otpCode: string) => confirmTwoFactorAction(otpCode),
-    onSuccess: (result) => {
-      if (!result.success) {
-        toast.custom((t) => (
-          <Toast variant="error" message={result.error ?? 'Código inválido'} toastId={t} />
-        ));
-        return;
-      }
-      setStep('recovery');
-    },
-    onError: () => {
-      toast.custom((t) => (
-        <Toast variant="error" message="Erro ao confirmar código. Tente novamente." toastId={t} />
-      ));
-    },
-  });
-
-  const { mutate: triggerGenerate } = generateMutation;
-
-  useEffect(() => {
-    if (open) {
-      triggerGenerate();
-    }
-  }, [open, triggerGenerate]);
-
-  const generateFailed =
-    (generateMutation.isSuccess && !generateMutation.data?.success) || generateMutation.isError;
-
-  const isCodeComplete = code.length === 6;
-
-  const handleSubmit = () => {
-    if (!isCodeComplete) return;
-    confirmMutation.mutate(code);
-  };
-
-  const handleFinalize = () => {
-    onSuccess?.();
-    setTimeout(resetForm, 300);
-  };
-
-  const handleCopyCodes = useCallback(async () => {
-    const codes = generateMutation.data?.backupCodes ?? [];
-    const success = await copyToClipboard(codes.join('\n'));
-    if (success) {
-      toast.custom((t) => (
-        <Toast variant="success" message="Códigos copiados com sucesso" toastId={t} />
-      ));
-    }
-  }, [generateMutation.data]);
-
-  const resetForm = () => {
-    setCode('');
-    setStep('code');
-    generateMutation.reset();
-    confirmMutation.reset();
-  };
-
-  return {
-    code,
-    setCode,
-    isCodeComplete,
-    isGenerating: generateMutation.isPending,
-    isConfirming: confirmMutation.isPending,
-    generateFailed,
-    retryGenerate: triggerGenerate,
-    qrcode: generateMutation.data?.qrcode,
-    backupCodes: generateMutation.data?.backupCodes ?? [],
-    step,
-    handleSubmit,
-    handleFinalize,
-    handleCopyCodes,
-    resetForm,
-  };
-}
+'use client';
+
+import { useState, useCallback, useEffect } from 'react';
+import { useMutation } from '@tanstack/react-query';
+import { toast } from 'sonner';
+import { Toast } from '../../ui/feedback/Toast';
+import { copyToClipboard } from '../../../utils/browser/clipboard';
+import {
+  generateTwoFactorAction,
+  confirmTwoFactorAction,
+} from '../../../modules/accounts/actions/account-management.action';
+import { withAction } from '../../../utils/withAction';
+
+type Step = 'code' | 'recovery';
+
+interface UseTwoFactorAuthFormProps {
+  onSuccess?: () => void;
+  open?: boolean;
+}
+
+export default function useTwoFactorAuthForm({ onSuccess, open }: UseTwoFactorAuthFormProps = {}) {
+  const [code, setCode] = useState('');
+  const [step, setStep] = useState<Step>('code');
+
+  const generateMutation = useMutation({
+    mutationFn: withAction(generateTwoFactorAction),
+    onError: () => {
+      toast.custom((t) => (
+        <Toast variant="error" message="Erro ao gerar QR Code. Tente novamente." toastId={t} />
+      ));
+    },
+  });
+
+  const confirmMutation = useMutation({
+    mutationFn: withAction(confirmTwoFactorAction),
+    onSuccess: () => {
+      setStep('recovery');
+    },
+    onError: () => {
+      toast.custom((t) => (
+        <Toast variant="error" message="Erro ao confirmar código. Tente novamente." toastId={t} />
+      ));
+    },
+  });
+
+  const { mutate: triggerGenerate } = generateMutation;
+
+  useEffect(() => {
+    if (open) {
+      triggerGenerate();
+    }
+  }, [open, triggerGenerate]);
+
+  const generateFailed = generateMutation.isError;
+
+  const isCodeComplete = code.length === 6;
+
+  const handleSubmit = () => {
+    if (!isCodeComplete) return;
+    confirmMutation.mutate(code);
+  };
+
+  const handleFinalize = () => {
+    onSuccess?.();
+    setTimeout(resetForm, 300);
+  };
+
+  const handleCopyCodes = useCallback(async () => {
+    const codes = generateMutation.data?.backupCodes ?? [];
+    const success = await copyToClipboard(codes.join('\n'));
+    if (success) {
+      toast.custom((t) => (
+        <Toast variant="success" message="Códigos copiados com sucesso" toastId={t} />
+      ));
+    }
+  }, [generateMutation.data]);
+
+  const resetForm = () => {
+    setCode('');
+    setStep('code');
+    generateMutation.reset();
+    confirmMutation.reset();
+  };
+
+  return {
+    code,
+    setCode,
+    isCodeComplete,
+    isGenerating: generateMutation.isPending,
+    isConfirming: confirmMutation.isPending,
+    generateFailed,
+    retryGenerate: triggerGenerate,
+    qrcode: generateMutation.data?.qrcode,
+    backupCodes: generateMutation.data?.backupCodes ?? [],
+    step,
+    handleSubmit,
+    handleFinalize,
+    handleCopyCodes,
+    resetForm,
+  };
+}

package/src/components/account/sections/MyProfileSection.tsx

@@ -84,47 +84,50 @@ export function MyProfileSection({ onClose, storageUrl }: MyProfileSectionProps)
   };
 
   const handleDelete = async () => {
-    const result = isOwner
-      ? await deleteAccount.mutateAsync()
-      : await deleteAccountUser.mutateAsync(user!.id);
-
-    if (!result.success) {
+    try {
+      if (isOwner) {
+        await deleteAccount.mutateAsync();
+      } else {
+        await deleteAccountUser.mutateAsync(user!.id);
+      }
+      await logout();
+    } catch (error) {
       toast.custom((t) => (
         <Toast
           variant="error"
-          message={result.error ?? 'Erro ao excluir. Tente novamente.'}
+          message={error instanceof Error ? error.message : 'Erro ao excluir. Tente novamente.'}
           toastId={t}
         />
       ));
       setDeleteConfirmOpen(false);
-      return;
     }
-
-    await logout();
   };
 
   const onSubmit = async (data: MyProfileFormData) => {
-    const result = await updateAccountUser.mutateAsync({
-      name: data.name,
-      gender: GENDER_OPTIONS.find((g) => g.value === data.gender)?.apiValue,
-      ...(selectedPhoto ? { photo: selectedPhoto } : {}),
-      ...(photoRemoved ? { photo: '' } : {}),
-    });
+    try {
+      await updateAccountUser.mutateAsync({
+        name: data.name,
+        gender: GENDER_OPTIONS.find((g) => g.value === data.gender)?.apiValue,
+        ...(selectedPhoto ? { photo: selectedPhoto } : {}),
+        ...(photoRemoved ? { photo: '' } : {}),
+      });
 
-    if (!result.success) {
+      form.reset(data);
+      setSelectedPhoto(null);
+      setPhotoRemoved(false);
       toast.custom((t) => (
-        <Toast variant="error" message={result.error ?? 'Erro ao atualizar perfil'} toastId={t} />
+        <Toast variant="success" message="Perfil atualizado com sucesso" toastId={t} />
+      ));
+      onClose();
+    } catch (error) {
+      toast.custom((t) => (
+        <Toast
+          variant="error"
+          message={error instanceof Error ? error.message : 'Erro ao atualizar perfil'}
+          toastId={t}
+        />
       ));
-      return;
     }
-
-    form.reset(data);
-    setSelectedPhoto(null);
-    setPhotoRemoved(false);
-    toast.custom((t) => (
-      <Toast variant="success" message="Perfil atualizado com sucesso" toastId={t} />
-    ));
-    onClose();
   };
 
   return (

package/src/components/account/sections/PreferencesSection.tsx

@@ -87,28 +87,14 @@ export function PreferencesSection({ onClose }: PreferencesSectionProps) {
     setIsSaving(true);
     try {
       const apiLanguage = LANGUAGE_OPTIONS.find((o) => o.value === data.language)?.apiValue ?? data.language.toLowerCase();
-      const userResult = await updateAccountUser.mutateAsync({
+      await updateAccountUser.mutateAsync({
         language: apiLanguage,
         receive_sms: data.receive_sms,
         receive_email: data.receive_email,
       });
 
-      if (!userResult.success) {
-        toast.custom((t) => (
-          <Toast variant="error" message={userResult.error ?? 'Erro ao salvar preferências'} toastId={t} />
-        ));
-        return;
-      }
-
       if (canEditPreferences && Object.keys(accountFields).length > 0) {
-        const accountResult = await updateAccount.mutateAsync(accountFields);
-
-        if (!accountResult.success) {
-          toast.custom((t) => (
-            <Toast variant="error" message={accountResult.error ?? 'Erro ao salvar preferências da conta'} toastId={t} />
-          ));
-          return;
-        }
+        await updateAccount.mutateAsync(accountFields);
       }
 
       reset(data);
@@ -116,6 +102,14 @@ export function PreferencesSection({ onClose }: PreferencesSectionProps) {
         <Toast variant="success" message="Preferências salvas com sucesso" toastId={t} />
       ));
       onClose();
+    } catch (error) {
+      toast.custom((t) => (
+        <Toast
+          variant="error"
+          message={error instanceof Error ? error.message : 'Erro ao salvar preferências'}
+          toastId={t}
+        />
+      ));
     } finally {
       setIsSaving(false);
     }

package/src/index.ts

@@ -74,6 +74,8 @@ export type {
 export { cn } from "./infra/utils/clsx";
 export { buildQueryParams } from "./infra/utils/params";
 export { parseSchema, parseResult } from "./infra/utils/parser";
+export { withAction } from "./utils/withAction";
+export { safeServerAction } from "./utils/safeServerAction";
 
 // Layout
 export {