@rebasepro/client-firebase 0.3.0 → 0.4.0

package/dist/hooks/useBuildUserManagement.d.ts

@@ -1,4 +1,9 @@
-import { AuthController, DataDriver, Role, User, UserManagementDelegate } from "@rebasepro/types";
+import { AuthController, DataDriver, User, UserManagementDelegate } from "@rebasepro/types";
+export interface Role {
+    id: string;
+    name: string;
+    isAdmin?: boolean;
+}
 export interface UserManagementDelegateParams<CONTROLLER extends AuthController<User> = AuthController<User>> {
     authController: CONTROLLER;
     /**

package/dist/hooks/useFirebaseAuthController.d.ts

@@ -1,12 +1,12 @@
 import { FirebaseApp } from "@firebase/app";
 import { FirebaseAuthController, FirebaseSignInOption, FirebaseSignInProvider, FirebaseUserWrapper } from "../types";
-import { Role, User } from "@rebasepro/types";
+import type { User } from "@rebasepro/types";
 export interface FirebaseAuthControllerProps {
     loading?: boolean;
     firebaseApp?: FirebaseApp;
     signInOptions?: Array<FirebaseSignInProvider | FirebaseSignInOption>;
     onSignOut?: () => void;
-    defineRolesFor?: (user: User) => Promise<Role[] | undefined> | Role[] | undefined;
+    defineRolesFor?: (user: User) => Promise<string[] | undefined> | string[] | undefined;
 }
 /**
  * Use this hook to build an {@link AuthController} based on Firebase Auth

package/dist/index.es.js

@@ -34,9 +34,7 @@ const useFirebaseAuthController = ({
   const [userRoles, _setUserRoles] = useState();
   const [extra, setExtra] = useState();
   const setUserRoles = useCallback((roles) => {
-    const currentRoleIds = userRoles?.map((r) => r.id);
-    const newRoleIds = roles?.map((r_0) => r_0.id);
-    if (!deepEqual(currentRoleIds, newRoleIds)) {
+    if (!deepEqual(userRoles, roles)) {
       _setUserRoles(roles);
     }
   }, [userRoles]);
@@ -224,8 +222,7 @@ const useFirebaseAuthController = ({
   }, []);
   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 {
@@ -614,7 +611,8 @@ function normalizePropertiesEnumValues(properties, sortObjectFormat = false) {
       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 = {
@@ -623,7 +621,7 @@ function normalizePropertiesEnumValues(properties, sortObjectFormat = false) {
           };
         }
       }
-      if (normalizedProperty.dataType === "map" && normalizedProperty.properties) {
+      if (propType === "map" && normalizedProperty.properties) {
         normalizedProperty.properties = normalizePropertiesEnumValues(normalizedProperty.properties, sortObjectFormat);
       }
       result[key] = normalizedProperty;
@@ -2024,8 +2022,8 @@ function useBuildUserManagement({
     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 = useCallback(({
     user: user_2
   }) => {
@@ -2065,8 +2063,8 @@ function useBuildUserManagement({
     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;
   useEffect(() => {
     console.debug("Setting user roles", {
       userRoles,