Fix: admin assigning + admin login

Author: brelieu05

client/src/components/admin/AddPreview.tsx

@@ -109,25 +109,42 @@ const AddPreview = ({
         }
       }
 
-        const cmResponse = await backend.post(`/caseManagers`, {
-          role: roleDict[userType],
-          firstName: newUser.firstName,
-          lastName: newUser.lastName,
-          phoneNumber: newUser.phoneNumber,
-          email: newUser.email,
-          notes: newUser.notes
-        });
-        
-        const cm_id = cmResponse.data[0].id;
+        try {
+          const cmResponse = await backend.post(`/caseManagers`, {
+            role: roleDict[userType],
+            firstName: newUser.firstName,
+            lastName: newUser.lastName,
+            phoneNumber: newUser.phoneNumber,
+            email: newUser.email,
+            notes: newUser.notes
+          });
 
-        await backend.post(`/locations`, {
-          cmId: cm_id,
-          name: newUser.location,
-          date: new Date(),
-          caloptimaFunded: false,
-        });
+          const cm_id = cmResponse.data[0].id;
 
+          await backend.post(`/locations`, {
+            cmId: cm_id,
+            name: newUser.location,
+            date: new Date(),
+            caloptimaFunded: false,
+          });
+        } catch (e) {
+          console.error(e);
+        }
 
+      if (roleDict[userType] === "admin") {
+        try {
+          await backend.post("/users/invite", {
+            email: newUser.email,
+            role: roleDict[userType],
+            firstName: newUser.firstName,
+            lastName: newUser.lastName,
+            phoneNumber: newUser.phoneNumber,
+          });
+        } catch (e) {
+          console.error(e);
+        }
+      }
+        
         onClose();
 
         toast({
@@ -138,7 +155,7 @@ const AddPreview = ({
           isClosable: true,
         });
 
-        window.location.reload();
+        // window.location.reload();
       } catch (e) {
         console.error(e);
 

client/src/components/admin/ManageAccounts.tsx

@@ -37,6 +37,7 @@ import {
 import { MdFileUpload, MdOutlineManageSearch } from "react-icons/md";
 
 import { useBackendContext } from "../../contexts/hooks/useBackendContext";
+import { useAuthContext } from "../../contexts/hooks/useAuthContext";
 import { downloadCSV } from "../../utils/downloadCSV.ts";
 import { HoverCheckbox } from "../hoverCheckbox/hoverCheckbox.tsx";
 import EditClient from "../userSettings/EditClient";
@@ -64,6 +65,8 @@ export type RoleKey = keyof typeof roles_dict;
 
 export const ManageAccounts = () => {
   const { backend } = useBackendContext();
+  const { currentUser } = useAuthContext();
+  const currentUserEmail = currentUser?.email ?? null;
 
   const [persons, setPersons] = useState<
     (Person & { isChecked: boolean; isHovered: boolean })[]
@@ -282,20 +285,32 @@ export const ManageAccounts = () => {
       try {
         if (view === "admin") {
           const response = await backend.get("/admin/admins");
-          setPersons(response.data);
+          setPersons(
+            (response.data || []).filter(
+              (person: Person) => person.email !== currentUserEmail
+            )
+          );
         } else if (view === "cms") {
           const response = await backend.get("/admin/caseManagers");
-          setPersons(response.data);
+          setPersons(
+            (response.data || []).filter(
+              (person: Person) => person.email !== currentUserEmail
+            )
+          );
         } else {
           const response = await backend.get("/admin/clients");
-          setPersons(response.data);
+          setPersons(
+            (response.data || []).filter(
+              (person: Person) => person.email !== currentUserEmail
+            )
+          );
         }
       } catch (error) {
         console.error("Error fetching client data: ", error);
       }
     };
     fetchData();
-  }, [view, backend, setPersons]);
+  }, [view, backend, setPersons, currentUserEmail]);
 
   return (
     <VStack

server/routes/users.ts

@@ -73,9 +73,15 @@ usersRouter.delete("/email/:email", async (req, res) => {
       email,
     ]);
 
-    const userRecord = await admin.auth().getUserByEmail(email);
-    const uid = userRecord.uid;
-    await admin.auth().deleteUser(uid);
+    // Only try to delete from Firebase if the user exists there
+    try {
+      const userRecord = await admin.auth().getUserByEmail(email);
+      const uid = userRecord.uid;
+      await admin.auth().deleteUser(uid);
+    } catch (firebaseError) {
+      // If user doesn't exist in Firebase, that's okay - they might be a placeholder user
+      console.log(`User ${email} not found in Firebase, skipping Firebase deletion`);
+    }
 
     res.status(200).json(keysToCamel(user));
   } catch (err) {
@@ -103,11 +109,11 @@ usersRouter.post("/create", async (req, res) => {
 // Create user with invitation
 usersRouter.post("/invite", async (req, res) => {
   try {
-    const { email, role } = req.body;
+    const { email, role, firstName, lastName, phoneNumber } = req.body;
 
     const user = await db.query(
-      "INSERT INTO users (email, role) VALUES ($1, $2) RETURNING *",
-      [email, role]
+      "INSERT INTO users (email, role, first_name, last_name, phone_number) VALUES ($1, $2, $3, $4, $5) RETURNING *",
+      [email, role, firstName, lastName, phoneNumber]
     );
 
     res.status(200).json(keysToCamel(user));