@umituz/react-native-firebase 2.6.0 → 2.6.1

package/src/domains/account-deletion/infrastructure/services/account-deletion.service.ts

@@ -1,241 +1,53 @@
 /**
- * Account Deletion Service
+ * Account Deletion Service (Refactored)
  * Handles Firebase account deletion with reauthentication support
+ *
+ * This file now delegates to the new DDD architecture:
+ * - AccountDeletionExecutor for deletion logic
+ * - UserValidationService for validation
+ * - AccountDeletionRepository for persistence
+ *
+ * Max lines: 150 (enforced for maintainability)
  */
 
-import { deleteUser, type User } from "firebase/auth";
-import { getFirebaseAuth } from "../../../auth/infrastructure/config/FirebaseAuthClient";
-import { markUserDeleted } from "../../../auth/infrastructure/services/user-document.service";
-import {
-  getUserAuthProvider,
-  reauthenticateWithApple,
-  reauthenticateWithPassword,
-  reauthenticateWithGoogle,
-} from "./reauthentication.service";
-import { successResult, type Result, toErrorInfo } from "../../../../shared/domain/utils";
+import type { User } from "firebase/auth";
 import type { AccountDeletionOptions } from "../../application/ports/reauthentication.types";
-import { validateUserUnchanged } from "../../../auth/domain/utils/user-validation.util";
-
-export interface AccountDeletionResult extends Result<void> {
-  requiresReauth?: boolean;
-}
-
-// Operation lock to prevent concurrent deletion attempts
-let deletionInProgress = false;
+import { accountDeletionExecutor } from "./AccountDeletionExecutor";
+import type { AccountDeletionResult } from "./AccountDeletionExecutor";
 
+/**
+ * Delete current user account
+ * Handles reauthentication automatically if enabled
+ *
+ * @param options - Deletion options including reauthentication settings
+ * @returns Result of deletion operation
+ */
 export async function deleteCurrentUser(
   options: AccountDeletionOptions = { autoReauthenticate: true }
 ): Promise<AccountDeletionResult> {
-  if (deletionInProgress) {
-    return {
-      success: false,
-      error: { code: "auth/operation-in-progress", message: "Account deletion already in progress" },
-      requiresReauth: false
-    };
-  }
-
-  deletionInProgress = true;
-
-  try {
-    const auth = getFirebaseAuth();
-    const user = auth?.currentUser;
-
-    if (!auth || !user) {
-      return {
-        success: false,
-        error: { code: "auth/not-ready", message: "Auth not ready" },
-        requiresReauth: false
-      };
-    }
-
-    const originalUserId = user.uid;
-
-    if (user.isAnonymous) {
-      return {
-        success: false,
-        error: { code: "auth/anonymous", message: "Cannot delete anonymous" },
-        requiresReauth: false
-      };
-    }
-
-    const provider = getUserAuthProvider(user);
-
-    if (provider === "password" && options.autoReauthenticate && options.onPasswordRequired) {
-      const reauth = await attemptReauth(user, options, originalUserId);
-      if (reauth) {
-        return reauth;
-      }
-    }
-
-    try {
-      const validation = validateUserUnchanged(auth, originalUserId);
-      if (!('valid' in validation)) {
-        return {
-          success: false,
-          error: validation.error,
-          requiresReauth: false
-        };
-      }
-
-      const marked = await markUserDeleted(user.uid);
-      if (!marked && __DEV__) {
-        console.warn('[AccountDeletion] Failed to mark user document as deleted before account removal');
-      }
-      await deleteUser(user);
-      return successResult();
-    } catch (error: unknown) {
-      const errorInfo = toErrorInfo(error, 'auth/failed');
-      const code = errorInfo.code;
-      const message = errorInfo.message;
-
-      const hasCredentials = !!(options.password || options.googleIdToken);
-      const shouldReauth = options.autoReauthenticate === true || hasCredentials;
-
-      if (code === "auth/requires-recent-login" && shouldReauth) {
-        const reauth = await attemptReauth(user, options, originalUserId);
-        if (reauth) return reauth;
-      }
-
-      return {
-        success: false,
-        error: { code, message },
-        requiresReauth: code === "auth/requires-recent-login"
-      };
-    }
-  } finally {
-    deletionInProgress = false;
-  }
-}
-
-async function attemptReauth(user: User, options: AccountDeletionOptions, originalUserId?: string): Promise<AccountDeletionResult | null> {
-  if (originalUserId) {
-    const authInstance = getFirebaseAuth();
-    const validation = validateUserUnchanged(authInstance, originalUserId);
-    if (!('valid' in validation)) {
-      return {
-        success: false,
-        error: validation.error,
-        requiresReauth: false
-      };
-    }
-  }
-
-  const provider = getUserAuthProvider(user);
-
-  let res: { success: boolean; error?: { code?: string; message?: string } };
-
-  if (provider === "apple.com") {
-    res = await reauthenticateWithApple(user);
-  } else if (provider === "google.com") {
-    let googleToken = options.googleIdToken;
-    if (!googleToken && options.onGoogleReauthRequired) {
-      const token = await options.onGoogleReauthRequired();
-      if (!token) {
-        return {
-          success: false,
-          error: { code: "auth/google-reauth-cancelled", message: "Google reauth cancelled" },
-          requiresReauth: true
-        };
-      }
-      googleToken = token;
-    }
-    if (!googleToken) {
-      return {
-        success: false,
-        error: { code: "auth/google-reauth", message: "Google reauth required" },
-        requiresReauth: true
-      };
-    }
-    res = await reauthenticateWithGoogle(user, googleToken);
-  } else if (provider === "password") {
-    let password = options.password;
-    if (!password && options.onPasswordRequired) {
-      const pwd = await options.onPasswordRequired();
-      if (!pwd) {
-        return {
-          success: false,
-          error: { code: "auth/password-reauth-cancelled", message: "Password reauth cancelled" },
-          requiresReauth: true
-        };
-      }
-      password = pwd;
-    }
-    if (!password) {
-      return {
-        success: false,
-        error: { code: "auth/password-reauth", message: "Password required" },
-        requiresReauth: true
-      };
-    }
-    res = await reauthenticateWithPassword(user, password);
-  } else {
-    return null;
-  }
-
-  if (res.success) {
-    try {
-      const postReauthAuth = getFirebaseAuth();
-      const currentUser = postReauthAuth?.currentUser || user;
-
-      if (originalUserId) {
-        const validationCheck = validateUserUnchanged(postReauthAuth, originalUserId);
-        if (!('valid' in validationCheck)) {
-          return {
-            success: false,
-            error: validationCheck.error,
-            requiresReauth: false
-          };
-        }
-      }
-
-      const marked = await markUserDeleted(currentUser.uid);
-      if (!marked && __DEV__) {
-        console.warn('[AccountDeletion] Failed to mark user document as deleted before account removal (reauth path)');
-      }
-      await deleteUser(currentUser);
-      return successResult();
-    } catch (err: unknown) {
-      const errorInfo = toErrorInfo(err, 'auth/failed');
-      return {
-        success: false,
-        error: { code: errorInfo.code, message: errorInfo.message },
-        requiresReauth: false
-      };
-    }
-  }
-
-  return {
-    success: false,
-    error: {
-      code: res.error?.code || "auth/reauth-failed",
-      message: res.error?.message || "Reauth failed",
-    },
-    requiresReauth: true
-  };
+  return accountDeletionExecutor.deleteCurrentUser(options);
 }
 
