@rebasepro/client-firebase 0.2.3 → 0.2.5

package/dist/index.umd.js

@@ -19,9 +19,7 @@
     const [userRoles, _setUserRoles] = React.useState();
     const [extra, setExtra] = React.useState();
     const setUserRoles = React.useCallback((roles) => {
-      const currentRoleIds = userRoles?.map((r) => r.id);
-      const newRoleIds = roles?.map((r_0) => r_0.id);
-      if (!fastEquals.deepEqual(currentRoleIds, newRoleIds)) {
+      if (!fastEquals.deepEqual(userRoles, roles)) {
         _setUserRoles(roles);
       }
     }, [userRoles]);
@@ -209,8 +207,7 @@
     }, []);
     const firebaseUserWrapper = loggedUser ? {
       ...loggedUser,
-      roles: userRoles?.map((r_1) => r_1.id),
-      // User.roles is string[], keep Role[] internally only
+      roles: userRoles,
       firebaseUser: loggedUser
     } : null;
     return {
@@ -336,7 +333,7 @@
           const blob = await response.blob();
           return new File([blob], path);
         } catch (e) {
-          if (e?.code === "storage/object-not-found") return null;
+          if (typeof e === "object" && e !== null && "code" in e && e.code === "storage/object-not-found") return null;
           throw e;
         }
       },
@@ -368,7 +365,7 @@
           urlsCache[storagePathOrUrl] = result;
           return result;
         } catch (e) {
-          if (e?.code === "storage/object-not-found") return {
+          if (typeof e === "object" && e !== null && "code" in e && e.code === "storage/object-not-found") return {
             url: null,
             fileNotFound: true
           };
@@ -427,7 +424,7 @@
         setFirebaseApp(initialisedFirebaseApp);
       } catch (e) {
         console.error("Error initialising Firebase", e);
-        setConfigError(hostingError + "\n" + (e.message ?? JSON.stringify(e)));
+        setConfigError(hostingError + "\n" + (e instanceof Error ? e.message : JSON.stringify(e)));
       }
     }, [name]);
     React.useEffect(() => {
@@ -496,7 +493,7 @@
         }
       } catch (e) {
         console.error("App Check error:", e);
-        setError(e.message);
+        setError(e instanceof Error ? e.message : String(e));
       }
     }, [options?.forceRefresh]);
     React.useEffect(() => {
@@ -852,7 +849,7 @@
             }
           } catch (error) {
             console.error("Failed to get search config from extension:", error);
-            throw new Error(`Failed to initialize Rebase Search. Make sure the rebase-search extension is installed and configured. Error: ${error.message || error}`);
+            throw new Error(`Failed to initialize Rebase Search. Make sure the rebase-search extension is installed and configured. Error: ${error instanceof Error ? error.message : String(error)}`);
           }
         }
         if (!searchConfig) {
@@ -933,7 +930,7 @@
           schemaCache.set(collectionName, stringFields);
           return stringFields;
         } catch (error) {
-          if (error.httpStatus === 404) {
+          if (error instanceof Error && "httpStatus" in error && error.httpStatus === 404) {
             throw new Error(`Collection "${collectionName}" not found in Typesense. Make sure the collection has been indexed. Try running the backfill function.`);
           }
           throw error;
@@ -973,7 +970,7 @@
           const ids = result.hits?.map((hit) => hit.document.id) ?? [];
           return ids;
         } catch (error) {
-          const message = error.message || error.toString();
+          const message = error instanceof Error ? error.message : String(error);
           throw new Error(`Search failed: ${message}`);
         }
       };
