@umituz/react-native-auth 3.4.53 → 3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-auth",
-  "version": "3.4.53",
+  "version": "3.5.0",
   "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",
@@ -32,7 +32,6 @@
     "url": "git+https://github.com/umituz/react-native-auth.git"
   },
   "dependencies": {
-    "@umituz/react-native-design-system": "*",
     "@umituz/react-native-firebase": "*",
     "@umituz/react-native-localization": "*"
   },
@@ -62,7 +61,7 @@
     "@types/react": "~19.1.0",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
-    "@umituz/react-native-design-system": "*",
+    "@umituz/react-native-design-system": "^2.8.34",
     "@umituz/react-native-design-system-theme": "*",
     "eslint": "^8.57.0",
     "expo-apple-authentication": "^6.0.0",

package/src/infrastructure/providers/FirebaseAuthProvider.ts

@@ -9,8 +9,12 @@ import {
   signOut as firebaseSignOut,
   onAuthStateChanged,
   updateProfile,
+  EmailAuthProvider,
+  linkWithCredential,
   type Auth,
 } from "firebase/auth";
+
+declare const __DEV__: boolean;
 import type {
   IAuthProvider,
   AuthCredentials,
@@ -72,11 +76,44 @@ export class FirebaseAuthProvider implements IAuthProvider {
     }
 
     try {
-      const userCredential = await createUserWithEmailAndPassword(
-        this.auth,
-        credentials.email.trim(),
-        credentials.password
-      );
+      const currentUser = this.auth.currentUser;
+      const isAnonymous = currentUser?.isAnonymous ?? false;
+
+      let userCredential;
+
+      // Convert anonymous user to permanent account
+      if (currentUser && isAnonymous) {
+        if (__DEV__) {
+          console.log("[FirebaseAuthProvider] Converting anonymous user to authenticated:", {
+            anonymousId: currentUser.uid.slice(0, 8),
+          });
+        }
+
+        const credential = EmailAuthProvider.credential(
+          credentials.email.trim(),
+          credentials.password
+        );
+
+        userCredential = await linkWithCredential(currentUser, credential);
+
+        if (__DEV__) {
+          console.log("[FirebaseAuthProvider] Anonymous user converted successfully:", {
+            userId: userCredential.user.uid.slice(0, 8),
+            sameUser: currentUser.uid === userCredential.user.uid,
+          });
+        }
+      } else {
+        // Create new user
+        if (__DEV__) {
+          console.log("[FirebaseAuthProvider] Creating new user account");
+        }
+
+        userCredential = await createUserWithEmailAndPassword(
+          this.auth,
+          credentials.email.trim(),
+          credentials.password
+        );
+      }
 
       if (credentials.displayName && userCredential.user) {
         try {

package/src/presentation/stores/authStore.ts

@@ -4,10 +4,12 @@
  *
  * Single source of truth for auth state across the app.
  * Firebase auth changes are synced via initializeAuthListener().
+ *
+ * IMPORTANT: user is ALWAYS set when firebaseUser exists (anonymous or not).
+ * The isAnonymous flag indicates the user type, not whether user is null.
  */
 
 import { createStore } from "@umituz/react-native-design-system";
-import type { AuthUser } from "../../domain/entities/AuthUser";
 import { mapToAuthUser } from "../../infrastructure/utils/UserMapper";
 import type { AuthState, AuthActions, UserType } from "../../types/auth-store.types";
 import { initialAuthState } from "../../types/auth-store.types";
@@ -80,48 +82,56 @@ export const useAuthStore = createStore<AuthState, AuthActions>({
   },
   actions: (set, get) => ({
     setFirebaseUser: (firebaseUser) => {
-      const { isAnonymous } = get();
-
-      let user: AuthUser | null = null;
-
-      if (firebaseUser) {
-        if (!firebaseUser.isAnonymous) {
-          user = mapToAuthUser(firebaseUser);
-        } else if (!isAnonymous) {
-          user = mapToAuthUser(firebaseUser);
-        }
+      const prevState = get();
+      const user = firebaseUser ? mapToAuthUser(firebaseUser) : null;
+      const isAnonymous = firebaseUser?.isAnonymous ?? false;
+
+      if (__DEV__) {
+        console.log("[AuthStore] setFirebaseUser:", {
+          uid: firebaseUser?.uid ?? null,
+          isAnonymous,
+          prevIsAnonymous: prevState.isAnonymous,
+          hasUser: !!user,
+        });
       }
 
-      set({
-        firebaseUser,
-        user,
-        loading: false,
-        isAnonymous: firebaseUser?.isAnonymous ?? false,
-      });
+      set({ firebaseUser, user, loading: false, isAnonymous });
     },
 
-    setLoading: (loading) => set({ loading }),
+    setLoading: (loading) => {
+      if (__DEV__) {
+        console.log("[AuthStore] setLoading:", loading);
+      }
+      set({ loading });
+    },
 
     setIsAnonymous: (isAnonymous) => {
-      const { firebaseUser } = get();
-
-      let user: AuthUser | null = null;
-      if (firebaseUser) {
-        if (!firebaseUser.isAnonymous) {
-          user = mapToAuthUser(firebaseUser);
-        } else if (!isAnonymous) {
-          user = mapToAuthUser(firebaseUser);
-        }
+      if (__DEV__) {
+        console.log("[AuthStore] setIsAnonymous:", isAnonymous);
       }
-
-      set({ isAnonymous, user });
+      set({ isAnonymous });
     },
 
-    setError: (error) => set({ error }),
+    setError: (error) => {
+      if (__DEV__ && error) {
+        console.log("[AuthStore] setError:", error);
+      }
+      set({ error });
+    },
 
-    setInitialized: (initialized) => set({ initialized }),
+    setInitialized: (initialized) => {
+      if (__DEV__) {
+        console.log("[AuthStore] setInitialized:", initialized);
+      }
+      set({ initialized });
+    },
 
-    reset: () => set(initialAuthState),
+    reset: () => {
+      if (__DEV__) {
+        console.log("[AuthStore] reset");
+      }
+      set(initialAuthState);
+    },
   }),
 });
 

package/src/presentation/stores/initializeAuthListener.ts

@@ -19,17 +19,23 @@ let listenerInitialized = false;
 /**
  * Initialize Firebase auth listener
  * Call once in app root, returns unsubscribe function
- *
- * @param options - Configuration options
- * @param options.autoAnonymousSignIn - Enable auto anonymous sign-in (default: true)
- * @param options.onAuthStateChange - Callback when auth state changes
  */
 export function initializeAuthListener(
   options: AuthListenerOptions = {}
 ): () => void {
   const { autoAnonymousSignIn = true, onAuthStateChange } = options;
 
+  if (__DEV__) {
+    console.log("[AuthListener] initializeAuthListener called:", {
+      autoAnonymousSignIn,
+      alreadyInitialized: listenerInitialized,
+    });
+  }
+
   if (listenerInitialized) {
+    if (__DEV__) {
+      console.log("[AuthListener] Already initialized, skipping");
+    }
     return () => {};
   }
 
@@ -37,6 +43,9 @@ export function initializeAuthListener(
   const store = useAuthStore.getState();
 
   if (!auth) {
+    if (__DEV__) {
+      console.log("[AuthListener] No Firebase auth, marking initialized");
+    }
     store.setLoading(false);
     store.setInitialized(true);
     return () => {};
@@ -45,6 +54,9 @@ export function initializeAuthListener(
   const service = getAuthService();
   if (service) {
     const isAnonymous = service.getIsAnonymousMode();
+    if (__DEV__) {
+      console.log("[AuthListener] Service isAnonymousMode:", isAnonymous);
+    }
     if (isAnonymous) {
       store.setIsAnonymous(true);
     }
@@ -53,27 +65,28 @@ export function initializeAuthListener(
   listenerInitialized = true;
 
   const unsubscribe = onAuthStateChanged(auth, (user) => {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      // eslint-disable-next-line no-console
-      console.log("[authStore] Auth state changed:", user?.uid ?? "null");
+    if (__DEV__) {
+      console.log("[AuthListener] onAuthStateChanged:", {
+        uid: user?.uid ?? null,
+        isAnonymous: user?.isAnonymous ?? null,
+        email: user?.email ?? null,
+      });
     }
 
-    // Auto sign-in anonymously if no user and autoAnonymousSignIn is enabled
     if (!user && autoAnonymousSignIn) {
+      if (__DEV__) {
+        console.log("[AuthListener] No user, auto signing in anonymously...");
+      }
       void (async () => {
         try {
-          if (typeof __DEV__ !== "undefined" && __DEV__) {
-            // eslint-disable-next-line no-console
-            console.log("[authStore] Auto signing in anonymously...");
-          }
           await anonymousAuthService.signInAnonymously(auth);
-          // The listener will be called again with the new anonymous user
+          if (__DEV__) {
+            console.log("[AuthListener] Anonymous sign-in successful");
+          }
         } catch (error) {
-          if (typeof __DEV__ !== "undefined" && __DEV__) {
-            // eslint-disable-next-line no-console
-            console.warn("[authStore] Auto anonymous sign-in failed:", error);
+          if (__DEV__) {
+            console.warn("[AuthListener] Anonymous sign-in failed:", error);
           }
-          // Continue with null user if anonymous sign-in fails
           store.setFirebaseUser(null);
           store.setInitialized(true);
         }
@@ -85,14 +98,19 @@ export function initializeAuthListener(
     store.setInitialized(true);
 
     if (user && !user.isAnonymous && store.isAnonymous) {
+      if (__DEV__) {
+        console.log("[AuthListener] User converted from anonymous, updating");
+      }
       store.setIsAnonymous(false);
     }
 
-    // Call optional callback
     onAuthStateChange?.(user);
   });
 
   return () => {
+    if (__DEV__) {
+      console.log("[AuthListener] Unsubscribing");
+    }
     unsubscribe();
     listenerInitialized = false;
   };