Update error handling

UofT-Frosh-Orientation · Aug 15, 2023 · c6739f8 · c6739f8
1 parent 3f12df5
commit c6739f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/client/src/state/user/saga.jsx b/client/src/state/user/saga.jsx
@@ -39,16 +39,9 @@ export function* loginSaga({ payload: { setSnackbar, setIsLoading, email, passwo
     const result = yield call(axios.post, '/user/login', { email, password });
     yield put(loginSuccess(result.data.user));
   } catch (error) {
-    setSnackbar(
-      error.response?.data?.message
-        ? error.response?.data?.message.toString()
-        : error.response?.data
-        ? error.response?.data.toString()
-        : error.toString(),
-      true,
-    );
+    setSnackbar(error.response?.data?.errorMessage, true);
     setIsLoading(false);
-    yield put(loginFail(error.response.data));
+    yield put(loginFail(error.response?.data?.errorMessage));
   }
 }
 
@@ -110,16 +103,9 @@ export function* createUserSaga({ payload: { setSnackbar, setIsLoading, user } }
     const result = yield call(axios.post, '/user/signup', user);
     yield put(signupSuccess(result.data.user));
   } catch (error) {
-    setSnackbar(
-      error.response?.data?.message
-        ? error.response?.data?.message.toString()
-        : error.response?.data
-        ? error.response?.data.toString()
-        : error.toString(),
-      true,
-    );
+    setSnackbar(error.response?.data?.errorMessage, true);
     setIsLoading(false);
-    yield put(signupFail(error.response.data));
+    yield put(signupFail(error.response?.data?.errorMessage));
   }
 }
 

diff --git a/server/src/controllers/UserController.js b/server/src/controllers/UserController.js
@@ -73,10 +73,12 @@ const UserController = {
     passport.authenticate('local', (err, user) => {
       if (err || !user) {
         //req.log.info("Incorrect Email and Password entered by user");
-        res.status(403).send({ message: 'Please ensure your email and password are correct.' });
+        res
+          .status(403)
+          .send({ errorMessage: 'Please ensure your email and password are correct.' });
       } else if (!user.confirmedEmail) {
         // req.log.error(err, "Attempt to login with unverified email");
-        res.status(403).send({ message: 'Please ensure that you have verified your email.' });
+        res.status(403).send({ errorMessage: 'Please ensure that you have verified your email.' });
       } else {
         req.logIn(user, (err) => {
           if (err) {