@firecms/user_management 3.0.0-canary.144 → 3.0.0-canary.145

package/dist/hooks/useBuildUserManagement.d.ts

@@ -1,6 +1,7 @@
 import { UserManagement } from "../types";
-import { DataSourceDelegate } from "@firecms/core";
-export interface UserManagementParams {
+import { AuthController, DataSourceDelegate, User } from "@firecms/core";
+export interface UserManagementParams<CONTROLLER extends AuthController<any> = AuthController<any>, USER extends User = CONTROLLER extends AuthController<infer U> ? U : any> {
+    authController: CONTROLLER;
     /**
      * The delegate in charge of persisting the data.
      */
@@ -38,6 +39,7 @@ export interface UserManagementParams {
 /**
  * This hook is used to build a user management object that can be used to
  * manage users and roles in a Firestore backend.
+ * @param authController
  * @param dataSourceDelegate
  * @param usersPath
  * @param rolesPath
@@ -46,4 +48,4 @@ export interface UserManagementParams {
  * @param allowDefaultRolesCreation
  * @param includeCollectionConfigPermissions
  */
-export declare function useBuildUserManagement({ dataSourceDelegate, usersPath, rolesPath, usersLimit, canEditRoles, allowDefaultRolesCreation, includeCollectionConfigPermissions }: UserManagementParams): UserManagement;
+export declare function useBuildUserManagement<CONTROLLER extends AuthController<any> = AuthController<any>, USER extends User = CONTROLLER extends AuthController<infer U> ? U : any>({ authController, dataSourceDelegate, usersPath, rolesPath, usersLimit, canEditRoles, allowDefaultRolesCreation, includeCollectionConfigPermissions }: UserManagementParams<CONTROLLER, USER>): UserManagement<USER> & CONTROLLER;

package/dist/index.es.js

@@ -142,6 +142,7 @@ function hexToRgbaWithOpacity(hexColor, opacity = 10) {
   return `rgba(${r}, ${g}, ${b}, ${alpha})`;
 }
 function useBuildUserManagement({
+  authController,
   dataSourceDelegate,
   usersPath = "__FIRECMS/config/users",
   rolesPath = "__FIRECMS/config/roles",
@@ -160,14 +161,13 @@ function useBuildUserManagement({
   }));
   const [rolesError, setRolesError] = React.useState();
   const [usersError, setUsersError] = React.useState();
-  const loading = rolesLoading || usersLoading;
+  const _usersLoading = usersLoading;
+  const _rolesLoading = rolesLoading;
+  const loading = _rolesLoading || _usersLoading;
   useEffect(() => {
     if (!dataSourceDelegate || !rolesPath) return;
     if (dataSourceDelegate.initialised !== void 0 && !dataSourceDelegate.initialised) return;
-    if (dataSourceDelegate.authenticated !== void 0 && !dataSourceDelegate.authenticated) {
-      setRolesLoading(false);
-      return;
-    }
+    if (authController?.initialLoading) return;
     setRolesLoading(true);
     return dataSourceDelegate.listenCollection?.({
       path: rolesPath,
@@ -175,8 +175,9 @@ function useBuildUserManagement({
         setRolesError(void 0);
         try {
           const newRoles = entityToRoles(entities);
-          if (!equal(newRoles, roles))
+          if (!equal(newRoles, roles)) {
             setRoles(newRoles);
+          }
         } catch (e) {
           setRoles([]);
           console.error("Error loading roles", e);
@@ -191,23 +192,24 @@ function useBuildUserManagement({
         setRolesLoading(false);
       }
     });
-  }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, rolesPath]);
+  }, [dataSourceDelegate?.initialised, authController?.initialLoading, authController?.user?.uid, rolesPath]);
   useEffect(() => {
     if (!dataSourceDelegate || !usersPath) return;
-    if (dataSourceDelegate.initialised !== void 0 && !dataSourceDelegate.initialised) return;
-    if (dataSourceDelegate.authenticated !== void 0 && !dataSourceDelegate.authenticated) {
-      setUsersLoading(false);
+    if (dataSourceDelegate.initialised !== void 0 && !dataSourceDelegate.initialised) {
+      return;
+    }
+    if (authController?.initialLoading) {
       return;
     }
     setUsersLoading(true);
     return dataSourceDelegate.listenCollection?.({
       path: usersPath,
       onUpdate(entities) {
+        console.debug("Updating users", entities);
         setUsersError(void 0);
         try {
           const newUsers = entitiesToUsers(entities);
-          if (!equal(newUsers, usersWithRoleIds))
-            setUsersWithRoleIds(newUsers);
+          setUsersWithRoleIds(newUsers);
         } catch (e) {
           setUsersWithRoleIds([]);
           console.error("Error loading users", e);
@@ -216,13 +218,13 @@ function useBuildUserManagement({
         setUsersLoading(false);
       },
       onError(e) {
-        setUsersWithRoleIds([]);
         console.error("Error loading users", e);
+        setUsersWithRoleIds([]);
         setUsersError(e);
         setUsersLoading(false);
       }
     });
-  }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, usersPath]);
+  }, [dataSourceDelegate?.initialised, authController?.initialLoading, authController?.user?.uid, usersPath]);
   const saveUser = useCallback(async (user) => {
     if (!dataSourceDelegate) throw Error("useBuildUserManagement Firebase not initialised");
     if (!usersPath) throw Error("useBuildUserManagement Firestore not initialised");
@@ -294,26 +296,36 @@ function useBuildUserManagement({
     user
   }), []);
   const defineRolesFor = useCallback((user) => {
-    if (!users) throw Error("Users not loaded");
-    const mgmtUser = users.find((u) => u.email?.toLowerCase() === user?.email?.toLowerCase());
+    if (!usersWithRoleIds) throw Error("Users not loaded");
+    const users2 = usersWithRoleIds.map((u) => ({
+      ...u,
+      roles: roles.filter((r) => u.roles?.includes(r.id))
+    }));
+    const mgmtUser = users2.find((u) => u.email?.toLowerCase() === user?.email?.toLowerCase());
     return mgmtUser?.roles;
-  }, [users]);
+  }, [roles, usersWithRoleIds]);
+  console.debug({
+    loading,
+    users,
+    usersError
+  });
   const authenticator = useCallback(({ user }) => {
-    console.debug("Authenticating user", user);
     if (loading) {
-      console.warn("User management is still loading");
       return false;
     }
     if (users.length === 0) {
+      console.warn("No users created yet");
       return true;
     }
     const mgmtUser = users.find((u) => u.email?.toLowerCase() === user?.email?.toLowerCase());
     if (mgmtUser) {
+      console.debug("User found in user management system", mgmtUser);
       return true;
     }
     throw Error("Could not find a user with the provided email in the user management system.");
-  }, [loading, users, usersError, rolesError]);
-  const isAdmin = roles.some((r) => r.id === "admin");
+  }, [loading, users]);
+  const userRoles = authController.user ? defineRolesFor(authController.user) : void 0;
+  const isAdmin = (userRoles ?? []).some((r) => r.id === "admin");
   return {
     loading,
     roles,
@@ -331,7 +343,14 @@ function useBuildUserManagement({
     includeCollectionConfigPermissions: Boolean(includeCollectionConfigPermissions),
     collectionPermissions,
     defineRolesFor,
-    authenticator
+    authenticator,
+    ...authController,
+    initialLoading: authController.initialLoading || loading,
+    userRoles,
+    user: authController.user ? {
+      ...authController.user,
+      roles: userRoles
+    } : null
   };
 }
 const entitiesToUsers = (docs) => {
@@ -386,6 +405,7 @@ const RoleYupSchema = Yup.object().shape({
 });
 function canRoleBeEdited(loggedUser) {
   const loggedUserIsAdmin = loggedUser.roles?.map((r) => r.id).includes("admin");
+  console.log("loggedUserIsAdmin", loggedUser);
   if (!loggedUserIsAdmin) {
     throw new Error("Only admins can edit roles");
   }
@@ -1328,7 +1348,6 @@ function UsersTable({ onUserClicked }) {
     /* @__PURE__ */ jsxs(Table, { className: "w-full", children: [
       /* @__PURE__ */ jsxs(TableHeader, { children: [
         /* @__PURE__ */ jsx(TableCell, { className: "truncate w-16" }),
-        /* @__PURE__ */ jsx(TableCell, { children: "ID" }),
         /* @__PURE__ */ jsx(TableCell, { children: "Email" }),
         /* @__PURE__ */ jsx(TableCell, { children: "Name" }),
         /* @__PURE__ */ jsx(TableCell, { children: "Roles" }),
@@ -1363,7 +1382,6 @@ function UsersTable({ onUserClicked }) {
                     )
                   }
                 ) }),
-                /* @__PURE__ */ jsx(TableCell, { children: user.uid }),
                 /* @__PURE__ */ jsx(TableCell, { children: user.email }),
                 /* @__PURE__ */ jsx(TableCell, { className: "font-medium align-left", children: user.displayName }),
                 /* @__PURE__ */ jsx(TableCell, { className: "align-left", children: userRoles ? /* @__PURE__ */ jsx("div", { className: "flex flex-wrap gap-2", children: userRoles.map(
@@ -1531,7 +1549,7 @@ function IntroWidget({
   return /* @__PURE__ */ jsxs(
     Paper,
     {
-      className: "my-4 flex flex-col px-4 py-6 bg-white dark:bg-slate-800 gap-2",
+      className: "my-4 flex flex-col px-4 py-6 bg-white dark:bg-surface-accent-800 gap-2",
       children: [
         /* @__PURE__ */ jsx(Typography, { variant: "subtitle2", className: "uppercase", children: "Create your users and roles" }),
         /* @__PURE__ */ jsx(Typography, { children: "You have no users or roles defined. You can create default roles and add the current user as admin." }),