+/**
+ * Delete specific user account
+ * Direct deletion without reauthentication
+ *
+ * @param user - User to delete
+ * @returns Result of deletion operation
+ */
 export async function deleteUserAccount(user: User | null): Promise<AccountDeletionResult> {
-  if (!user || user.isAnonymous) {
-    return {
-      success: false,
-      error: { code: "auth/invalid", message: "Invalid user" },
-      requiresReauth: false
-    };
-  }
+  return accountDeletionExecutor.deleteUserAccount(user);
+}
 
-  try {
-    const marked = await markUserDeleted(user.uid);
-    if (!marked && __DEV__) {
-      console.warn('[AccountDeletion] Failed to mark user document as deleted (deleteUserAccount)');
-    }
-    await deleteUser(user);
-    return successResult();
-  } catch (error: unknown) {
-    const errorInfo = toErrorInfo(error, 'auth/failed');
-    return {
-      success: false,
-      error: { code: errorInfo.code, message: errorInfo.message },
-      requiresReauth: errorInfo.code === "auth/requires-recent-login"
-    };
-  }
+/**
+ * Check if deletion is in progress
+ * Useful for preventing concurrent deletion attempts
+ *
+ * @returns True if deletion is currently in progress
+ */
+export function isDeletionInProgress(): boolean {
+  return accountDeletionExecutor.isDeletionInProgress();
 }
+
+// Re-export types for backward compatibility
+export type { AccountDeletionResult };

package/src/domains/auth/domain.ts

@@ -0,0 +1,16 @@
+/**
+ * Firebase Auth Domain Layer
+ * Domain-Driven Design (DDD) - Domain Exports
+ *
+ * Pure domain logic without infrastructure concerns.
+ * Exports domain entities, value objects, and domain services.
+ */
+
+// Domain Value Objects
+export type { FirebaseAuthConfig } from './domain/value-objects/FirebaseAuthConfig';
+
+// Domain Entities
+export {
+  isAnonymousUser,
+} from './domain/entities/AnonymousUser';
+export type { AnonymousUser } from './domain/entities/AnonymousUser';

