@umituz/react-native-firebase 1.13.55 → 1.13.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-firebase",
-  "version": "1.13.55",
+  "version": "1.13.57",
   "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/auth/infrastructure/services/firestore-utils.service.ts

@@ -9,27 +9,9 @@ import { checkAuthState, verifyUserId } from "./auth-utils.service";
 declare const __DEV__: boolean;
 
 export interface FirestoreQueryOptions {
-  /**
-   * Skip query if user is anonymous/guest
-   * Default: true (guest users don't have Firestore data)
-   */
   readonly skipForGuest?: boolean;
-
-  /**
-   * Skip query if user is not authenticated
-   * Default: true
-   */
   readonly skipIfNotAuthenticated?: boolean;
-
-  /**
-   * Verify userId matches current user
-   * Default: true
-   */
   readonly verifyUserId?: boolean;
-
-  /**
-   * User ID to verify (required if verifyUserId is true)
-   */
   readonly userId?: string;
 }
 
@@ -48,9 +30,25 @@ export interface FirestoreQueryResult {
   readonly isAuthenticated: boolean;
 }
 
+/**
+ * Create query result helper
+ */
+function createResult(
+  shouldSkip: boolean,
+  authState: ReturnType<typeof checkAuthState>,
+  reason?: FirestoreQuerySkipReason
+): FirestoreQueryResult {
+  return {
+    shouldSkip,
+    reason,
+    userId: authState.userId,
+    isAnonymous: authState.isAnonymous,
+    isAuthenticated: authState.isAuthenticated,
+  };
+}
+
 /**
  * Check if Firestore query should be skipped
- * Centralized logic for all Firestore operations
  */
 export function shouldSkipFirestoreQuery(
   auth: Auth | null,
@@ -64,79 +62,30 @@ export function shouldSkipFirestoreQuery(
   } = options;
 
   try {
-    // No auth available
     if (!auth) {
-      return {
-        shouldSkip: true,
-        reason: "no_auth",
-        userId: null,
-        isAnonymous: false,
-        isAuthenticated: false,
-      };
+      return createResult(true, checkAuthState(null), "no_auth");
     }
 
-    // Check auth state
     const authState = checkAuthState(auth);
 
-    // Not authenticated
-    if (!authState.isAuthenticated) {
-      if (skipIfNotAuthenticated) {
-        return {
-          shouldSkip: true,
-          reason: "not_authenticated",
-          userId: null,
-          isAnonymous: false,
-          isAuthenticated: false,
-        };
-      }
+    if (!authState.isAuthenticated && skipIfNotAuthenticated) {
+      return createResult(true, authState, "not_authenticated");
     }
 
-    // Anonymous user
-    if (authState.isAnonymous) {
-      if (skipForGuest) {
-        return {
-          shouldSkip: true,
-          reason: "is_guest",
-          userId: authState.userId,
-          isAnonymous: true,
-          isAuthenticated: false,
-        };
-      }
+    if (authState.isAnonymous && skipForGuest) {
+      return createResult(true, authState, "is_guest");
     }
 
-    // Verify userId if provided
-    if (shouldVerify && userId) {
-      if (!verifyUserId(auth, userId)) {
-        return {
-          shouldSkip: true,
-          reason: "user_id_mismatch",
-          userId: authState.userId,
-          isAnonymous: authState.isAnonymous,
-          isAuthenticated: authState.isAuthenticated,
-        };
-      }
+    if (shouldVerify && userId && !verifyUserId(auth, userId)) {
+      return createResult(true, authState, "user_id_mismatch");
     }
 
-    // Don't skip
-    return {
-      shouldSkip: false,
-      userId: authState.userId,
-      isAnonymous: authState.isAnonymous,
-      isAuthenticated: authState.isAuthenticated,
-    };
+    return createResult(false, authState);
   } catch (error) {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      // eslint-disable-next-line no-console
-      console.error("[FirestoreUtils] Error checking if query should be skipped", error);
+    if (__DEV__) {
+      console.error("[FirestoreUtils] Error checking query", error);
     }
-
-    return {
-      shouldSkip: true,
-      reason: "invalid_options",
-      userId: null,
-      isAnonymous: false,
-      isAuthenticated: false,
-    };
+    return createResult(true, checkAuthState(null), "invalid_options");
   }
 }
 

package/src/auth/presentation/hooks/useSocialAuth.ts

@@ -1,9 +1,6 @@
 /**
  * useSocialAuth Hook
  * Provides Google and Apple Sign-In functionality
- *
- * Note: This hook handles the Firebase authentication part.
- * The OAuth flow (expo-auth-session for Google) should be set up in the consuming app.
  */
 
 import { useState, useCallback, useEffect } from "react";
@@ -14,54 +11,45 @@ import {
 } from "../../infrastructure/services/google-auth.service";
 import { appleAuthService } from "../../infrastructure/services/apple-auth.service";
 
-/**
- * Social auth configuration
- */
 export interface SocialAuthConfig {
   google?: GoogleAuthConfig;
   apple?: { enabled: boolean };
 }
 
-/**
- * Social auth result
- */
 export interface SocialAuthResult {
   success: boolean;
   isNewUser?: boolean;
   error?: string;
 }
 
-/**
- * Hook result
- */
 export interface UseSocialAuthResult {
-  /** Sign in with Google using ID token (call after OAuth flow) */
   signInWithGoogleToken: (idToken: string) => Promise<SocialAuthResult>;
-  /** Sign in with Apple (handles full flow) */
   signInWithApple: () => Promise<SocialAuthResult>;
-  /** Whether Google is loading */
   googleLoading: boolean;
-  /** Whether Apple is loading */
   appleLoading: boolean;
-  /** Whether Google is configured */
   googleConfigured: boolean;
-  /** Whether Apple is available */
   appleAvailable: boolean;
 }
 
 /**
- * Hook for social authentication
- *
- * Usage:
- * 1. For Google: Set up expo-auth-session in your app, get idToken, then call signInWithGoogleToken
- * 2. For Apple: Just call signInWithApple (handles complete flow)
+ * Common sign-in wrapper
  */
+async function signInWrapper(
+  signInFn: () => Promise<{ success: boolean; isNewUser?: boolean; error?: string }>
+): Promise<SocialAuthResult> {
+  const auth = getFirebaseAuth();
+  if (!auth) {
+    return { success: false, error: "Firebase Auth not initialized" };
+  }
+
+  return signInFn();
+}
+
 export function useSocialAuth(config?: SocialAuthConfig): UseSocialAuthResult {
   const [googleLoading, setGoogleLoading] = useState(false);
   const [appleLoading, setAppleLoading] = useState(false);
   const [appleAvailable, setAppleAvailable] = useState(false);
 
-  // Configure Google Auth
   const googleConfig = config?.google;
   const googleConfigured = !!(
     googleConfig?.webClientId ||
@@ -69,14 +57,12 @@ export function useSocialAuth(config?: SocialAuthConfig): UseSocialAuthResult {
     googleConfig?.androidClientId
   );
 
-  // Configure Google service on mount
   useEffect(() => {
     if (googleConfig) {
       googleAuthService.configure(googleConfig);
     }
   }, [googleConfig]);
 
-  // Check Apple availability on mount
   useEffect(() => {
     const checkApple = async () => {
       const available = await appleAuthService.isAvailable();
@@ -85,7 +71,6 @@ export function useSocialAuth(config?: SocialAuthConfig): UseSocialAuthResult {
     checkApple();
   }, [config?.apple?.enabled]);
 
-  // Sign in with Google using ID token
   const signInWithGoogleToken = useCallback(
     async (idToken: string): Promise<SocialAuthResult> => {
       if (!googleConfigured) {
@@ -94,21 +79,9 @@ export function useSocialAuth(config?: SocialAuthConfig): UseSocialAuthResult {
 
       setGoogleLoading(true);
       try {
-        const auth = getFirebaseAuth();
-        if (!auth) {
-          return { success: false, error: "Firebase Auth not initialized" };
-        }
-
-        const signInResult = await googleAuthService.signInWithIdToken(
-          auth,
-          idToken,
+        return await signInWrapper(() =>
+          googleAuthService.signInWithIdToken(getFirebaseAuth()!, idToken)
         );
-
-        return {
-          success: signInResult.success,
-          isNewUser: signInResult.isNewUser,
-          error: signInResult.error,
-        };
       } catch (error) {
         return {
           success: false,
@@ -118,10 +91,9 @@ export function useSocialAuth(config?: SocialAuthConfig): UseSocialAuthResult {
         setGoogleLoading(false);
       }
     },
-    [googleConfigured],
+    [googleConfigured]
   );
 
-  // Sign in with Apple
   const signInWithApple = useCallback(async (): Promise<SocialAuthResult> => {
     if (!appleAvailable) {
       return { success: false, error: "Apple Sign-In is not available" };
@@ -129,18 +101,9 @@ export function useSocialAuth(config?: SocialAuthConfig): UseSocialAuthResult {
 
     setAppleLoading(true);
     try {
-      const auth = getFirebaseAuth();
-      if (!auth) {
-        return { success: false, error: "Firebase Auth not initialized" };
-      }
-
-      const result = await appleAuthService.signIn(auth);
-
-      return {
-        success: result.success,
-        isNewUser: result.isNewUser,
-        error: result.error,
-      };
+      return await signInWrapper(() =>
+        appleAuthService.signIn(getFirebaseAuth()!)
+      );
     } catch (error) {
       return {
         success: false,

package/src/firestore/index.ts

@@ -3,20 +3,14 @@
  * Domain-Driven Design (DDD) Architecture
  */
 
-// =============================================================================
-// DOMAIN LAYER - Errors
-// =============================================================================
-
+// Domain Errors
 export {
   FirebaseFirestoreError,
   FirebaseFirestoreInitializationError,
   FirebaseFirestoreQuotaError,
 } from './domain/errors/FirebaseFirestoreError';
 
-// =============================================================================
-// INFRASTRUCTURE LAYER - Firestore Client
-// =============================================================================
-
+// Firestore Client
 export {
   initializeFirestore,
   getFirestore,
@@ -25,21 +19,14 @@ export {
   resetFirestoreClient,
   firestoreClient,
 } from './infrastructure/config/FirestoreClient';
-
 export type { Firestore } from './infrastructure/config/FirestoreClient';
 
-// =============================================================================
-// INFRASTRUCTURE LAYER - BaseRepository
-// =============================================================================
-
+// Repositories
 export { BaseRepository } from './infrastructure/repositories/BaseRepository';
 export { BaseQueryRepository } from './infrastructure/repositories/BaseQueryRepository';
 export { BasePaginatedRepository } from './infrastructure/repositories/BasePaginatedRepository';
 
-// =============================================================================
-// UTILS - Date Utilities
-// =============================================================================
-
+// Date Utilities
 export {
   isoToTimestamp,
   timestampToISO,
@@ -47,56 +34,38 @@ export {
   getCurrentISOString,
 } from './utils/dateUtils';
 
-// =============================================================================
-// UTILS - Query Builder
-// =============================================================================
-
+// Query Builder
 export {
   buildQuery,
   createInFilter,
   createEqualFilter,
 } from './utils/query-builder';
-
 export type {
   QueryBuilderOptions,
   FieldFilter,
 } from './utils/query-builder';
 
-// =============================================================================
-// UTILS - Pagination
-// =============================================================================
-
+// Pagination
 export {
   PaginationHelper,
   createPaginationHelper,
 } from './utils/pagination.helper';
-
 export type {
   PaginatedResult,
   PaginationParams,
 } from './types/pagination.types';
-
 export { EMPTY_PAGINATED_RESULT } from './types/pagination.types';
 
-// =============================================================================
-// UTILS - Document Mapper
-// =============================================================================
-
+// Document Mapper
 export {
   DocumentMapperHelper,
   createDocumentMapper,
 } from './utils/document-mapper.helper';
 
-// =============================================================================
-// UTILS - Path Resolver
-// =============================================================================
-
+// Path Resolver
 export { FirestorePathResolver } from './utils/path-resolver';
 
-// =============================================================================
-// DOMAIN LAYER - Constants
-// =============================================================================
-
+// Domain Constants
 export {
   FREE_TIER_LIMITS,
   QUOTA_THRESHOLDS,
@@ -105,60 +74,43 @@ export {
   getRemainingQuota,
 } from './domain/constants/QuotaLimits';
 
-// =============================================================================
-// DOMAIN LAYER - Entities
-// =============================================================================
-
+// Domain Entities
 export type {
   QuotaMetrics,
   QuotaLimits,
   QuotaStatus,
 } from './domain/entities/QuotaMetrics';
-
 export type {
   RequestLog,
   RequestStats,
   RequestType,
 } from './domain/entities/RequestLog';
 
-// =============================================================================
-// DOMAIN LAYER - Services
-// =============================================================================
-
+// Domain Services
 export { QuotaCalculator } from './domain/services/QuotaCalculator';
 
-// =============================================================================
-// UTILS - Quota Error Detection
-// =============================================================================
-
+// Quota Error Detection
 export {
   isQuotaError,
   isRetryableError,
   getQuotaErrorMessage,
 } from './utils/quota-error-detector.util';
 
-// =============================================================================
-// INFRASTRUCTURE LAYER - Middleware
-// =============================================================================
-
+// Middleware
 export {
   QueryDeduplicationMiddleware,
   queryDeduplicationMiddleware,
 } from './infrastructure/middleware/QueryDeduplicationMiddleware';
-
 export {
   QuotaTrackingMiddleware,
   quotaTrackingMiddleware,
 } from './infrastructure/middleware/QuotaTrackingMiddleware';
 
-// =============================================================================
-// INFRASTRUCTURE LAYER - Services
-// =============================================================================
-
+// Services
 export {
   RequestLoggerService,
   requestLoggerService,
 } from './infrastructure/services/RequestLoggerService';
 
-// Re-export Firestore types for convenience
+// Re-export Firestore types
 export type { Timestamp } from 'firebase/firestore';

package/src/infrastructure/config/FirebaseConfigLoader.ts

@@ -4,168 +4,81 @@
  * Automatically loads Firebase configuration from:
  * 1. expo-constants (Constants.expoConfig?.extra)
  * 2. Environment variables (process.env)
- *
- * This allows zero-configuration Firebase initialization.
  */
 
 import type { FirebaseConfig } from '../../domain/value-objects/FirebaseConfig';
 
-/**
- * Configuration source interface
- */
-interface ConfigSource {
-  getApiKey(): string;
-  getAuthDomain(): string;
-  getProjectId(): string;
-  getStorageBucket(): string;
-  getMessagingSenderId(): string;
-  getAppId(): string;
-}
+type ConfigKey = 'apiKey' | 'authDomain' | 'projectId' | 'storageBucket' | 'messagingSenderId' | 'appId';
+
+const EXPO_PREFIX = 'EXPO_PUBLIC_';
+const ENV_KEYS: Record<ConfigKey, string[]> = {
+  apiKey: ['FIREBASE_API_KEY'],
+  authDomain: ['FIREBASE_AUTH_DOMAIN'],
+  projectId: ['FIREBASE_PROJECT_ID'],
+  storageBucket: ['FIREBASE_STORAGE_BUCKET'],
+  messagingSenderId: ['FIREBASE_MESSAGING_SENDER_ID'],
+  appId: ['FIREBASE_APP_ID'],
+};
 
 /**
- * Expo Constants configuration source
+ * Get environment variable value
  */
-class ExpoConfigSource implements ConfigSource {
-  private extra: any;
-
-  constructor() {
-    let Constants: any;
-    
-    try {
-      Constants = require('expo-constants');
-    } catch {
-      // expo-constants not available
-    }
-
-    const expoConfig = Constants?.expoConfig || Constants?.default?.expoConfig;
-    this.extra = expoConfig?.extra || {};
-  }
-
-  getApiKey(): string {
-    return this.extra?.firebaseApiKey || '';
-  }
-
-  getAuthDomain(): string {
-    return this.extra?.firebaseAuthDomain || '';
-  }
-
-  getProjectId(): string {
-    return this.extra?.firebaseProjectId || '';
-  }
-
-  getStorageBucket(): string {
-    return this.extra?.firebaseStorageBucket || '';
-  }
-
-  getMessagingSenderId(): string {
-    return this.extra?.firebaseMessagingSenderId || '';
-  }
-
-  getAppId(): string {
-    return this.extra?.firebaseAppId || '';
+function getEnvValue(key: ConfigKey): string {
+  const keys = ENV_KEYS[key];
+  for (const envKey of keys) {
+    const value = process.env[`${EXPO_PREFIX}${envKey}`] || process.env[envKey];
+    if (value?.trim()) return value;
   }
+  return '';
 }
 
 /**
- * Environment variables configuration source
+ * Load configuration from expo-constants
  */
-class EnvironmentConfigSource implements ConfigSource {
-  getApiKey(): string {
-    return process.env.EXPO_PUBLIC_FIREBASE_API_KEY || 
-           process.env.FIREBASE_API_KEY || 
-           '';
-  }
-
-  getAuthDomain(): string {
-    return process.env.EXPO_PUBLIC_FIREBASE_AUTH_DOMAIN || 
-           process.env.FIREBASE_AUTH_DOMAIN || 
-           '';
-  }
-
-  getProjectId(): string {
-    return process.env.EXPO_PUBLIC_FIREBASE_PROJECT_ID || 
-           process.env.FIREBASE_PROJECT_ID || 
-           '';
-  }
-
-  getStorageBucket(): string {
-    return process.env.EXPO_PUBLIC_FIREBASE_STORAGE_BUCKET || 
-           process.env.FIREBASE_STORAGE_BUCKET || 
-           '';
-  }
-
-  getMessagingSenderId(): string {
-    return process.env.EXPO_PUBLIC_FIREBASE_MESSAGING_SENDER_ID || 
-           process.env.FIREBASE_MESSAGING_SENDER_ID || 
-           '';
-  }
-
-  getAppId(): string {
-    return process.env.EXPO_PUBLIC_FIREBASE_APP_ID || 
-           process.env.FIREBASE_APP_ID || 
-           '';
+function loadExpoConfig(): Record<string, string> {
+  try {
+    const Constants = require('expo-constants');
+    const expoConfig = Constants?.expoConfig || Constants?.default?.expoConfig;
+    return expoConfig?.extra || {};
+  } catch {
+    return {};
   }
 }
 
 /**
- * Configuration aggregator
+ * Get config value from expo constants
  */
-class ConfigAggregator {
-  private sources: ConfigSource[];
-
-  constructor() {
-    this.sources = [
-      new ExpoConfigSource(),
-      new EnvironmentConfigSource(),
-    ];
-  }
-
-  /**
-   * Get configuration value from first available source
-   */
-  private getValue(getter: (source: ConfigSource) => string): string {
-    for (const source of this.sources) {
-      const value = getter(source);
-      if (value && value.trim() !== '') {
-        return value;
-      }
-    }
-    return '';
-  }
-
-  /**
-   * Build Firebase configuration from all sources
-   */
-  buildConfig(): Partial<FirebaseConfig> {
-    return {
-      apiKey: this.getValue(source => source.getApiKey()),
-      authDomain: this.getValue(source => source.getAuthDomain()),
-      projectId: this.getValue(source => source.getProjectId()),
-      storageBucket: this.getValue(source => source.getStorageBucket()),
-      messagingSenderId: this.getValue(source => source.getMessagingSenderId()),
-      appId: this.getValue(source => source.getAppId()),
-    };
-  }
+function getExpoValue(key: ConfigKey, expoConfig: Record<string, string>): string {
+  const mapping: Record<ConfigKey, string> = {
+    apiKey: 'firebaseApiKey',
+    authDomain: 'firebaseAuthDomain',
+    projectId: 'firebaseProjectId',
+    storageBucket: 'firebaseStorageBucket',
+    messagingSenderId: 'firebaseMessagingSenderId',
+    appId: 'firebaseAppId',
+  };
+  return expoConfig[mapping[key]] || '';
 }
 
 /**
  * Load Firebase configuration from Constants and environment variables
- * Returns null if no valid configuration is found
  */
 export function loadFirebaseConfig(): FirebaseConfig | null {
-  const aggregator = new ConfigAggregator();
-  const config = aggregator.buildConfig();
+  const expoConfig = loadExpoConfig();
+
+  const config: Partial<Record<ConfigKey, string>> = {};
+  const keys: ConfigKey[] = ['apiKey', 'authDomain', 'projectId', 'storageBucket', 'messagingSenderId', 'appId'];
+
+  for (const key of keys) {
+    const expoValue = getExpoValue(key, expoConfig);
+    config[key] = expoValue || getEnvValue(key);
+  }
 
-  // Only return config if required fields are present and not empty
-  if (
-    config.apiKey &&
-    config.projectId &&
-    config.apiKey.trim() !== '' &&
-    config.projectId.trim() !== ''
-  ) {
-    return config as FirebaseConfig;
+  // Validate required fields
+  if (!config.apiKey?.trim() || !config.projectId?.trim()) {
+    return null;
   }
 
-  return null;
+  return config as FirebaseConfig;
 }