@firecms/user_management 3.0.0-canary.117 → 3.0.0-canary.119

package/src/components/roles/RolesDetailsForm.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from "react";
 import * as Yup from "yup";
 
-import { EntityCollection, FieldCaption, Role, toSnakeCase, } from "@firecms/core";
+import { EntityCollection, FieldCaption, Role, toSnakeCase, useAuthController, User, } from "@firecms/core";
 import {
     Button,
     Checkbox,
@@ -30,6 +30,15 @@ export const RoleYupSchema = Yup.object().shape({
     name: Yup.string().required("Required")
 });
 
+function canRoleBeEdited(loggedUser: User) {
+    const loggedUserIsAdmin = loggedUser.roles?.map(r => r.id).includes("admin");
+    if (!loggedUserIsAdmin) {
+        throw new Error("Only admins can edit roles");
+    }
+
+    return true;
+}
+
 export function RolesDetailsForm({
                                      open,
                                      role,
@@ -46,27 +55,39 @@ export function RolesDetailsForm({
 
     const { saveRole } = useUserManagement();
     const isNewRole = !role;
+    const {
+        user: loggedInUser
+    } = useAuthController();
 
     const [savingError, setSavingError] = useState<Error | undefined>();
 
     const onRoleUpdated = useCallback((role: Role) => {
         setSavingError(undefined);
+        if (!loggedInUser) throw new Error("User not found");
+        canRoleBeEdited(loggedInUser);
         return saveRole(role);
-    }, [saveRole]);
+    }, [saveRole, loggedInUser]);
 
     const formex = useCreateFormex({
         initialValues: role ?? {
             name: ""
         } as Role,
         onSubmit: (role: Role, formexController) => {
-            return onRoleUpdated(role)
-                .then(() => {
-                    formexController.resetForm({
-                        values: role
+            try {
+                return onRoleUpdated(role)
+                    .then(() => {
+                        formexController.resetForm({
+                            values: role
+                        });
+                        handleClose();
+                    })
+                    .catch(e => {
+                        setSavingError(e);
                     });
-                    handleClose();
-                })
-                .catch(e => setSavingError(e));
+            } catch (e: any) {
+                setSavingError(e);
+                return Promise.resolve();
+            }
         },
         validation: (values) => {
             return RoleYupSchema.validate(values, { abortEarly: false })
@@ -397,8 +418,8 @@ export function RolesDetailsForm({
                     </DialogContent>
 
                     <DialogActions position={"sticky"}>
-                        {savingError && <Typography className={"text-red-500"}>
-                            There was an error saving this role
+                        {savingError && <Typography className={"text-red-500 dark:text-red-500"}>
+                            {savingError.message ?? "There was an error saving this role"}
                         </Typography>}
                         <Button variant={"text"}
                                 onClick={() => {

package/src/hooks/useBuildUserManagement.tsx

@@ -2,10 +2,18 @@ import React, { useCallback, useEffect } from "react";
 import equal from "react-fast-compare"
 
 import { UserManagement } from "../types";
-import { Authenticator, DataSourceDelegate, Entity, PermissionsBuilder, Role, User } from "@firecms/core";
+import {
+    Authenticator,
+    DataSourceDelegate,
+    Entity,
+    PermissionsBuilder,
+    removeUndefined,
+    Role,
+    User
+} from "@firecms/core";
 import { resolveUserRolePermissions } from "../utils";
 
-type UserWithRoleIds = User & { roles: string[] };
+type UserWithRoleIds = Omit<User, "roles"> & { roles: string[] };
 
 export interface UserManagementParams {
 
@@ -90,7 +98,12 @@ export function useBuildUserManagement({
     useEffect(() => {
         if (!dataSourceDelegate || !rolesPath) return;
         if (dataSourceDelegate.initialised !== undefined && !dataSourceDelegate.initialised) return;
+        if (dataSourceDelegate.authenticated !== undefined && !dataSourceDelegate.authenticated) {
+            setRolesLoading(false);
+            return;
+        }
 
+        setRolesLoading(true);
         return dataSourceDelegate.listenCollection?.({
             path: rolesPath,
             onUpdate(entities: Entity<any>[]): void {
@@ -114,12 +127,17 @@ export function useBuildUserManagement({
             }
         });
 
-    }, [dataSourceDelegate?.initialised, rolesPath]);
+    }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, rolesPath]);
 
     useEffect(() => {
         if (!dataSourceDelegate || !usersPath) return;
         if (dataSourceDelegate.initialised !== undefined && !dataSourceDelegate.initialised) return;
+        if (dataSourceDelegate.authenticated !== undefined && !dataSourceDelegate.authenticated) {
+            setUsersLoading(false);
+            return;
+        }
 
+        setUsersLoading(true);
         return dataSourceDelegate.listenCollection?.({
             path: usersPath,
             onUpdate(entities: Entity<any>[]): void {
@@ -143,7 +161,7 @@ export function useBuildUserManagement({
             }
         });
 
-    }, [dataSourceDelegate?.initialised, usersPath]);
+    }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, usersPath]);
 
     const saveUser = useCallback(async (user: User): Promise<User> => {
         if (!dataSourceDelegate) throw Error("useBuildUserManagement Firebase not initialised");
@@ -154,15 +172,22 @@ export function useBuildUserManagement({
         const roleIds = user.roles?.map(r => r.id);
         const email = user.email?.toLowerCase().trim();
         if (!email) throw Error("Email is required");
+
+        const userExists = users.find(u => u.email?.toLowerCase() === email);
         const data = {
             ...user,
-            roles: roleIds
+            roles: roleIds ?? []
         };
+        if (!userExists) {
+            // @ts-ignore
+            data.created_on = new Date();
+        }
+
         return dataSourceDelegate.saveEntity({
             status: "existing",
             path: usersPath,
             entityId: email,
-            values: data
+            values: removeUndefined(data)
         }).then(() => user);
     }, [usersPath, dataSourceDelegate?.initialised]);
 
@@ -178,7 +203,7 @@ export function useBuildUserManagement({
             status: "existing",
             path: rolesPath,
             entityId: id,
-            values: roleData
+            values: removeUndefined(roleData)
         }).then(() => {
             return;
         });
@@ -243,7 +268,7 @@ export function useBuildUserManagement({
         }
 
         throw Error("Could not find a user with the provided email in the user management system.");
-    }, [loading, users]);
+    }, [loading, users, usersError, rolesError]);
 
     const isAdmin = roles.some(r => r.id === "admin");
 

package/src/utils/permissions.ts

@@ -50,8 +50,9 @@ function resolveCollectionRole(role: Role, id: string): Permissions {
         edit: role.isAdmin || role.defaultPermissions?.edit,
         delete: role.isAdmin || role.defaultPermissions?.delete
     };
-    if (role.collectionPermissions && role.collectionPermissions[id]) {
-        return mergePermissions(role.collectionPermissions[id], basePermissions);
+    const thisCollectionPermissions = role.collectionPermissions?.[id];
+    if (thisCollectionPermissions) {
+        return mergePermissions(thisCollectionPermissions, basePermissions);
     } else if (role.defaultPermissions) {
         return mergePermissions(role.defaultPermissions, basePermissions);
     } else {