@rebasepro/client-firebase 0.2.4 → 0.2.5

package/dist/types/auth.d.ts

@@ -1,5 +1,5 @@
 import { ApplicationVerifier, ConfirmationResult, User as FirebaseUser } from "@firebase/auth";
-import { AuthController, Role, User } from "@rebasepro/types";
+import type { AuthController, User } from "@rebasepro/types";
 /**
  * @group Firebase
  */
@@ -37,5 +37,5 @@ export type FirebaseAuthController<USER extends User = FirebaseUserWrapper, Extr
      */
     skipLogin: () => void;
     setUser: (user: USER | null) => void;
-    setUserRoles: (roles: Role[]) => void;
+    setUserRoles: (roles: string[]) => void;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/client-firebase",
   "type": "module",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "publishConfig": {
     "access": "public"
   },
@@ -14,12 +14,12 @@
     "fast-equals": "6.0.0",
     "fuse.js": "^7.3.0",
     "react-router-dom": "^7.15.1",
-    "@rebasepro/admin": "0.2.4",
-    "@rebasepro/common": "0.2.4",
-    "@rebasepro/core": "0.2.4",
-    "@rebasepro/types": "0.2.4",
-    "@rebasepro/ui": "0.2.4",
-    "@rebasepro/utils": "0.2.4"
+    "@rebasepro/admin": "0.2.5",
+    "@rebasepro/core": "0.2.5",
+    "@rebasepro/common": "0.2.5",
+    "@rebasepro/ui": "0.2.5",
+    "@rebasepro/utils": "0.2.5",
+    "@rebasepro/types": "0.2.5"
   },
   "peerDependencies": {
     "firebase": "^10.12.2 || ^11.0.0 || ^12.0.0",

package/src/hooks/useBuildUserManagement.tsx

@@ -6,12 +6,17 @@ import {
     AuthController,
     DataDriver,
     Entity,
-    Role,
     User,
     UserManagementDelegate
 } from "@rebasepro/types";
 import { FirebaseAccessGate } from "./useFirebaseAccessGate";
 
+export interface Role {
+    id: string;
+    name: string;
+    isAdmin?: boolean;
+}
+
 type UserWithRoleIds<USER extends User = User> = Omit<USER, "roles"> & { roles: string[] };
 
 export interface UserManagementDelegateParams<CONTROLLER extends AuthController<User> = AuthController<User>> {
@@ -254,12 +259,12 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<User> =
 
 
 
-    const defineRolesFor: ((user: User) => Role[] | undefined) = useCallback((user) => {
+    const defineRolesFor: ((user: User) => string[] | undefined) = useCallback((user) => {
         if (!usersWithRoleIds) throw Error("Users not loaded");
         const mgmtUser = usersWithRoleIds.find(u => u.email?.toLowerCase() === user?.email?.toLowerCase());
         if (!mgmtUser || !mgmtUser.roles) return undefined;
-        return roles.filter(r => mgmtUser.roles.includes(r.id));
-    }, [roles, usersWithRoleIds]);
+        return mgmtUser.roles;
+    }, [usersWithRoleIds]);
 
     const accessGate: FirebaseAccessGate<USER> = useCallback(({ user }) => {
 
@@ -303,9 +308,9 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<User> =
     }, [loading, users]);
 
     const userRoles = authController.user ? defineRolesFor(authController.user) : undefined;
-    const isAdmin = (userRoles ?? []).some(r => r.id === "admin");
+    const isAdmin = (userRoles ?? []).some(r => r === "admin");
 
-    const userRoleIds = userRoles?.map(r => r.id);
+    const userRoleIds = userRoles;
     useEffect(() => {
         console.debug("Setting user roles", {
             userRoles,

package/src/hooks/useFirebaseAuthController.ts

@@ -24,14 +24,14 @@ import {
 } from "@firebase/auth";
 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;
 }
 
 /**
@@ -53,13 +53,11 @@ export const useFirebaseAuthController = <USER extends FirebaseUserWrapper = any
     const [authLoading, setAuthLoading] = useState(true);
     const [loginSkipped, setLoginSkipped] = useState<boolean>(false);
     const [confirmationResult, setConfirmationResult] = useState<undefined | ConfirmationResult>();
-    const [userRoles, _setUserRoles] = useState<Role[] | undefined>();
+    const [userRoles, _setUserRoles] = useState<string[] | undefined>();
     const [extra, setExtra] = useState<any>();
 
-    const setUserRoles = useCallback((roles: Role[] | undefined) => {
-        const currentRoleIds = userRoles?.map(r => r.id);
-        const newRoleIds = roles?.map(r => r.id);
-        if (!equal(currentRoleIds, newRoleIds)) {
+    const setUserRoles = useCallback((roles: string[] | undefined) => {
+        if (!equal(userRoles, roles)) {
             _setUserRoles(roles);
         }
     }, [userRoles]);
@@ -299,7 +297,7 @@ export const useFirebaseAuthController = <USER extends FirebaseUserWrapper = any
     const firebaseUserWrapper: FirebaseUserWrapper | null = loggedUser
         ? {
             ...loggedUser,
-            roles: userRoles?.map(r => r.id), // User.roles is string[], keep Role[] internally only
+            roles: userRoles,
             firebaseUser: loggedUser
         }
         : null;

package/src/types/auth.tsx

@@ -1,6 +1,6 @@
 import { ApplicationVerifier, ConfirmationResult, User as FirebaseUser } from "@firebase/auth";
 
-import { AuthController, Role, User } from "@rebasepro/types";
+import type { AuthController, User } from "@rebasepro/types";
 
 /**
  * @group Firebase
@@ -69,6 +69,6 @@ export type FirebaseAuthController<USER extends User = FirebaseUserWrapper, Extr
 
         setUser: (user: USER | null) => void;
 
-        setUserRoles: (roles: Role[]) => void;
+        setUserRoles: (roles: string[]) => void;
 
     };