undo authRoutes changes

Author: tonyqiu123

backend/typescript/rest/authRoutes.ts

@@ -43,7 +43,7 @@ authRouter.post("/login", loginRequestValidator, async (req, res) => {
       .cookie("refreshToken", refreshToken, cookieOptions)
       .status(200)
       .json(rest);
-  } catch (error: unknown) {
+  } catch (error) {
     res.status(500).json({ error: getErrorMessage(error) });
   }
 });
@@ -55,22 +55,28 @@ 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)
           .json(rest);
       }
-    } catch (error: unknown) {
+    } catch (error) {
       if (error instanceof NotFoundError) {
         res.status(404).send(getErrorMessage(error));
       } else {
         res.status(500).json({ error: getErrorMessage(error) });
       }
     }
-  },
+  }
 );
 
 /* Returns access token in response body and sets refreshToken as an httpOnly cookie */
@@ -82,7 +88,7 @@ authRouter.post("/refresh", async (req, res) => {
       .cookie("refreshToken", token.refreshToken, cookieOptions)
       .status(200)
       .json({ accessToken: token.accessToken });
-  } catch (error: unknown) {
+  } catch (error) {
     res.status(500).json({ error: getErrorMessage(error) });
   }
 });
@@ -95,10 +101,10 @@ authRouter.post(
     try {
       await authService.revokeTokens(req.params.userId);
       res.status(204).send();
-    } catch (error: unknown) {
+    } catch (error) {
       res.status(500).json({ error: getErrorMessage(error) });
     }
-  },
+  }
 );
 
 /* Emails a password reset link to the user with the specified email */
@@ -109,10 +115,10 @@ authRouter.post(
     try {
       await authService.resetPassword(req.params.email);
       res.status(204).send();
-    } catch (error: unknown) {
+    } catch (error) {
       res.status(500).json({ error: getErrorMessage(error) });
     }
-  },
+  }
 );
 
 // updates user password and updates status
@@ -123,7 +129,7 @@ authRouter.post(
     try {
       const responseSuccess = await authService.setPassword(
         req.params.email,
-        req.body.newPassword,
+        req.body.newPassword
       );
       if (responseSuccess.success) {
         const user = await userService.getUserByEmail(req.params.email);
@@ -137,18 +143,18 @@ authRouter.post(
       } else {
         res.status(400).json(responseSuccess);
       }
-    } catch (error: unknown) {
+    } catch (error) {
       res.status(500).json({ error: getErrorMessage(error) });
     }
-  },
+  }
 );
 
 /* Invite a user */
 authRouter.post("/invite-user", inviteUserDtoValidator, async (req, res) => {
   try {
     if (
       !isAuthorizedByRole(
-        new Set([Role.ADMINISTRATOR, Role.ANIMAL_BEHAVIOURIST]),
+        new Set([Role.ADMINISTRATOR, Role.ANIMAL_BEHAVIOURIST])
       )
     ) {
       res
@@ -175,7 +181,7 @@ authRouter.post("/invite-user", inviteUserDtoValidator, async (req, res) => {
     await userService.updateUserById(user.id, invitedUser);
 
     res.status(204).send();
-  } catch (error: unknown) {
+  } catch (error) {
     if (error instanceof NotFoundError) {
       res.status(404).send(getErrorMessage(error));
     } else {