@rebasepro/client-firebase 0.3.0 → 0.5.0

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 {
@@ -599,7 +596,8 @@
         if (normalizedProperty.enum) {
           normalizedProperty.enum = normalizeEnumValuesToArray(normalizedProperty.enum, sortObjectFormat);
         }
-        if (normalizedProperty.dataType === "array" && typeof normalizedProperty.of === "object" && normalizedProperty.of !== null) {
+        const propType = normalizedProperty.type ?? normalizedProperty.dataType;
+        if (propType === "array" && typeof normalizedProperty.of === "object" && normalizedProperty.of !== null) {
           const ofProp = normalizedProperty.of;
           if (ofProp.enum) {
             normalizedProperty.of = {
@@ -608,7 +606,7 @@
             };
           }
         }
-        if (normalizedProperty.dataType === "map" && normalizedProperty.properties) {
+        if (propType === "map" && normalizedProperty.properties) {
           normalizedProperty.properties = normalizePropertiesEnumValues(normalizedProperty.properties, sortObjectFormat);
         }
         result[key] = normalizedProperty;
@@ -2009,8 +2007,8 @@
       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]);
+      return mgmtUser.roles;
+    }, [usersWithRoleIds]);
     const accessGate = React.useCallback(({
       user: user_2
     }) => {
@@ -2050,8 +2048,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,