@umituz/react-native-firebase 2.4.58 → 2.4.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-firebase",
-  "version": "2.4.58",
+  "version": "2.4.60",
   "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/services/user-document-builder.util.ts

@@ -3,7 +3,7 @@
  * Builds user document data for Firestore (max 100 lines)
  */
 
-import { serverTimestamp } from "firebase/firestore";
+import { serverTimestamp, increment } from "firebase/firestore";
 import type {
   UserDocumentUser,
   UserDocumentExtras,
@@ -82,6 +82,7 @@ export function buildCreateData(
     createdAt: serverTimestamp(),
     updatedAt: serverTimestamp(),
     lastLoginAt: serverTimestamp(),
+    loginCount: 1,
   };
 
   if (extras?.previousAnonymousUserId) {
@@ -106,6 +107,7 @@ export function buildUpdateData(
     ...baseData,
     lastLoginAt: serverTimestamp(),
     updatedAt: serverTimestamp(),
+    loginCount: increment(1),
   };
 
   if (extras?.previousAnonymousUserId) {
@@ -117,3 +119,33 @@ export function buildUpdateData(
 
   return updateData;
 }
+
+/**
+ * Builds a login history entry for the loginHistory subcollection
+ */
+export function buildLoginHistoryEntry(
+  user: UserDocumentUser,
+  extras?: UserDocumentExtras,
+): Record<string, unknown> {
+  return {
+    loginAt: serverTimestamp(),
+    provider: getSignUpMethod(user) ?? "unknown",
+    email: user.email ?? null,
+    displayName: user.displayName ?? null,
+    isAnonymous: user.isAnonymous ?? false,
+    platform: extras?.platform ?? null,
+    deviceModel: extras?.deviceModel ?? null,
+    deviceBrand: extras?.deviceBrand ?? null,
+    osName: extras?.osName ?? null,
+    osVersion: extras?.osVersion ?? null,
+    appVersion: extras?.appVersion ?? null,
+    buildNumber: extras?.buildNumber ?? null,
+    locale: extras?.locale ?? null,
+    region: extras?.region ?? null,
+    timezone: extras?.timezone ?? null,
+    screenWidth: extras?.screenWidth ?? null,
+    screenHeight: extras?.screenHeight ?? null,
+    deviceId: extras?.persistentDeviceId ?? extras?.deviceId ?? null,
+    isConversion: !!extras?.previousAnonymousUserId,
+  };
+}

package/src/domains/auth/infrastructure/services/user-document.service.ts

@@ -3,7 +3,7 @@
  * Generic service for creating/updating user documents in Firestore
  */
 
-import { doc, getDoc, setDoc, serverTimestamp } from "firebase/firestore";
+import { doc, getDoc, setDoc, addDoc, collection, serverTimestamp } from "firebase/firestore";
 import type { User } from "firebase/auth";
 import { getFirestore } from "../../../firestore";
 import type {
@@ -16,6 +16,7 @@ import {
   buildBaseData,
   buildCreateData,
   buildUpdateData,
+  buildLoginHistoryEntry,
 } from "./user-document-builder.util";
 
 declare const __DEV__: boolean;
@@ -52,6 +53,16 @@ export async function ensureUserDocument(
       : buildUpdateData(baseData, allExtras);
 
     await setDoc(userRef, docData, { merge: true });
+
+    // Write login history entry (fire-and-forget)
+    const historyEntry = buildLoginHistoryEntry(user, allExtras);
+    const historyRef = collection(db, collectionName, user.uid, "loginHistory");
+    addDoc(historyRef, historyEntry).catch((err) => {
+      if (typeof __DEV__ !== "undefined" && __DEV__) {
+        console.warn("[UserDocumentService] Failed to write login history:", err);
+      }
+    });
+
     return true;
   } catch (error) {
     if (typeof __DEV__ !== "undefined" && __DEV__) {

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

@@ -4,7 +4,7 @@
  * This hook is optional and requires expo-auth-session to be installed
  */
 
-import { useState, useCallback, useEffect } from "react";
+import { useState, useCallback, useEffect, useRef } from "react";
 import { googleOAuthService } from "../../infrastructure/services/google-oauth.service";
 import { getFirebaseAuth } from "../../infrastructure/config/FirebaseAuthClient";
 import type { GoogleOAuthConfig } from "../../infrastructure/services/google-oauth.service";
@@ -61,6 +61,10 @@ export function useGoogleOAuth(config?: GoogleOAuthConfig): UseGoogleOAuthResult
   const googleAvailable = googleOAuthService.isAvailable();
   const googleConfigured = googleOAuthService.isConfigured(config);
 
+  // Keep config in a ref so the response useEffect doesn't re-run when config object reference changes
+  const configRef = useRef(config);
+  configRef.current = config;
+
   // Call the Hook directly (only valid in React component)
   // If expo-auth-session is not available, these will be null
   const [request, response, promptAsync] = isExpoAuthAvailable && ExpoAuthSession
@@ -90,7 +94,7 @@ export function useGoogleOAuth(config?: GoogleOAuthConfig): UseGoogleOAuthResult
 
           await googleOAuthService.signInWithOAuth(
             auth,
-            config,
+            configRef.current,
             async () => response
           );
         } catch (error) {
@@ -107,7 +111,7 @@ export function useGoogleOAuth(config?: GoogleOAuthConfig): UseGoogleOAuthResult
     };
 
     handleResponse();
-  }, [response, googleAvailable, config]);
+  }, [response, googleAvailable]); // config read via ref to prevent re-running on reference changes
 
   const signInWithGoogle = useCallback(async (): Promise<SocialAuthResult> => {
     if (!googleAvailable) {