package/src/domains/auth/index.ts

@@ -1,165 +1,24 @@
 /**
  * Firebase Auth Module
  * Domain-Driven Design (DDD) Architecture
+ *
+ * Exports organized by DDD layers for better maintainability.
+ * Main re-exports everything for backward compatibility.
  */
 
 // =============================================================================
 // DOMAIN LAYER - Business Logic
 // =============================================================================
-
-export type { FirebaseAuthConfig } from './domain/value-objects/FirebaseAuthConfig';
-
-// Anonymous User Entity
-export {
-  isAnonymousUser,
-} from './domain/entities/AnonymousUser';
-export type { AnonymousUser } from './domain/entities/AnonymousUser';
+export * from './domain';
 
 // =============================================================================
 // INFRASTRUCTURE LAYER - Implementation
 // =============================================================================
-
-export {
-  getFirebaseAuth,
-  isFirebaseAuthInitialized,
-  getFirebaseAuthInitializationError,
-  resetFirebaseAuthClient,
-  firebaseAuthClient,
-  initializeFirebaseAuth,
-} from './infrastructure/config/FirebaseAuthClient';
-
-export type {
-  Auth,
-} from './infrastructure/config/FirebaseAuthClient';
-
-// Auth Utilities
-export {
-  checkAuthState,
-  isAuthenticated,
-  isAnonymous,
-  getCurrentUserId,
-  getCurrentUser,
-  getCurrentUserIdFromGlobal,
-  getCurrentUserFromGlobal,
-  isCurrentUserAuthenticated,
-  isCurrentUserAnonymous,
-  verifyUserId,
-  isValidUser,
-} from './infrastructure/services/auth-utils.service';
-
-export type {
-  AuthCheckResult,
-} from './infrastructure/services/auth-utils.service';
-
-// Anonymous Auth Service
-export {
-  AnonymousAuthService,
-  anonymousAuthService,
-} from './infrastructure/services/anonymous-auth.service';
-
-export type {
-  AnonymousAuthResult,
-  AnonymousAuthServiceInterface,
-} from './infrastructure/services/anonymous-auth.service';
-
-// Firestore Utilities
-export {
-  shouldSkipFirestoreQuery,
-  createFirestoreQueryOptions,
-} from './infrastructure/services/firestore-utils.service';
-
-export type {
-  FirestoreQueryOptions,
-  FirestoreQueryResult,
-  FirestoreQuerySkipReason,
-} from './infrastructure/services/firestore-utils.service';
-
+export * from './infrastructure';
 
 // =============================================================================
-// INFRASTRUCTURE LAYER - Social Auth Services
+// PRESENTATION LAYER - React Hooks
 // =============================================================================
-
-export {
-  GoogleAuthService,
-  googleAuthService,
-} from './infrastructure/services/google-auth.service';
-export type {
-  GoogleAuthConfig,
-  GoogleAuthResult,
-} from './infrastructure/services/google-auth.types';
-
-export {
-  GoogleOAuthService,
-  googleOAuthService,
-} from './infrastructure/services/google-oauth.service';
-export type {
-  GoogleOAuthConfig,
-} from './infrastructure/services/google-oauth.service';
-
-export {
-  AppleAuthService,
-  appleAuthService,
-} from './infrastructure/services/apple-auth.service';
-export type { AppleAuthResult } from './infrastructure/services/apple-auth.types';
-
-// =============================================================================
-// PRESENTATION LAYER - Hooks
-// =============================================================================
-
-export { useFirebaseAuth } from './presentation/hooks/useFirebaseAuth';
-export type { UseFirebaseAuthResult } from './presentation/hooks/useFirebaseAuth';
-
-export { useAnonymousAuth } from './presentation/hooks/useAnonymousAuth';
-export type { UseAnonymousAuthResult } from './presentation/hooks/useAnonymousAuth';
-
-export { useSocialAuth } from './presentation/hooks/useSocialAuth';
-export type {
-  SocialAuthConfig,
-  SocialAuthResult,
-  UseSocialAuthResult,
-} from './presentation/hooks/useSocialAuth';
-
-export { useGoogleOAuth } from './presentation/hooks/useGoogleOAuth';
-export type {
-  UseGoogleOAuthResult,
-} from './presentation/hooks/useGoogleOAuth';
-
-// Password Management
-export {
-  updateUserPassword,
-} from './infrastructure/services/password.service';
-
-// Email/Password Authentication
-export {
-  signInWithEmail,
-  signUpWithEmail,
-  signOut,
-  linkAnonymousWithEmail,
-} from './infrastructure/services/email-auth.service';
-export type {
-  EmailCredentials,
-  EmailAuthResult,
-} from './infrastructure/services/email-auth.service';
-
-// Auth Listener
-export {
-  setupAuthListener,
-} from './infrastructure/services/auth-listener.service';
-export type {
-  AuthListenerConfig,
-  AuthListenerResult,
-} from './infrastructure/services/auth-listener.service';
-
-// User Document Service
-export {
-  ensureUserDocument,
-  markUserDeleted,
-  configureUserDocumentService,
-} from './infrastructure/services/user-document.service';
-export type {
-  UserDocumentUser,
-  UserDocumentConfig,
-  UserDocumentExtras,
-} from './infrastructure/services/user-document.types';
+export * from './presentation';
 
 

