@firecms/user_management 3.0.0-beta.13 → 3.0.0-beta.15

package/dist/types/user_management.d.ts

@@ -32,4 +32,9 @@ export type UserManagement<USER extends User = User> = {
     defineRolesFor: (user: User) => Promise<Role[] | undefined> | Role[] | undefined;
     rolesError?: Error;
     usersError?: Error;
+    /**
+     * Function to get a user by uid.
+     * @param uid
+     */
+    getUser: (uid: string) => User | null;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/user_management",
   "type": "module",
-  "version": "3.0.0-beta.13",
+  "version": "3.0.0-beta.15",
   "publishConfig": {
     "access": "public"
   },
@@ -29,9 +29,9 @@
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/core": "^3.0.0-beta.13",
-    "@firecms/formex": "^3.0.0-beta.13",
-    "@firecms/ui": "^3.0.0-beta.13",
+    "@firecms/core": "^3.0.0-beta.15",
+    "@firecms/formex": "^3.0.0-beta.15",
+    "@firecms/ui": "^3.0.0-beta.15",
     "date-fns": "^3.6.0"
   },
   "peerDependencies": {
@@ -57,5 +57,5 @@
     "src",
     "bin"
   ],
-  "gitHead": "26d5e1f33a7ac00c78e45cd3cb3c397f4ba00821"
+  "gitHead": "0abe2ca034f396e389db595f07ef4b24b439c648"
 }

package/src/components/roles/RolesDetailsForm.tsx

@@ -425,6 +425,7 @@ export function RolesDetailsForm({
                             {savingError.message ?? "There was an error saving this role"}
                         </Typography>}
                         <Button variant={"text"}
+                                color={"primary"}
                                 onClick={() => {
                                     handleClose();
                                 }}>
@@ -436,7 +437,6 @@ export function RolesDetailsForm({
                             type="submit"
                             disabled={!dirty}
                             loading={isSubmitting}
-                            startIcon={<CheckIcon/>}
                         >
                             {isNewRole ? "Create role" : "Update"}
                         </LoadingButton>

package/src/components/users/UserDetailsForm.tsx

@@ -205,6 +205,7 @@ export function UserDetailsForm({
                     <DialogActions>
 
                         <Button variant={"text"}
+                                color={"primary"}
                                 onClick={() => {
                                     handleClose();
                                 }}>
@@ -217,7 +218,6 @@ export function UserDetailsForm({
                             type="submit"
                             disabled={!dirty}
                             loading={isSubmitting}
-                            startIcon={<CheckIcon/>}
                         >
                             {isNewUser ? "Create user" : "Update"}
                         </LoadingButton>

package/src/hooks/useBuildUserManagement.tsx

@@ -186,6 +186,22 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
             // @ts-ignore
             data.created_on = new Date();
         }
+        // delete the previous user entry if it exists and the uid has changed
+        if (userExists && userExists.uid !== user.uid) {
+            const entity: Entity<any> = {
+                values: {},
+                path: usersPath,
+                id: userExists.uid
+            }
+            await dataSourceDelegate.deleteEntity({ entity })
+                .then(() => {
+                    console.debug("Deleted previous user", userExists);
+                })
+                .catch(e => {
+                    console.error("Error deleting user", e);
+                });
+
+        }
 
         return dataSourceDelegate.saveEntity({
             status: "existing",
@@ -259,9 +275,14 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
     }, [roles, usersWithRoleIds]);
 
     const authenticator: Authenticator<USER> = useCallback(({ user }) => {
+
         if (loading) {
             return false;
         }
+        if (user === null) {
+            console.warn("User is null, returning");
+            return false;
+        }
 
         if (users.length === 0) {
             console.warn("No users created yet");
@@ -270,6 +291,18 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
 
         const mgmtUser = users.find(u => u.email?.toLowerCase() === user?.email?.toLowerCase());
         if (mgmtUser) {
+            // check if the uid is updated in the user management system
+            if (mgmtUser.uid !== user.uid) {
+                console.warn("User uid has changed, updating user in user management system");
+                saveUser({
+                    ...mgmtUser,
+                    uid: user.uid
+                }).then(() => {
+                    console.debug("User updated in user management system", mgmtUser);
+                }).catch(e => {
+                    console.error("Error updating user in user management system", e);
+                });
+            }
             console.debug("User found in user management system", mgmtUser);
             return true;
         }
@@ -286,6 +319,12 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
         authController.setUserRoles?.(userRoles ?? []);
     }, [userRoleIds]);
 
+    const getUser = useCallback((uid: string): USER | null => {
+        if (!users) return null;
+        const user = users.find(u => u.uid === uid);
+        return user ?? null;
+    }, [users]);
+
     return {
         loading,
         roles,
@@ -305,6 +344,7 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
         ...authController,
         initialLoading: authController.initialLoading || loading,
         userRoles: userRoles,
+        getUser,
         user: authController.user ? {
             ...authController.user,
             roles: userRoles

package/src/types/user_management.tsx

@@ -44,4 +44,10 @@ export type UserManagement<USER extends User = User> = {
     rolesError?: Error;
     usersError?: Error;
 
+    /**
+     * Function to get a user by uid.
+     * @param uid
+     */
+    getUser: (uid: string) => User | null;
+
 };