@umituz/react-native-auth 3.6.90 → 3.6.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-auth",
-  "version": "3.6.90",
+  "version": "3.6.92",
   "description": "Authentication service for React Native apps - Secure, type-safe, and production-ready. Provider-agnostic design with dependency injection, configurable validation, and comprehensive error handling.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/presentation/hooks/useAccountManagement.ts

@@ -6,7 +6,7 @@
 import { useCallback, useState } from "react";
 import { Alert } from "react-native";
 import { useAuth } from "./useAuth";
-import { handleAccountDeletion } from "../utils/accountDeleteHandler.util";
+import { deleteCurrentUser } from "@umituz/react-native-firebase";
 
 export interface UseAccountManagementOptions {
   /**
@@ -111,14 +111,56 @@ export const useAccountManagement = (
     setIsDeletingAccount(true);
 
     try {
-      await handleAccountDeletion({
-        onReauthRequired,
-        onPasswordRequired: passwordHandler,
-      });
+      // First attempt - Firebase will check if reauthentication is needed
+      const result = await deleteCurrentUser({ autoReauthenticate: true });
+
+      if (result.success) {
+        return;
+      }
+
+      // Handle password reauthentication
+      if (result.error?.code === "auth/password-reauth") {
+        const password = await passwordHandler();
+        if (!password) {
+          throw new Error("Password required to delete account");
+        }
+
+        // Retry with password
+        const retryResult = await deleteCurrentUser({
+          autoReauthenticate: true,
+          password,
+        });
+
+        if (!retryResult.success) {
+          throw new Error(retryResult.error?.message || "Failed to delete account");
+        }
+
+        return;
+      }
+
+      // Handle social auth reauthentication
+      if (result.error?.requiresReauth && onReauthRequired) {
+        const reauthSuccess = await onReauthRequired();
+        if (!reauthSuccess) {
+          throw new Error("Reauthentication required to delete account");
+        }
+
+        // Retry after social reauth
+        const retryResult = await deleteCurrentUser({ autoReauthenticate: true });
+
+        if (!retryResult.success) {
+          throw new Error(retryResult.error?.message || "Failed to delete account");
+        }
+
+        return;
+      }
+
+      // Other errors
+      throw new Error(result.error?.message || "Failed to delete account");
     } finally {
       setIsDeletingAccount(false);
     }
-  }, [user, onReauthRequired, passwordHandler]);
+  }, [user, passwordHandler, onReauthRequired]);
 
   return {
     logout,

package/src/presentation/utils/accountDeleteHandler.util.ts

@@ -1,96 +0,0 @@
-/**
- * Account Delete Handler Utility
- * Handles reauthentication flow for account deletion
- */
-
-import { deleteCurrentUser } from "@umituz/react-native-firebase";
-
-export interface DeleteAccountCallbacks {
-  onReauthRequired?: () => Promise<boolean>;
-  onPasswordRequired?: () => Promise<string | null>;
-}
-
-export interface DeleteAccountOptions {
-  autoReauthenticate: boolean;
-  password?: string;
-}
-
-/**
- * Handles account deletion with reauthentication retry logic
- */
-export async function handleAccountDeletion(
-  callbacks: DeleteAccountCallbacks
-): Promise<void> {
-  const result = await deleteCurrentUser({ autoReauthenticate: true });
-
-  if (result.success) {
-    return;
-  }
-
-  if (result.error?.requiresReauth) {
-    await handleReauthentication(result, callbacks);
-    return;
-  }
-
-  if (result.error) {
-    throw new Error(result.error.message);
-  }
-}
-
-async function handleReauthentication(
-  initialResult: Awaited<ReturnType<typeof deleteCurrentUser>>,
-  callbacks: DeleteAccountCallbacks
-): Promise<void> {
-  const { onReauthRequired, onPasswordRequired } = callbacks;
-
-  // Handle password reauth
-  if (initialResult.error?.code === "auth/password-reauth" && onPasswordRequired) {
-    await retryWithPassword(onPasswordRequired);
-    return;
-  }
-
-  // Handle social auth reauth
-  if (onReauthRequired) {
-    await retryWithSocialAuth(onReauthRequired);
-    return;
-  }
-}
-
-async function retryWithPassword(onPasswordRequired: () => Promise<string | null>): Promise<void> {
-  const password = await onPasswordRequired();
-
-  if (!password) {
-    throw new Error("Password required to delete account");
-  }
-
-  const result = await deleteCurrentUser({
-    autoReauthenticate: false,
-    password,
-  });
-
-  if (result.success) {
-    return;
-  }
-
-  if (result.error) {
-    throw new Error(result.error.message);
-  }
-}
-
-async function retryWithSocialAuth(onReauthRequired: () => Promise<boolean>): Promise<void> {
-  const reauthSuccess = await onReauthRequired();
-
-  if (!reauthSuccess) {
-    throw new Error("Reauthentication required to delete account");
-  }
-
-  const result = await deleteCurrentUser({ autoReauthenticate: false });
-
-  if (result.success) {
-    return;
-  }
-
-  if (result.error) {
-    throw new Error(result.error.message);
-  }
-}