package/src/domains/auth/infrastructure.ts

@@ -0,0 +1,156 @@
+/**
+ * Firebase Auth Infrastructure Layer
+ * Domain-Driven Design (DDD) - Infrastructure Exports
+ *
+ * Infrastructure implementation including:
+ * - Firebase Auth client configuration
+ * - Auth utilities and services
+ * - Social auth providers
+ * - Email/password authentication
+ * - User document management
+ */
+
+// =============================================================================
+// Firebase Auth Client
+// =============================================================================
+
+export {
+  getFirebaseAuth,
+  isFirebaseAuthInitialized,
+  getFirebaseAuthInitializationError,
+  resetFirebaseAuthClient,
+  firebaseAuthClient,
+  initializeFirebaseAuth,
+} from './infrastructure/config/FirebaseAuthClient';
+
+export type {
+  Auth,
+} from './infrastructure/config/FirebaseAuthClient';
+
+// =============================================================================
+// Auth Utilities
+// =============================================================================
+
+export {
+  checkAuthState,
+  isAuthenticated,
+  isAnonymous,
+  getCurrentUserId,
+  getCurrentUser,
+  getCurrentUserIdFromGlobal,
+  getCurrentUserFromGlobal,
+  isCurrentUserAuthenticated,
+  isCurrentUserAnonymous,
+  verifyUserId,
+  isValidUser,
+} from './infrastructure/services/auth-utils.service';
+
+export type {
+  AuthCheckResult,
+} from './infrastructure/services/auth-utils.service';
+
+// =============================================================================
+// Anonymous Auth Service
+// =============================================================================
+
+export {
+  AnonymousAuthService,
+  anonymousAuthService,
+} from './infrastructure/services/anonymous-auth.service';
+
+export type {
+  AnonymousAuthResult,
+  AnonymousAuthServiceInterface,
+} from './infrastructure/services/anonymous-auth.service';
+
+// =============================================================================
+// Firestore Utilities
+// =============================================================================
+
+export {
+  shouldSkipFirestoreQuery,
+  createFirestoreQueryOptions,
+} from './infrastructure/services/firestore-utils.service';
+
+export type {
+  FirestoreQueryOptions,
+  FirestoreQueryResult,
+  FirestoreQuerySkipReason,
+} from './infrastructure/services/firestore-utils.service';
+
+// =============================================================================
+// Social Auth Services
+// =============================================================================
+
+export {
+  GoogleAuthService,
+  googleAuthService,
+} from './infrastructure/services/google-auth.service';
+export type {
+  GoogleAuthConfig,
+  GoogleAuthResult,
+} from './infrastructure/services/google-auth.types';
+
+export {
+  GoogleOAuthService,
+  googleOAuthService,
+} from './infrastructure/services/google-oauth.service';
+export type {
+  GoogleOAuthConfig,
+} from './infrastructure/services/google-oauth.service';
+
+export {
+  AppleAuthService,
+  appleAuthService,
+} from './infrastructure/services/apple-auth.service';
+export type { AppleAuthResult } from './infrastructure/services/apple-auth.types';
+
+// =============================================================================
+// Email/Password Authentication
+// =============================================================================
+
+export {
+  signInWithEmail,
+  signUpWithEmail,
+  signOut,
+  linkAnonymousWithEmail,
+} from './infrastructure/services/email-auth.service';
+export type {
+  EmailCredentials,
+  EmailAuthResult,
+} from './infrastructure/services/email-auth.service';
+
+// =============================================================================
+// Password Management
+// =============================================================================
+
+export {
+  updateUserPassword,
+} from './infrastructure/services/password.service';
+
+// =============================================================================
+// Auth Listener
+// =============================================================================
+
+export {
+  setupAuthListener,
+} from './infrastructure/services/auth-listener.service';
+export type {
+  AuthListenerConfig,
+  AuthListenerResult,
+} from './infrastructure/services/auth-listener.service';
+
+// =============================================================================
+// User Document Service
+// =============================================================================
+
+export {
+  ensureUserDocument,
+  markUserDeleted,
+  configureUserDocumentService,
+} from './infrastructure/services/user-document.service';
+export type {
+  UserDocumentUser,
+  UserDocumentConfig,
+  UserDocumentExtras,
+} from './infrastructure/services/user-document.types';