react-query-firebase 1.2.1 → 1.2.3

package/dist/src/auth/useIdToken.js

@@ -1,5 +1,7 @@
 import { useCallback, useEffect, useState } from "react";
 import { useCurrentUser } from "./useCurrentUser";
+import { onIdTokenChanged } from "firebase/auth";
+import { useAuth } from "./useAuth";
 /**
  * Custom hook to manage an ID token for the current user.
  * This hook provides an `idToken` value and a `refresh` function to manually refresh the token.
@@ -9,6 +11,7 @@ import { useCurrentUser } from "./useCurrentUser";
  *   @returns {Function} refresh - A function to refresh the ID token.
  */
 export const useIdToken = () => {
+    const auth = useAuth();
     const currentUser = useCurrentUser();
     const [idToken, setIdToken] = useState("");
     const callback = useCallback(async () => {
@@ -29,6 +32,19 @@ export const useIdToken = () => {
     useEffect(() => {
         callback();
     }, [currentUser?.uid ?? ""]);
+    useEffect(() => {
+        const unsubscribe = onIdTokenChanged(auth, (user) => {
+            if (user) {
+                user.getIdToken().then((idToken) => {
+                    setIdToken(idToken);
+                });
+            }
+            else {
+                setIdToken("");
+            }
+        });
+        return () => unsubscribe();
+    }, [idToken]);
     return {
         idToken,
         refresh

package/dist/src/context/FirebaseContextProvider.d.ts

@@ -70,7 +70,7 @@ export type FirebaseContextProviderProps = PropsWithChildren & {
      *                  security_storage: "denied"
      *              }
      */
-    defaultConsent?: ConsentSettings;
+    consentSettings?: ConsentSettings;
     /**
      * Flag indicating whether Firebase Firestore should be enabled.
      * @defaultValue `true`

package/dist/src/context/FirebaseContextProvider.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from "react";
+import React, { useEffect, useMemo } from "react";
 import { FirebaseContext } from "./FirebaseContext";
 import { connectAuthEmulator, getAuth } from "firebase/auth";
 import { getAnalytics, setAnalyticsCollectionEnabled, setConsent } from "firebase/analytics";
@@ -28,10 +28,22 @@ import { initializeApp } from "firebase/app";
  * };
  * ```
  */
-export const FirebaseContextProvider = ({ emulators, options, children, authEnabled = true, firestoreEnabled = true, analyticsEnabled = true, defaultConsent = {}, remoteConfigEnabled = true, remoteConfigSettings, remoteConfigDefaults = {} }) => {
+export const FirebaseContextProvider = ({ emulators, options, children, authEnabled = true, firestoreEnabled = true, analyticsEnabled = true, consentSettings = {}, remoteConfigEnabled = true, remoteConfigSettings, remoteConfigDefaults = {} }) => {
     const firebase = useMemo(() => {
         return initializeApp(options);
     }, [options]);
+    useEffect(() => {
+        setConsent({
+            ad_personalization: "denied",
+            ad_storage: "denied",
+            ad_user_data: "denied",
+            analytics_storage: "denied",
+            functionality_storage: "denied",
+            personalization_storage: "denied",
+            security_storage: "denied",
+            ...consentSettings
+        });
+    }, [consentSettings]);
     const contextValue = useMemo(() => {
         const value = {};
         if (firestoreEnabled) {
@@ -50,20 +62,9 @@ export const FirebaseContextProvider = ({ emulators, options, children, authEnab
             }
             value.auth = auth;
         }
-        setConsent({
-            ad_personalization: "denied",
-            ad_storage: "denied",
-            ad_user_data: "denied",
-            analytics_storage: "denied",
-            functionality_storage: "denied",
-            personalization_storage: "denied",
-            security_storage: "denied",
-            ...defaultConsent
-        });
         if (analyticsEnabled && options.measurementId && typeof window !== "undefined") {
             const analytics = getAnalytics(firebase);
             value.analytics = analytics;
-            setAnalyticsCollectionEnabled(analytics, defaultConsent?.analytics_storage === "granted");
         }
         if (remoteConfigEnabled && typeof window !== "undefined") {
             const remoteConfig = getRemoteConfig(firebase);
@@ -76,5 +77,10 @@ export const FirebaseContextProvider = ({ emulators, options, children, authEnab
         }
         return { firebase, ...value };
     }, [firebase]);
+    useEffect(() => {
+        if (contextValue.analytics) {
+            setAnalyticsCollectionEnabled(contextValue.analytics, consentSettings?.analytics_storage === "granted");
+        }
+    }, [consentSettings]);
     return (React.createElement(FirebaseContext.Provider, { value: contextValue }, children));
 };

package/package.json

@@ -60,5 +60,5 @@
         "docs:build": "vitepress build docs",
         "docs:preview": "vitepress preview docs"
     },
-    "version": "1.2.1"
+    "version": "1.2.3"
 }

package/src/auth/useIdToken.ts

@@ -1,5 +1,7 @@
 import { useCallback, useEffect, useState } from "react";
 import { useCurrentUser } from "./useCurrentUser";
+import { onIdTokenChanged } from "firebase/auth";
+import { useAuth } from "./useAuth";
 
 /**
  * Custom hook to manage an ID token for the current user.
@@ -10,6 +12,8 @@ import { useCurrentUser } from "./useCurrentUser";
  *   @returns {Function} refresh - A function to refresh the ID token.
  */
 export const useIdToken = () => {
+    const auth = useAuth();
+
     const currentUser = useCurrentUser();
     const [idToken, setIdToken] = useState("");
 
@@ -36,6 +40,20 @@ export const useIdToken = () => {
         callback();
     }, [currentUser?.uid ?? ""]);
 
+    useEffect(() => {
+        const unsubscribe = onIdTokenChanged(auth, (user) => {
+            if (user) {
+                user.getIdToken().then((idToken) => {
+                    setIdToken(idToken);
+                });
+            } else {
+                setIdToken("");
+            }
+        });
+
+        return () => unsubscribe();
+    }, [idToken]);
+
     return {
         idToken,
         refresh

package/src/context/FirebaseContextProvider.tsx

@@ -1,4 +1,4 @@
-import React, { PropsWithChildren, useMemo } from "react";
+import React, { PropsWithChildren, useEffect, useMemo } from "react";
 import { FirebaseContext } from "./FirebaseContext";
 import { connectAuthEmulator, getAuth } from "firebase/auth";
 import { ConsentSettings, getAnalytics, setAnalyticsCollectionEnabled, setConsent } from "firebase/analytics";
@@ -77,7 +77,7 @@ export type FirebaseContextProviderProps = PropsWithChildren & {
      *                  security_storage: "denied"
      *              }
      */
-    defaultConsent?: ConsentSettings;
+    consentSettings?: ConsentSettings;
     /**
      * Flag indicating whether Firebase Firestore should be enabled.
      * @defaultValue `true`
@@ -129,7 +129,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
     authEnabled = true,
     firestoreEnabled = true,
     analyticsEnabled = true,
-    defaultConsent = {},
+    consentSettings = {},
     remoteConfigEnabled = true,
     remoteConfigSettings,
     remoteConfigDefaults = {}
@@ -138,6 +138,19 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
         return initializeApp(options);
     }, [options]);
 
+    useEffect(() => {
+        setConsent({
+            ad_personalization: "denied",
+            ad_storage: "denied",
+            ad_user_data: "denied",
+            analytics_storage: "denied",
+            functionality_storage: "denied",
+            personalization_storage: "denied",
+            security_storage: "denied",
+            ...consentSettings
+        });
+    }, [consentSettings]);
+
     const contextValue = useMemo(() => {
         const value: Partial<React.ContextType<typeof FirebaseContext>> = {};
 
@@ -161,22 +174,9 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
             value.auth = auth;
         }
 
-        setConsent({
-            ad_personalization: "denied",
-            ad_storage: "denied",
-            ad_user_data: "denied",
-            analytics_storage: "denied",
-            functionality_storage: "denied",
-            personalization_storage: "denied",
-            security_storage: "denied",
-            ...defaultConsent
-        });
-
         if (analyticsEnabled && options.measurementId && typeof window !== "undefined") {
             const analytics = getAnalytics(firebase);
             value.analytics = analytics;
-
-            setAnalyticsCollectionEnabled(analytics, defaultConsent?.analytics_storage === "granted");
         }
 
         if (remoteConfigEnabled && typeof window !== "undefined") {
@@ -192,6 +192,12 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
         return { firebase, ...value };
     }, [firebase]);
 
+    useEffect(() => {
+        if (contextValue.analytics) {
+            setAnalyticsCollectionEnabled(contextValue.analytics, consentSettings?.analytics_storage === "granted");
+        }
+    }, [consentSettings]);
+
     return (
         <FirebaseContext.Provider value={contextValue as React.ContextType<typeof FirebaseContext>}>
             {children}