Fix email verification routes

CS3219-AY2425S1 · Oct 28, 2024 · f79e30c · f79e30c
1 parent 9d79002
commit f79e30c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -69,10 +69,10 @@ function App() {
             <Route index element={<Navigate to="/auth/login" />} />
             <Route path="signup" element={<SignUp />} />
             <Route path="login" element={<LogIn />} />
-            <Route
-              path="verifyEmail/:userId?"
-              element={<EmailVerification />}
-            />
+            <Route path="verify-email">
+              <Route index element={<EmailVerification />} />
+              <Route path=":userId" element={<EmailVerification />} />
+            </Route>
             <Route path="forget-password" element={<ForgetPassword />} />
             <Route path="*" element={<Navigate to="/auth/login" />} />
           </Route>

diff --git a/frontend/src/contexts/AuthContext.tsx b/frontend/src/contexts/AuthContext.tsx
@@ -66,7 +66,7 @@ const AuthProvider: React.FC<{ children?: React.ReactNode }> = (props) => {
       })
       .then(() => userClient.post("users/send-verification-email", { email }))
       .then((res) => {
-        navigate(`/auth/verifyEmail/${res.data.data.id}`);
+        navigate(`/auth/verify-email/${res.data.data.id}`);
       })
       .catch((err) => {
         setUser(null);
@@ -88,7 +88,7 @@ const AuthProvider: React.FC<{ children?: React.ReactNode }> = (props) => {
       })
       .catch((err) => {
         if (err.response?.data.message === "User not verified.") {
-          navigate(`/auth/verifyEmail`);
+          navigate(`/auth/verify-email`);
         }
         setUser(null);
         toast.error(err.response?.data.message || err.message);