@umituz/react-native-firebase 2.6.4 → 2.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-firebase",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "Unified Firebase package for React Native apps - Auth and Firestore services using Firebase JS SDK (no native modules).",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/domains/auth/infrastructure/config/FirebaseAuthClient.ts

@@ -5,8 +5,8 @@
  */
 
 import type { Auth } from 'firebase/auth';
+import { getAuth as getFirebaseAuthFromFirebase } from 'firebase/auth';
 import { getFirebaseApp } from '../../../../shared/infrastructure/config/services/FirebaseInitializationService';
-import { FirebaseAuthInitializer } from './initializers/FirebaseAuthInitializer';
 import type { FirebaseAuthConfig } from '../../domain/value-objects/FirebaseAuthConfig';
 import { ServiceClientSingleton } from '../../../../shared/infrastructure/config/base/ServiceClientSingleton';
 
@@ -15,76 +15,64 @@ import { ServiceClientSingleton } from '../../../../shared/infrastructure/config
  */
 class FirebaseAuthClientSingleton extends ServiceClientSingleton<Auth, FirebaseAuthConfig> {
   private constructor() {
-    super({
-      serviceName: 'FirebaseAuth',
-      initializer: (config?: FirebaseAuthConfig) => {
-        const app = getFirebaseApp();
-        if (!app) {
-          this.setError('Firebase App is not initialized');
-          return null;
-        }
-        const auth = FirebaseAuthInitializer.initialize(app, config);
-        if (!auth) {
-          this.setError('Auth initialization returned null');
-        }
-        return auth;
-      },
-    });
+    super();
   }
 
-  private static instance: FirebaseAuthClientSingleton | null = null;
-
-  static getInstance(): FirebaseAuthClientSingleton {
-    if (!this.instance) this.instance = new FirebaseAuthClientSingleton();
-    return this.instance;
-  }
+  initialize(): Auth {
+    try {
+      const app = getFirebaseApp();
+      if (!app) {
+        this.setError('Firebase App is not initialized');
+        throw new Error('Firebase App is not initialized');
+      }
 
-  /**
-   * Initialize Auth with optional configuration
-   */
-  override initialize(config?: FirebaseAuthConfig): Auth | null {
-    return super.initialize(config);
+      const auth = getFirebaseAuthFromFirebase(app);
+      this.instance = auth;
+      return auth;
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : 'Auth initialization failed';
+      this.setError(errorMessage);
+      throw error;
+    }
   }
 
-  /**
-   * Get Auth instance
-   */
-  getAuth(): Auth | null {
-    // Attempt initialization if not already initialized
-    if (!this.isInitialized() && !this.getInitializationError()) {
-      try {
-        const app = getFirebaseApp();
-        if (app) {
-          this.initialize();
-        }
-      } catch (error) {
-        // Silently handle auto-initialization errors
-        // The error will be stored in state for later retrieval
-        const errorMessage = error instanceof Error ? error.message : 'Auto-initialization failed';
-        this.setError(errorMessage);
-      }
+  getAuth(): Auth {
+    if (!this.isInitialized()) {
+      return this.initialize();
     }
-    // Enable auto-initialization flag when getting instance
-    return this.getInstance(true);
+    return this.getInstance();
   }
-}
 
-function getFirebaseAuthClientSafe(): FirebaseAuthClientSingleton | null {
-  try {
-    return FirebaseAuthClientSingleton.getInstance();
-  } catch {
-    if (__DEV__) {
-      console.warn('[Firebase] Could not create FirebaseAuth client singleton.');
+  private static instance: FirebaseAuthClientSingleton | null = null;
+
+  static getInstance(): FirebaseAuthClientSingleton {
+    if (!this.instance) {
+      this.instance = new FirebaseAuthClientSingleton();
     }
-    return null;
+    return this.instance;
   }
 }
 
-export const firebaseAuthClient = getFirebaseAuthClientSafe();
-export const initializeFirebaseAuth = (c?: FirebaseAuthConfig) => firebaseAuthClient?.initialize(c) ?? null;
-export const getFirebaseAuth = () => firebaseAuthClient?.getAuth() ?? null;
-export const isFirebaseAuthInitialized = () => firebaseAuthClient?.isInitialized() ?? false;
-export const getFirebaseAuthInitializationError = () => firebaseAuthClient?.getInitializationError() ?? null;
-export const resetFirebaseAuthClient = () => firebaseAuthClient?.reset();
+const firebaseAuthClientSingleton = FirebaseAuthClientSingleton.getInstance();
+
+export const initializeFirebaseAuth = (): Auth => {
+  return firebaseAuthClientSingleton.initialize();
+};
+
+export const getFirebaseAuth = (): Auth => {
+  return firebaseAuthClientSingleton.getAuth();
+};
+
+export const isFirebaseAuthInitialized = (): boolean => {
+  return firebaseAuthClientSingleton.isInitialized();
+};
+
+export const getFirebaseAuthInitializationError = (): Error | null => {
+  return firebaseAuthClientSingleton.getInitializationError();
+};
+
+export const resetFirebaseAuthClient = (): void => {
+  firebaseAuthClientSingleton.reset();
+};
 
 export type { Auth } from 'firebase/auth';

package/src/domains/auth/infrastructure/config/index.ts

@@ -0,0 +1,2 @@
+export * from './FirebaseAuthClient';
+export * from './initializers';

package/src/domains/auth/infrastructure/config/initializers/index.ts

@@ -0,0 +1 @@
+export * from './FirebaseAuthInitializer';

package/src/domains/auth/infrastructure/services/index.ts

@@ -0,0 +1,16 @@
+export * from './anonymous-auth.service';
+export * from './apple-auth.service';
+export * from './apple-auth.types';
+export * from './auth-listener.service';
+export * from './auth-utils.service';
+export * from './email-auth.service';
+export * from './google-auth.service';
+export * from './google-auth.types';
+export * from './google-oauth.service';
+export * from './password.service';
+export * from './user-document-builder.util';
+export * from './user-document.service';
+export * from './user-document.types';
+export * from './crypto.util';
+export * from './firestore-utils.service';
+export * from './utils';

package/src/domains/auth/infrastructure/services/utils/index.ts

@@ -0,0 +1 @@
+export * from './auth-result-converter.util';

package/src/domains/auth/infrastructure/stores/index.ts

@@ -0,0 +1 @@
+export * from './auth.store';

package/src/domains/auth/infrastructure/utils/index.ts

@@ -0,0 +1 @@
+export * from './auth-guard.util';

package/src/domains/auth/presentation/hooks/useGoogleOAuth.ts

@@ -2,20 +2,13 @@
  * useGoogleOAuth Hook
  * Handles Google OAuth flow using expo-auth-session and Firebase auth
  *
- * This hook delegates business logic to GoogleOAuthHookService.
- * Focuses only on React state management and side effects.
- *
  * Max lines: 150 (enforced for maintainability)
  */
 
-import { useState, useCallback, useEffect, useMemo } from 'react';
+import { useState, useCallback } from 'react';
 import { getFirebaseAuth } from '../../infrastructure/config/FirebaseAuthClient';
 import type { GoogleOAuthConfig } from '../../infrastructure/services/google-oauth.service';
-import {
-  GoogleOAuthHookService,
-  createGoogleOAuthHookService,
-  isExpoAuthSessionAvailable,
-} from './GoogleOAuthHookService';
+import { GoogleOAuthService } from '../../infrastructure/services/google-oauth.service';
 
 export interface UseGoogleOAuthResult {
   signInWithGoogle: () => Promise<SocialAuthResult>;
@@ -33,68 +26,41 @@ interface SocialAuthResult {
 
 /**
  * Hook for Google OAuth authentication
- * Requires expo-auth-session and expo-web-browser to be installed
  */
 export function useGoogleOAuth(config?: GoogleOAuthConfig): UseGoogleOAuthResult {
   const [isLoading, setIsLoading] = useState(false);
   const [googleError, setGoogleError] = useState<string | null>(null);
 
-  // Initialize service with config
-  const service = useMemo(() => createGoogleOAuthHookService(config), [config]);
-
-  // Update service when config changes
-  useEffect(() => {
-    service.updateConfig(config);
-  }, [service, config]);
-
-  // Memoize service checks
-  const googleAvailable = useMemo(() => service.isAvailable(), [service]);
-  const googleConfigured = useMemo(() => service.isConfigured(), [service]);
-
-  // Get auth request tuple from service
-  const [, response] = service.getAuthRequest();
-
-  // Handle OAuth response
-  useEffect(() => {
-    if (!googleAvailable || !response) return;
-
-    const handleResponse = async () => {
-      setIsLoading(true);
-      setGoogleError(null);
-
-      try {
-        const auth = getFirebaseAuth();
-        await service.handleResponse(response, auth);
-      } catch (error) {
-        setGoogleError(service.getErrorMessage(error));
-      } finally {
-        setIsLoading(false);
-      }
-    };
+  const service = new GoogleOAuthService();
 
-    handleResponse().catch((err) => {
-      if (__DEV__) {
-        console.error('[useGoogleOAuth] Unexpected error in handleResponse:', err);
-      }
-    });
-  }, [response, googleAvailable, service]);
+  const googleAvailable = service.isAvailable();
+  const googleConfigured = service.isConfigured(config);
 
-  // Sign in with Google
   const signInWithGoogle = useCallback(async (): Promise<SocialAuthResult> => {
     setIsLoading(true);
     setGoogleError(null);
 
     try {
       const auth = getFirebaseAuth();
-      return await service.signIn(auth);
+      const result = await service.signInWithOAuth(auth, config);
+
+      if (!result.success) {
+        setGoogleError(result.error || 'Google sign-in failed');
+        return { success: false, error: result.error };
+      }
+
+      return {
+        success: true,
+        isNewUser: result.isNewUser,
+      };
     } catch (error) {
-      const errorMessage = service.getErrorMessage(error);
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
       setGoogleError(errorMessage);
       return { success: false, error: errorMessage };
     } finally {
       setIsLoading(false);
     }
-  }, [service]);
+  }, [service, config]);
 
   return {
     signInWithGoogle,
@@ -104,10 +70,3 @@ export function useGoogleOAuth(config?: GoogleOAuthConfig): UseGoogleOAuthResult
     googleError,
   };
 }
-
-/**
- * Check if expo-auth-session is available
- * Useful for conditional rendering
- */
-export { isExpoAuthSessionAvailable };
-

package/src/domains/firestore/index.ts

@@ -20,7 +20,6 @@ export {
   isFirestoreInitialized,
   getFirestoreInitializationError,
   resetFirestoreClient,
-  firestoreClient,
 } from './infrastructure/config/FirestoreClient';
 export type { Firestore } from './infrastructure/config/FirestoreClient';
 

package/src/domains/firestore/infrastructure/config/FirestoreClient.ts

@@ -3,14 +3,11 @@
  *
  * Domain-Driven Design: Infrastructure implementation of Firestore client
  * Singleton pattern for managing Firestore instance
- *
- * IMPORTANT: This package requires Firebase App to be initialized first.
- * Use @umituz/react-native-firebase to initialize Firebase App.
  */
 
 import type { Firestore } from 'firebase/firestore';
+import { getFirestore as getFirestoreFromFirebase } from 'firebase/firestore';
 import { getFirebaseApp } from '../../../../shared/infrastructure/config/services/FirebaseInitializationService';
-import { FirebaseFirestoreInitializer } from './initializers/FirebaseFirestoreInitializer';
 import { ServiceClientSingleton } from '../../../../shared/infrastructure/config/base/ServiceClientSingleton';
 
 /**
@@ -19,79 +16,64 @@ import { ServiceClientSingleton } from '../../../../shared/infrastructure/config
  */
 class FirestoreClientSingleton extends ServiceClientSingleton<Firestore> {
   private constructor() {
-    super({
-      serviceName: 'Firestore',
-      initializer: () => {
-        const app = getFirebaseApp();
-        if (!app) {
-          this.setError('Firebase App is not initialized');
-          return null;
-        }
-        return FirebaseFirestoreInitializer.initialize(app);
-      },
-      autoInitializer: () => {
-        const app = getFirebaseApp();
-        if (!app) return null;
-        return FirebaseFirestoreInitializer.initialize(app);
-      },
-    });
+    super();
   }
 
-  private static instance: FirestoreClientSingleton | null = null;
+  initialize(): Firestore {
+    try {
+      const app = getFirebaseApp();
+      if (!app) {
+        this.setError('Firebase App is not initialized');
+        throw new Error('Firebase App is not initialized');
+      }
 
-  static getInstance(): FirestoreClientSingleton {
-    if (!this.instance) {
-      this.instance = new FirestoreClientSingleton();
+      const firestore = getFirestoreFromFirebase(app);
+      this.instance = firestore;
+      return firestore;
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : 'Firestore initialization failed';
+      this.setError(errorMessage);
+      throw error;
     }
-    return this.instance;
   }
 
-  /**
-   * Initialize Firestore
-   */
-  override initialize(): Firestore | null {
-    return super.initialize();
+  getFirestore(): Firestore {
+    if (!this.isInitialized()) {
+      return this.initialize();
+    }
+    return this.getInstance();
   }
 
-  /**
-   * Get Firestore instance with auto-initialization
-   */
-  getFirestore(): Firestore | null {
-    return this.getInstance(true);
-  }
-}
+  private static instance: FirestoreClientSingleton | null = null;
 
-function getFirestoreClientSafe(): FirestoreClientSingleton | null {
-  try {
-    return FirestoreClientSingleton.getInstance();
-  } catch (error) {
-    if (__DEV__) {
-      console.error('[Firestore] Could not create Firestore client singleton:', error);
+  static getInstance(): FirestoreClientSingleton {
+    if (!this.instance) {
+      this.instance = new FirestoreClientSingleton();
     }
-    return null;
+    return this.instance;
   }
 }
 
-export const firestoreClient = getFirestoreClientSafe();
+const firestoreClientSingleton = FirestoreClientSingleton.getInstance();
 
-export function initializeFirestore(): Firestore | null {
-  return firestoreClient?.initialize() ?? null;
-}
+export const initializeFirestore = (): Firestore => {
+  return firestoreClientSingleton.initialize();
+};
 
-export function getFirestore(): Firestore | null {
-  return firestoreClient?.getFirestore() ?? null;
-}
+export const getFirestore = (): Firestore => {
+  return firestoreClientSingleton.getFirestore();
+};
 
-export function isFirestoreInitialized(): boolean {
-  return firestoreClient?.isInitialized() ?? false;
-}
+export const isFirestoreInitialized = (): boolean => {
+  return firestoreClientSingleton.isInitialized();
+};
 
-export function getFirestoreInitializationError(): string | null {
-  return firestoreClient?.getInitializationError() ?? null;
-}
+export const getFirestoreInitializationError = (): Error | null => {
+  return firestoreClientSingleton.getInitializationError();
+};
 
-export function resetFirestoreClient(): void {
-  firestoreClient?.reset();
-}
+export const resetFirestoreClient = (): void => {
+  firestoreClientSingleton.reset();
+};
 
 export type { Firestore } from 'firebase/firestore';

package/src/shared/infrastructure/base/ErrorHandler.ts

@@ -0,0 +1,81 @@
+/**
+ * Error Handler
+ * Centralized error handling for services
+ *
+ * Max lines: 150 (enforced for maintainability)
+ */
+
+import type { Result } from '../../domain/utils';
+
+export interface ErrorHandlerOptions {
+  readonly serviceName?: string;
+  readonly defaultErrorCode?: string;
+}
+
+export interface ErrorInfo {
+  readonly code: string;
+  readonly message: string;
+}
+
+export class ErrorHandler {
+  readonly serviceName: string;
+  readonly defaultErrorCode: string;
+
+  constructor(options: ErrorHandlerOptions = {}) {
+    this.serviceName = options.serviceName || 'Service';
+    this.defaultErrorCode = options.defaultErrorCode || 'ERROR';
+  }
+
+  async handleAsync<T>(
+    operation: () => Promise<T>,
+    errorCode?: string
+  ): Promise<Result<T>> {
+    try {
+      const result = await operation();
+      return {
+        success: true,
+        data: result,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: this.toErrorInfo(error, errorCode),
+      };
+    }
+  }
+
+  handle<T>(operation: () => T, errorCode?: string): Result<T> {
+    try {
+      const result = operation();
+      return {
+        success: true,
+        data: result,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: this.toErrorInfo(error, errorCode),
+      };
+    }
+  }
+
+  toErrorInfo(error: unknown, code?: string): ErrorInfo {
+    if (error instanceof Error) {
+      return {
+        code: code || this.defaultErrorCode,
+        message: error.message,
+      };
+    }
+
+    return {
+      code: code || this.defaultErrorCode,
+      message: String(error),
+    };
+  }
+
+  getUserMessage(error: ErrorInfo): string {
+    return error.message;
+  }
+}
+
+export const defaultErrorHandler = new ErrorHandler();

package/src/shared/infrastructure/base/ServiceBase.ts

@@ -0,0 +1,62 @@
+/**
+ * Service Base
+ * Base class for all services with common functionality
+ *
+ * Max lines: 150 (enforced for maintainability)
+ */
+
+import type { Result } from '../../domain/utils';
+
+export interface ServiceBaseOptions {
+  readonly serviceName?: string;
+}
+
+export class ServiceBase {
+  readonly serviceName: string;
+
+  constructor(options: ServiceBaseOptions = {}) {
+    this.serviceName = options.serviceName || 'Service';
+  }
+
+  protected async execute<T>(
+    operation: () => Promise<T>,
+    errorCode?: string
+  ): Promise<Result<T>> {
+    try {
+      const result = await operation();
+      return {
+        success: true,
+        data: result,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: {
+          code: errorCode || `${this.serviceName}_ERROR`,
+          message: error instanceof Error ? error.message : 'Unknown error',
+        },
+      };
+    }
+  }
+
+  protected executeSync<T>(
+    operation: () => T,
+    errorCode?: string
+  ): Result<T> {
+    try {
+      const result = operation();
+      return {
+        success: true,
+        data: result,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: {
+          code: errorCode || `${this.serviceName}_ERROR`,
+          message: error instanceof Error ? error.message : 'Unknown error',
+        },
+      };
+    }
+  }
+}

package/src/shared/infrastructure/config/base/ServiceClientSingleton.ts

@@ -5,12 +5,13 @@
  * Max lines: 150 (enforced for maintainability)
  */
 
-export abstract class ServiceClientSingleton<TInstance> {
+export abstract class ServiceClientSingleton<TInstance, TConfig = unknown> {
   protected instance: TInstance | null = null;
+  protected initializationError: Error | null = null;
 
   protected constructor() {}
 
-  abstract initialize(): Promise<TInstance>;
+  abstract initialize(config?: TConfig): Promise<TInstance> | TInstance;
 
   getInstance(): TInstance {
     if (!this.instance) {
@@ -23,7 +24,16 @@ export abstract class ServiceClientSingleton<TInstance> {
     return this.instance !== null;
   }
 
+  getInitializationError(): Error | null {
+    return this.initializationError;
+  }
+
+  setError(message: string): void {
+    this.initializationError = new Error(message);
+  }
+
   reset(): void {
     this.instance = null;
+    this.initializationError = null;
   }
 }