@umituz/react-native-auth 3.6.61 → 3.6.63

package/src/presentation/hooks/useGoogleAuth.ts

@@ -29,21 +29,33 @@ export interface UseGoogleAuthResult {
   signInWithGoogle: () => Promise<SocialAuthResult>;
   googleLoading: boolean;
   googleConfigured: boolean;
+  googleError: string | null;
 }
 
 const PLACEHOLDER_CLIENT_ID = "000000000000-placeholder.apps.googleusercontent.com";
 
+/**
+ * Validate Google auth config
+ */
+function validateGoogleConfig(config?: GoogleAuthConfig): boolean {
+  if (!config) return false;
+
+  const hasValidClientId =
+    !!(config.iosClientId && config.iosClientId !== PLACEHOLDER_CLIENT_ID) ||
+    !!(config.webClientId && config.webClientId !== PLACEHOLDER_CLIENT_ID) ||
+    !!(config.androidClientId && config.androidClientId !== PLACEHOLDER_CLIENT_ID);
+
+  return hasValidClientId;
+}
+
 /**
  * Hook for Google authentication with expo-auth-session
  */
 export function useGoogleAuth(config?: GoogleAuthConfig): UseGoogleAuthResult {
   const [isLoading, setIsLoading] = useState(false);
+  const [googleError, setGoogleError] = useState<string | null>(null);
 
-  const googleConfigured = !!(
-    config?.iosClientId ||
-    config?.webClientId ||
-    config?.androidClientId
-  );
+  const googleConfigured = validateGoogleConfig(config);
 
   const socialAuthConfig: SocialAuthConfig = {
     google: config,
@@ -70,8 +82,11 @@ export function useGoogleAuth(config?: GoogleAuthConfig): UseGoogleAuthResult {
       const idToken = googleResponse.authentication?.idToken;
       if (idToken) {
         setIsLoading(true);
+        setGoogleError(null);
         signInWithGoogleToken(idToken)
           .catch((error) => {
+            const errorMessage = error instanceof Error ? error.message : "Firebase sign-in failed";
+            setGoogleError(errorMessage);
             if (__DEV__) {
               console.error("[useGoogleAuth] Firebase sign-in failed:", error);
             }
@@ -80,23 +95,33 @@ export function useGoogleAuth(config?: GoogleAuthConfig): UseGoogleAuthResult {
             setIsLoading(false);
           });
       }
+    } else if (googleResponse?.type === "error") {
+      setGoogleError("Google authentication failed");
+      setIsLoading(false);
     }
   }, [googleResponse, signInWithGoogleToken]);
 
   const signInWithGoogle = useCallback(async (): Promise<SocialAuthResult> => {
     if (!promptGoogleAsync) {
-      return { success: false, error: "expo-auth-session is not available" };
+      const error = "expo-auth-session is not available";
+      setGoogleError(error);
+      return { success: false, error };
     }
 
     if (!googleConfigured) {
-      return { success: false, error: "Google Sign-In is not configured" };
+      const error = "Google Sign-In is not configured. Please provide valid client IDs.";
+      setGoogleError(error);
+      return { success: false, error };
     }
 
     if (!request) {
-      return { success: false, error: "Google Sign-In not ready" };
+      const error = "Google Sign-In not ready";
+      setGoogleError(error);
+      return { success: false, error };
     }
 
     setIsLoading(true);
+    setGoogleError(null);
     try {
       const result = await promptGoogleAsync();
 
@@ -108,14 +133,20 @@ export function useGoogleAuth(config?: GoogleAuthConfig): UseGoogleAuthResult {
       }
 
       if (result.type === "cancel") {
-        return { success: false, error: "Google Sign-In was cancelled" };
+        const error = "Google Sign-In was cancelled";
+        setGoogleError(error);
+        return { success: false, error };
       }
 
-      return { success: false, error: "Google Sign-In failed" };
+      const error = "Google Sign-In failed";
+      setGoogleError(error);
+      return { success: false, error };
     } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Google sign-in failed";
+      setGoogleError(errorMessage);
       return {
         success: false,
-        error: error instanceof Error ? error.message : "Google sign-in failed",
+        error: errorMessage,
       };
     } finally {
       setIsLoading(false);
@@ -126,5 +157,6 @@ export function useGoogleAuth(config?: GoogleAuthConfig): UseGoogleAuthResult {
     signInWithGoogle,
     googleLoading: isLoading || firebaseLoading,
     googleConfigured,
+    googleError,
   };
 }

package/src/presentation/stores/auth.selectors.ts

@@ -71,34 +71,40 @@ export const selectShowAuthModal = (state: { showAuthModal: (callback?: () => vo
 
 /**
  * Get current user ID
+ * Uses firebaseUser as single source of truth
  */
 export const selectUserId = (state: AuthStore): string | null => {
-  return state.firebaseUser?.uid ?? state.user?.uid ?? null;
+  return state.firebaseUser?.uid ?? null;
 };
 
 /**
- * Check if user is authenticated (not anonymous)
+ * Check if user is authenticated (has a valid Firebase user, not anonymous)
+ * Uses firebaseUser as single source of truth
  */
 export const selectIsAuthenticated = (state: AuthStore): boolean => {
-  return !!state.user && !state.isAnonymous && !state.user.isAnonymous;
+  const hasFirebaseUser = !!state.firebaseUser;
+  const isNotAnonymous = !state.firebaseUser?.isAnonymous;
+  return hasFirebaseUser && isNotAnonymous;
 };
 
 /**
  * Check if user is anonymous
+ * Uses firebaseUser as single source of truth
  */
 export const selectIsAnonymous = (state: AuthStore): boolean => {
-  return state.firebaseUser?.isAnonymous ?? state.user?.isAnonymous ?? false;
+  return state.firebaseUser?.isAnonymous ?? false;
 };
 
 /**
  * Get current user type
+ * Derived from firebaseUser state
  */
 export const selectUserType = (state: AuthStore): UserType => {
-  if (!state.firebaseUser && !state.user) {
+  if (!state.firebaseUser) {
     return "none";
   }
 
-  return selectIsAnonymous(state) ? "anonymous" : "authenticated";
+  return state.firebaseUser.isAnonymous ? "anonymous" : "authenticated";
 };
 
 /**

package/src/presentation/stores/authStore.ts

@@ -71,17 +71,14 @@ export const useAuthStore = createStore<AuthState, AuthActions>({
     },
 
     setIsAnonymous: (isAnonymous) => {
-      const { user } = get();
+      const { firebaseUser } = get();
       if (__DEV__) {
-        console.log("[AuthStore] setIsAnonymous:", { isAnonymous, hadUser: !!user });
-      }
-      // Update user.isAnonymous flag to match the new state
-      // This handles both anonymous → registered and registered → anonymous conversions
-      if (user && user.isAnonymous !== isAnonymous) {
-        set({ isAnonymous, user: { ...user, isAnonymous } });
-      } else {
-        set({ isAnonymous });
+        console.log("[AuthStore] setIsAnonymous:", { isAnonymous, hasFirebaseUser: !!firebaseUser });
       }
+      // Only update the isAnonymous flag
+      // The user object will be updated by setFirebaseUser when needed
+      // This prevents inconsistencies between firebaseUser and user
+      set({ isAnonymous });
     },
 
     setError: (error) => {

package/src/presentation/stores/initializeAuthListener.ts

@@ -20,6 +20,8 @@ const ANONYMOUS_SIGNIN_TIMEOUT_MS = 10000;
 let listenerInitialized = false;
 let listenerRefCount = 0;
 let firebaseUnsubscribe: (() => void) | null = null;
+let anonymousSignInInProgress = false; // Prevent race conditions
+let initializationInProgress = false; // Prevent duplicate initialization
 
 /**
  * Initialize Firebase auth listener
@@ -34,9 +36,20 @@ export function initializeAuthListener(
     console.log("[AuthListener] initializeAuthListener called:", {
       autoAnonymousSignIn,
       alreadyInitialized: listenerInitialized,
+      initializationInProgress,
     });
   }
 
+  // Prevent duplicate initialization - return existing unsubscribe if already initializing
+  if (initializationInProgress) {
+    if (__DEV__) {
+      console.warn("[AuthListener] Initialization already in progress, returning existing unsubscribe");
+    }
+    return () => {
+      // No-op - will be handled by the initial initialization
+    };
+  }
+
   // If already initialized, increment ref count and return unsubscribe that decrements
   if (listenerInitialized) {
     listenerRefCount++;
@@ -58,10 +71,14 @@ export function initializeAuthListener(
         firebaseUnsubscribe = null;
         listenerInitialized = false;
         listenerRefCount = 0;
+        anonymousSignInInProgress = false;
       }
     };
   }
 
+  // Mark initialization as in progress
+  initializationInProgress = true;
+
   const auth = getFirebaseAuth();
   const store = useAuthStore.getState();
 
@@ -69,6 +86,7 @@ export function initializeAuthListener(
     if (__DEV__) {
       console.log("[AuthListener] No Firebase auth, marking initialized");
     }
+    initializationInProgress = false;
     store.setLoading(false);
     store.setInitialized(true);
     return () => {};
@@ -103,21 +121,31 @@ export function initializeAuthListener(
     }
 
     if (!user && autoAnonymousSignIn) {
+      // Prevent race condition: only one anonymous sign-in at a time
+      if (anonymousSignInInProgress) {
+        if (__DEV__) {
+          console.log("[AuthListener] Anonymous sign-in already in progress, skipping");
+        }
+        store.setFirebaseUser(null);
+        return;
+      }
+
       if (__DEV__) {
         console.log("[AuthListener] No user, auto signing in anonymously...");
       }
       // Set loading state while attempting sign-in
       store.setLoading(true);
+      anonymousSignInInProgress = true;
 
-      // Start anonymous sign-in process
-      // Don't return early - let the listener continue to handle state changes
+      // Start anonymous sign-in without blocking the listener
+      // The listener will be triggered again when sign-in completes
       void (async () => {
-        // Add timeout protection
-        const timeoutPromise = new Promise((_, reject) =>
-          setTimeout(() => reject(new Error("Anonymous sign-in timeout")), ANONYMOUS_SIGNIN_TIMEOUT_MS)
-        );
-
         try {
+          // Add timeout protection
+          const timeoutPromise = new Promise((_, reject) =>
+            setTimeout(() => reject(new Error("Anonymous sign-in timeout")), ANONYMOUS_SIGNIN_TIMEOUT_MS)
+          );
+
           // Race between sign-in and timeout
           await Promise.race([
             (async () => {
@@ -156,6 +184,8 @@ export function initializeAuthListener(
           store.setLoading(false);
           store.setInitialized(true);
           store.setError("Failed to sign in anonymously. Please check your connection.");
+        } finally {
+          anonymousSignInInProgress = false;
         }
       })();
 
@@ -163,6 +193,7 @@ export function initializeAuthListener(
       // The listener will be triggered again when sign-in succeeds
       // For now, set null user and let loading state indicate in-progress
       store.setFirebaseUser(null);
+      initializationInProgress = false;
       return;
     }
 
@@ -179,6 +210,8 @@ export function initializeAuthListener(
     onAuthStateChange?.(user);
   });
 
+  initializationInProgress = false;
+
   return () => {
     listenerRefCount--;
     if (__DEV__) {
@@ -193,6 +226,8 @@ export function initializeAuthListener(
       firebaseUnsubscribe = null;
       listenerInitialized = false;
       listenerRefCount = 0;
+      anonymousSignInInProgress = false;
+      initializationInProgress = false;
     }
   };
 }
@@ -207,6 +242,8 @@ export function resetAuthListener(): void {
   }
   listenerInitialized = false;
   listenerRefCount = 0;
+  anonymousSignInInProgress = false;
+  initializationInProgress = false;
 }
 
 /**

package/src/application/ports/IAuthService.ts

@@ -1,60 +0,0 @@
-/**
- * Auth Service Interface
- * Port for authentication operations (provider-agnostic)
- */
-
-import type { AuthUser } from "../../domain/entities/AuthUser";
-
-export interface SignUpParams {
-  email: string;
-  password: string;
-  displayName?: string;
-}
-
-export interface SignInParams {
-  email: string;
-  password: string;
-}
-
-export interface IAuthService {
-  /**
-   * Sign up a new user
-   */
-  signUp(params: SignUpParams): Promise<AuthUser>;
-
-  /**
-   * Sign in an existing user
-   */
-  signIn(params: SignInParams): Promise<AuthUser>;
-
-  /**
-   * Sign out current user
-   */
-  signOut(): Promise<void>;
-
-  /**
-   * Set anonymous mode (no authentication)
-   */
-  setAnonymousMode(): Promise<void>;
-
-  /**
-   * Check if currently in anonymous mode
-   */
-  getIsAnonymousMode(): boolean;
-
-  /**
-   * Get current authenticated user
-   */
-  getCurrentUser(): AuthUser | null;
-
-  /**
-   * Subscribe to auth state changes
-   */
-  onAuthStateChange(callback: (user: AuthUser | null) => void): () => void;
-
-  /**
-   * Check if auth is initialized
-   */
-  isInitialized(): boolean;
-}
-

package/src/domain/utils/migration.ts

@@ -1,44 +0,0 @@
-/**
- * User Data Migration Utilities
- * Handles migrating data when anonymous user converts to authenticated user
- */
-
-export interface MigrationConfig {
-  onMigrationStart?: (anonymousId: string, authId: string) => void;
-  onMigrationComplete?: (anonymousId: string, authId: string) => void;
-  onMigrationError?: (error: Error) => void;
-}
-
-let migrationConfig: MigrationConfig = {};
-
-export const configureMigration = (config: MigrationConfig): void => {
-  migrationConfig = config;
-};
-
-export const migrateUserData = (
-  anonymousId: string,
-  authId: string
-): void => {
-  if (__DEV__) {
-    console.log(`[Migration] Starting migration from ${anonymousId} to ${authId}`);
-  }
-
-  try {
-    migrationConfig.onMigrationStart?.(anonymousId, authId);
-
-    // App-specific migration logic handled via callbacks
-    // This keeps the package generic and flexible
-
-    migrationConfig.onMigrationComplete?.(anonymousId, authId);
-
-    if (__DEV__) {
-      console.log(`[Migration] Successfully migrated data for ${authId}`);
-    }
-  } catch (error) {
-    if (__DEV__) {
-      console.error(`[Migration] Failed to migrate user data:`, error);
-    }
-    migrationConfig.onMigrationError?.(error as Error);
-    // Silent fail - don't block auth flow
-  }
-};

package/src/infrastructure/adapters/UIProviderAdapter.ts

@@ -1,43 +0,0 @@
-/**
- * UI Provider Adapter
- * Adapts external UI implementations to our IUIProvider interface
- */
-
-import type { DesignTokens } from "@umituz/react-native-design-system";
-import type { IUIProvider } from "../types/UI.types";
-
-export class UIProviderAdapter implements IUIProvider {
-  private theme: DesignTokens | null = null;
-  private localization: Record<string, unknown> | null = null;
-
-  constructor(theme?: DesignTokens, localization?: Record<string, unknown>) {
-    this.theme = theme || null;
-    this.localization = localization || null;
-  }
-
-  getTheme(): DesignTokens | null {
-    return this.theme;
-  }
-
-  getLocalization(): Record<string, unknown> | null {
-    return this.localization;
-  }
-
-  updateTheme(theme: DesignTokens): void {
-    this.theme = theme;
-  }
-
-  updateLocalization(localization: Record<string, unknown>): void {
-    this.localization = localization;
-  }
-}
-
-/**
- * Create UI provider from theme and localization implementations
- */
-export function createUIProvider(
-  theme?: DesignTokens,
-  localization?: Record<string, unknown>
-): IUIProvider {
-  return new UIProviderAdapter(theme, localization);
-}

package/src/infrastructure/services/UserDocument.types.ts

@@ -1,60 +0,0 @@
-/**
- * User Document Types and Configuration
- */
-
-/**
- * Minimal user interface for document creation
- * Compatible with both Firebase User and AuthUser
- */
-export interface UserDocumentUser {
-  uid: string;
-  displayName?: string | null;
-  email?: string | null;
-  photoURL?: string | null;
-  isAnonymous?: boolean;
-}
-
-/**
- * Configuration for user document service
- */
-export interface UserDocumentConfig {
-  /** Firestore collection name (default: "users") */
-  collectionName?: string;
-  /** Additional fields to store with user document */
-  extraFields?: Record<string, unknown>;
-  /** Callback to collect device/app info */
-  collectExtras?: () => Promise<UserDocumentExtras>;
-}
-
-/**
- * User document extras from device/app
- */
-export interface UserDocumentExtras {
-  [key: string]: string | number | boolean | null | undefined;
-  deviceId?: string;
-  persistentDeviceId?: string;
-  nativeDeviceId?: string;
-  platform?: string;
-  deviceModel?: string;
-  deviceBrand?: string;
-  deviceName?: string;
-  deviceType?: number | string;
-  deviceYearClass?: number | string;
-  isDevice?: boolean;
-  osName?: string;
-  osVersion?: string;
-  osBuildId?: string;
-  totalMemory?: number | string;
-  appVersion?: string;
-  buildNumber?: string;
-  locale?: string;
-  region?: string;
-  timezone?: string;
-  screenWidth?: number;
-  screenHeight?: number;
-  screenScale?: number;
-  fontScale?: number;
-  isLandscape?: boolean;
-  previousAnonymousUserId?: string;
-  signUpMethod?: string;
-}

package/src/infrastructure/services/UserDocumentService.ts

@@ -1,86 +0,0 @@
-/**
- * User Document Service
- * Generic service for creating/updating user documents in Firestore
- */
-
-import { doc, getDoc, setDoc, serverTimestamp } from "firebase/firestore";
-import type { User } from "firebase/auth";
-import { getFirestore } from "@umituz/react-native-firebase";
-import type {
-  UserDocumentUser,
-  UserDocumentConfig,
-  UserDocumentExtras,
-} from "./UserDocument.types";
-import {
-  getSignUpMethod,
-  buildBaseData,
-  buildCreateData,
-  buildUpdateData,
-} from "../utils/userDocumentBuilder.util";
-
-export type {
-  UserDocumentUser,
-  UserDocumentConfig,
-  UserDocumentExtras,
-} from "./UserDocument.types";
-
-let userDocumentConfig: UserDocumentConfig = {};
-
-export function configureUserDocumentService(config: UserDocumentConfig): void {
-  userDocumentConfig = { ...config };
-}
-
-export async function ensureUserDocument(
-  user: UserDocumentUser | User,
-  extras?: UserDocumentExtras,
-): Promise<boolean> {
-  const db = getFirestore();
-  if (!db || !user.uid || user.uid.trim().length === 0) return false;
-
-  try {
-    let allExtras = extras || {};
-    if (userDocumentConfig.collectExtras) {
-      const collectedExtras = await userDocumentConfig.collectExtras();
-      allExtras = { ...collectedExtras, ...allExtras };
-    }
-
-    if (!allExtras.signUpMethod) allExtras.signUpMethod = getSignUpMethod(user);
-
-    const collectionName = userDocumentConfig.collectionName || "users";
-    const userRef = doc(db, collectionName, user.uid);
-    const userDoc = await getDoc(userRef);
-    const baseData = buildBaseData(user, allExtras);
-
-    const docData = !userDoc.exists()
-      ? buildCreateData(baseData, userDocumentConfig.extraFields, allExtras)
-      : buildUpdateData(baseData, allExtras);
-
-    await setDoc(userRef, docData, { merge: true });
-    return true;
-  } catch (error) {
-    if (__DEV__) {
-      console.error("[UserDocumentService] Failed:", error);
-    }
-    return false;
-  }
-}
-
-export async function markUserDeleted(userId: string): Promise<boolean> {
-  const db = getFirestore();
-  if (!db || !userId) return false;
-
-  try {
-    const userRef = doc(db, userDocumentConfig.collectionName || "users", userId);
-    await setDoc(userRef, {
-      isDeleted: true,
-      deletedAt: serverTimestamp(),
-      updatedAt: serverTimestamp(),
-    }, { merge: true });
-    return true;
-  } catch (error) {
-    if (__DEV__) {
-      console.error("[UserDocumentService] markUserDeleted failed:", error);
-    }
-    return false;
-  }
-}

package/src/infrastructure/services/app-service-helpers.ts

@@ -1,35 +0,0 @@
-/**
- * App Service Helpers
- * Creates ready-to-use auth service for configureAppServices
- */
-
-import { useAuthStore } from "../../presentation/stores/authStore";
-import { selectIsAuthenticated, selectUserId } from "../../presentation/stores/auth.selectors";
-import { useAuthModalStore } from "../../presentation/stores/authModalStore";
-
-export interface IAppAuthServiceHelper {
-  getUserId: () => string | null;
-  isAuthenticated: () => boolean;
-  requireAuth: () => string;
-}
-
-/**
- * Creates an auth service implementation for configureAppServices
- */
-export function createAuthService(): IAppAuthServiceHelper {
-  return {
-    getUserId: () => selectUserId(useAuthStore.getState()),
-    isAuthenticated: () => selectIsAuthenticated(useAuthStore.getState()),
-    requireAuth: () => {
-      if (!selectIsAuthenticated(useAuthStore.getState())) {
-        useAuthModalStore.getState().showAuthModal();
-        throw new Error("Auth required");
-      }
-      const userId = selectUserId(useAuthStore.getState());
-      if (!userId) {
-        throw new Error("User ID missing");
-      }
-      return userId;
-    },
-  };
-}

package/src/infrastructure/types/UI.types.ts

@@ -1,11 +0,0 @@
-/**
- * UI Provider Interface
- * Generic interface for theme and localization providers
- */
-
-import type { DesignTokens } from "@umituz/react-native-design-system";
-
-export interface IUIProvider {
-  getTheme(): DesignTokens | null;
-  getLocalization(): Record<string, unknown> | null;
-}

package/src/infrastructure/utils/auth-tracker.util.ts

@@ -1,23 +0,0 @@
-/**
- * Simple tracker for auth operations
- */
-
-export const authTracker = {
-    logOperationStarted: (operation: string, data?: Record<string, unknown>) => {
-        if (__DEV__) {
-            console.log(`[Auth] ${operation} started`, data);
-        }
-    },
-
-    logOperationSuccess: (operation: string, data?: Record<string, unknown>) => {
-        if (__DEV__) {
-            console.log(`[Auth] ${operation} successful`, data);
-        }
-    },
-
-    logOperationError: (operation: string, error: unknown, metadata?: Record<string, unknown>) => {
-        if (__DEV__) {
-            console.error(`[Auth] ${operation} failed`, { error, ...metadata });
-        }
-    }
-};