@@ -1398,13 +1395,13 @@
   };
   function firestoreToCMSModel(data) {
     if (data === null || data === void 0) return null;
-    if (firestore.deleteField().isEqual(data)) {
+    if (typeof data === "object" && data !== null && "isEqual" in data && typeof data.isEqual === "function" && firestore.deleteField().isEqual(data)) {
       return void 0;
     }
-    if (firestore.serverTimestamp().isEqual(data)) {
+    if (typeof data === "object" && data !== null && "isEqual" in data && typeof data.isEqual === "function" && firestore.serverTimestamp().isEqual(data)) {
       return null;
     }
-    if (data instanceof firestore.Timestamp || typeof data.toDate === "function" && data.toDate() instanceof Date) {
+    if (data instanceof firestore.Timestamp || typeof data === "object" && data !== null && "toDate" in data && typeof data.toDate === "function" && data.toDate() instanceof Date) {
       return data.toDate();
     }
     if (data instanceof Date) {
@@ -1413,7 +1410,7 @@
     if (typeof data === "object" && "__type__" in data && data.__type__ === "__vector__") {
       return data;
     }
-    if (data instanceof firestore.VectorValue || typeof data === "object" && data !== null && typeof data.toArray === "function" && data.constructor?.name === "VectorValue") {
+    if (data instanceof firestore.VectorValue || typeof data === "object" && data !== null && "toArray" in data && typeof data.toArray === "function" && data.constructor?.name === "VectorValue") {
       return {
         __type__: "__vector__",
         value: data.toArray()
@@ -1455,11 +1452,13 @@
       return null;
     } else if (Array.isArray(data)) {
       return data.filter((v) => v !== void 0).map((v) => cmsToFirestoreModel(v, firestore$1, true));
-    } else if (data.isEntityReference && data.isEntityReference()) {
-      const targetFirestore = data.databaseId ? firestore.getFirestore(firestore$1.app, data.databaseId) : firestore$1;
-      return firestore.doc(targetFirestore, data.path, data.id);
-    } else if (data && typeof data === "object" && data.__type === "relation" && data.path && data.id) {
-      return firestore.doc(firestore$1, data.path, String(data.id));
+    } else if (typeof data === "object" && data !== null && "isEntityReference" in data && typeof data.isEntityReference === "function" && data.isEntityReference()) {
+      const entityRef = data;
+      const targetFirestore = entityRef.databaseId ? firestore.getFirestore(firestore$1.app, entityRef.databaseId) : firestore$1;
+      return firestore.doc(targetFirestore, entityRef.path, entityRef.id);
+    } else if (data && typeof data === "object" && "__type" in data && data.__type === "relation" && "path" in data && "id" in data) {
+      const rel = data;
+      return firestore.doc(firestore$1, rel.path, String(rel.id));
     } else if (data instanceof types.GeoPoint) {
       return new firestore.GeoPoint(data.latitude, data.longitude);
     } else if (data instanceof Date) {
@@ -1790,8 +1789,9 @@
       return null;
     } else if (Array.isArray(data)) {
       return data.filter((v) => v !== void 0).map((v) => cmsToRTDBModel(v, database$1));
-    } else if (data.isEntityReference && data.isEntityReference()) {
-      return database.ref(database$1, `${data.slug}/${data.id}`);
+    } else if (typeof data === "object" && data !== null && "isEntityReference" in data && typeof data.isEntityReference === "function" && data.isEntityReference()) {
+      const entityRef = data;
+      return database.ref(database$1, `${entityRef.slug}/${entityRef.id}`);
     } else if (data instanceof Date) {
       return data.toISOString();
     } else if (data && typeof data === "object") {
@@ -1836,8 +1836,7 @@
     roles: rolesProp,
     usersPath = "__FIRECMS/config/users",
     rolesPath = "__FIRECMS/config/roles",
-    allowDefaultRolesCreation,
-    includeCollectionConfigPermissions
+    allowDefaultRolesCreation
   }) {
     if (!authController) {
       throw Error("useBuildUserManagement: You need to provide an authController since version 3.0.0-beta.11. Check https://firecms.co/docs/pro/migrating_from_v3_beta");
@@ -1881,7 +1880,7 @@
         onError(e_0) {
           setRoles([]);
           console.error("Error loading roles", e_0);
-          setRolesError(e_0);
+          setRolesError(e_0 instanceof Error ? e_0 : new Error(String(e_0)));
           setRolesLoading(false);
         }
       });
@@ -1913,7 +1912,7 @@
         onError(e_2) {
           console.error("Error loading users", e_2);
           setUsersWithRoleIds([]);
-          setUsersError(e_2);
+          setUsersError(e_2 instanceof Error ? e_2 : new Error(String(e_2)));
           setUsersLoading(false);
         }
       });
@@ -2007,9 +2006,9 @@
       if (!usersWithRoleIds) throw Error("Users not loaded");
       const mgmtUser = usersWithRoleIds.find((u_1) => u_1.email?.toLowerCase() === user_1?.email?.toLowerCase());
       if (!mgmtUser || !mgmtUser.roles) return void 0;
-      return roles.filter((r) => mgmtUser.roles.includes(r.id));
-    }, [roles, usersWithRoleIds]);
-    const authenticator = React.useCallback(({
+      return mgmtUser.roles;
+    }, [usersWithRoleIds]);
+    const accessGate = React.useCallback(({
       user: user_2
     }) => {
       if (loading) {
@@ -2048,8 +2047,8 @@
       throw Error("Could not find a user with the provided email in the user management system.");
     }, [loading, users]);
     const userRoles = authController.user ? defineRolesFor(authController.user) : void 0;
-    const isAdmin = (userRoles ?? []).some((r_0) => r_0.id === "admin");
-    const userRoleIds = userRoles?.map((r_1) => r_1.id);
+    const isAdmin = (userRoles ?? []).some((r) => r === "admin");
+    const userRoleIds = userRoles;
     React.useEffect(() => {
       console.debug("Setting user roles", {
         userRoles,
@@ -2074,9 +2073,8 @@
       usersError,
       isAdmin,
       allowDefaultRolesCreation: allowDefaultRolesCreation === void 0 ? true : allowDefaultRolesCreation,
-      includeCollectionConfigPermissions: Boolean(includeCollectionConfigPermissions),
       defineRolesFor,
-      authenticator,
+      accessGate,
       ...authController,
       initialLoading: authController.initialLoading || loading,
       userRoles,
@@ -2092,8 +2090,8 @@
       const data = doc.values;
       const record = data;
       const newVar = {
-        uid: doc.id,
         ...data,
+        uid: doc.id,
         created_on: record.created_on,
         updated_on: record.updated_on
       };
@@ -2106,6 +2104,128 @@
       ...doc.values
     }));
   };
+  function useFirebaseAccessGate(t0) {
+    const $ = reactCompilerRuntime.c(17);
+    const {
+      disabled,
+      authController,
+      accessGate,
+      storageSource,
+      data
+    } = t0;
+    const gateEnabled = Boolean(accessGate);
+    const [authLoading, setAuthLoading] = React.useState(gateEnabled);
+    const [notAllowedError, setNotAllowedError] = React.useState(false);
+    const [authVerified, setAuthVerified] = React.useState(!gateEnabled || Boolean(authController.loginSkipped));
+    const canAccessMainView = authVerified && (!gateEnabled || Boolean(authController.user) || Boolean(authController.loginSkipped)) && !notAllowedError;
+    let t1;
+    let t2;
+    if ($[0] !== authController.loginSkipped) {
+      t1 = () => {
+        if (authController.loginSkipped) {
+          setAuthVerified(true);
+        }
+      };
+      t2 = [authController.loginSkipped];
+      $[0] = authController.loginSkipped;
+      $[1] = t1;
+      $[2] = t2;
+    } else {
+      t1 = $[1];
+      t2 = $[2];
+    }
+    React.useEffect(t1, t2);
+    const checkedUserRef = React.useRef(void 0);
+    let t3;
+    if ($[3] !== accessGate || $[4] !== authController || $[5] !== data || $[6] !== disabled || $[7] !== storageSource) {
+      t3 = async () => {
+        if (disabled) {
+          return;
+        }
+        if (authController.initialLoading) {
+          return;
+        }
+        if (!authController.user && !authController.loginSkipped) {
+          checkedUserRef.current = void 0;
+          setAuthLoading(false);
+          setAuthVerified(false);
+          return;
+        }
+        const delegateUser = authController.user;
+        if (accessGate instanceof Function && delegateUser && !fastEquals.deepEqual(checkedUserRef.current?.uid, delegateUser.uid)) {
+          setAuthLoading(true);
+          try {
+            const allowed = await accessGate({
+              user: delegateUser,
+              authController,
+              data,
+              storageSource
+            });
+            if (!allowed) {
+              authController.signOut();
+              setNotAllowedError(true);
+            }
+          } catch (t42) {
+            const e = t42;
+            setNotAllowedError(e);
+            authController.signOut();
+          }
+          setAuthLoading(false);
+          setAuthVerified(true);
+          checkedUserRef.current = delegateUser;
+        } else {
+          setAuthLoading(false);
+        }
+        if (!authController.initialLoading && !delegateUser) {
+          setAuthVerified(true);
+        }
+      };
+      $[3] = accessGate;
+      $[4] = authController;
+      $[5] = data;
+      $[6] = disabled;
+      $[7] = storageSource;
+      $[8] = t3;
+    } else {
+      t3 = $[8];
+    }
+    const checkAccess = t3;
+    let t4;
+    let t5;
+    if ($[9] !== checkAccess) {
+      t4 = () => {
+        checkAccess();
+      };
+      t5 = [checkAccess];
+      $[9] = checkAccess;
+      $[10] = t4;
+      $[11] = t5;
+    } else {
+      t4 = $[10];
+      t5 = $[11];
+    }
+    React.useEffect(t4, t5);
+    let t6;
+    const t7 = gateEnabled && authLoading;
+    let t8;
+    if ($[12] !== authVerified || $[13] !== canAccessMainView || $[14] !== notAllowedError || $[15] !== t7) {
+      t8 = {
+        canAccessMainView,
+        authLoading: t7,
+        notAllowedError,
+        authVerified
+      };
+      $[12] = authVerified;
+      $[13] = canAccessMainView;
+      $[14] = notAllowedError;
+      $[15] = t7;
+      $[16] = t8;
+    } else {
+      t8 = $[16];
+    }
+    t6 = t8;
+    return t6;
+  }
   const googleIcon = (mode) => /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 64 64", width: 24, height: 24, children: [
     /* @__PURE__ */ jsxRuntime.jsxs("linearGradient", { id: "95yY7w43Oj6n2vH63j6HJb", x1: "29.401", x2: "29.401", y1: "4.064", y2: "106.734", gradientTransform: "matrix(1 0 0 -1 0 66)", gradientUnits: "userSpaceOnUse", children: [
       /* @__PURE__ */ jsxRuntime.jsx("stop", { offset: "0", stopColor: "#ff5840" }),
@@ -2237,7 +2357,7 @@
       } else if (notAllowedError instanceof Error) {
         notAllowedMessage = notAllowedError.message;
       } else {
-        notAllowedMessage = "It looks like you don't have access to the CMS, based on the specified Authenticator configuration";
+        notAllowedMessage = "It looks like you don't have access to the CMS, based on the specified access gate configuration";
       }
     }
     const fadeStyle = {
@@ -2624,7 +2744,7 @@
       name,
       logo,
       logoDark,
-      authenticator,
+      accessGate,
       collections,
       views,
       adminViews,
@@ -2752,15 +2872,15 @@
       t10 = $[21];
     }
     let t11;
-    if ($[22] !== authController || $[23] !== authenticator || $[24] !== storageSource || $[25] !== t10) {
+    if ($[22] !== accessGate || $[23] !== authController || $[24] !== storageSource || $[25] !== t10) {
       t11 = {
         authController,
-        authenticator,
+        accessGate,
         data: t10,
         storageSource
       };
-      $[22] = authController;
-      $[23] = authenticator;
+      $[22] = accessGate;
+      $[23] = authController;
       $[24] = storageSource;
       $[25] = t10;
       $[26] = t11;
@@ -2771,7 +2891,7 @@
       authLoading,
       canAccessMainView,
       notAllowedError
-    } = core.useValidateAuthenticator(t11);
+    } = useFirebaseAccessGate(t11);
     let t12;
     if ($[27] !== userConfigPersistence) {
       t12 = {
@@ -2899,7 +3019,7 @@
           const usedLogo = modeController.mode === "dark" && logoDark ? logoDark : logo;
           if (!canAccessMainView) {
             const LoginViewUsed = components?.LoginView ?? FirebaseLoginView;
-            component = /* @__PURE__ */ jsxRuntime.jsx(LoginViewUsed, { logo: usedLogo, allowSkipLogin, signInOptions: signInOptions ?? DEFAULT_SIGN_IN_OPTIONS, firebaseApp, authController, notAllowedError });
+            component = /* @__PURE__ */ jsxRuntime.jsx(LoginViewUsed, { logo: usedLogo, allowSkipLogin, signInOptions: signInOptions ?? DEFAULT_SIGN_IN_OPTIONS, firebaseApp, authController, notAllowedError: notAllowedError instanceof Error ? notAllowedError : typeof notAllowedError === "string" ? notAllowedError : void 0 });
           } else {
             const firstCollectionEntry = navigationStateController.topLevelNavigation?.navigationEntries.find(_temp3);
             const fallbackRoute = firstCollectionEntry ? /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: urlController.buildUrlCollectionPath(firstCollectionEntry.id), replace: true }) : /* @__PURE__ */ jsxRuntime.jsx(ui.CenteredView, { children: "No home page or collections provided." });
@@ -3033,6 +3153,7 @@
   exports2.performPineconeTextSearch = performPineconeTextSearch;
   exports2.useAppCheck = useAppCheck;
   exports2.useBuildUserManagement = useBuildUserManagement;
+  exports2.useFirebaseAccessGate = useFirebaseAccessGate;
   exports2.useFirebaseAuthController = useFirebaseAuthController;
   exports2.useFirebaseRTDBDelegate = useFirebaseRTDBDelegate;
   exports2.useFirebaseStorageSource = useFirebaseStorageSource;