Merge pull request #56 from uwblueprint/S24/sayi/connect-email-form

S24/sayi/connect email form

Author: JustinScitech

backend/typescript/rest/authRoutes.ts

@@ -57,9 +57,16 @@ authRouter.post(
   async (req, res) => {
     try {
       if (isAuthorizedByEmail(req.body.email)) {
-        const userDTO = await userService.getUserByEmail(req.body.email);
-        const rest = { ...{ accessToken: req.body.accessToken }, ...userDTO };
+        const user = await userService.getUserByEmail(req.body.email);
 
+        const activatedUser = user;
+        activatedUser.status = UserStatus.ACTIVE;
+        await userService.updateUserById(user.id, activatedUser);
+
+        const rest = {
+          ...{ accessToken: req.body.accessToken },
+          ...activatedUser,
+        };
         res
           .cookie("refreshToken", req.body.refreshToken, cookieOptions)
           .status(200)

frontend/src/APIClients/UserAPIClient.ts

@@ -14,7 +14,11 @@ const get = async (): Promise<User[]> => {
     });
     return data;
   } catch (error) {
-    throw new Error(`Failed to get entity: ${error}`);
+    throw new Error(
+      `Failed to get users. ${
+        error instanceof Error ? error.message : "Unknown error occured."
+      }`,
+    );
   }
 };
 
@@ -33,4 +37,22 @@ const create = async (formData: CreateUserDTO): Promise<CreateUserDTO> => {
   }
 };
 
-export default { get, create };
+const invite = async (email: string): Promise<void> => {
+  const bearerToken = `Bearer ${getLocalStorageObjProperty(
+    AUTHENTICATED_USER_KEY,
+    "accessToken",
+  )}`;
+  try {
+    await baseAPIClient.post(
+      "/auth/invite-user",
+      { email },
+      {
+        headers: { Authorization: bearerToken },
+      },
+    );
+  } catch (error) {
+    throw new Error(`Failed to invite user with email '${email}'`);
+  }
+};
+
+export default { get, create, invite };

frontend/src/components/pages/UserManagementPage.tsx

@@ -32,6 +32,7 @@ const handleUserSubmit = async (formData: AddUserRequest) => {
         | "Staff"
         | "Volunteer",
     });
+    await UserAPIClient.invite(formData.email);
   } catch (error) {
     throw error;
   }
@@ -50,7 +51,7 @@ const UserManagementPage = (): React.ReactElement => {
         setUsers(fetchedUsers);
       }
     } catch (error) {
-      setErrorMessage(`Failed to get users: ${error}`);
+      setErrorMessage(`${error}`);
     }
   };