fix error handling for signin and signup

Author: Kurtyjlee

peerprep-fe/src/app/signin/page.tsx

@@ -35,22 +35,29 @@ export default function LoginForm({ searchParams }: Props) {
   const handleLogin = async (e: React.FormEvent) => {
     e.preventDefault();
     setError('');
-    const result = await axiosClient.post('/auth/login', {
-      email: email,
-      password: password,
-    });
 
-    const data = result.data.data;
-    if (result.status === 200) {
-      const token = data.accessToken;
-      const res = await login(token);
-      if (res) {
-        setAuth(true, token, data);
-        router.push('/');
-        return;
+    try {
+      const result = await axiosClient.post('/auth/login', {
+        email: email,
+        password: password,
+      });
+
+      const data = result.data.data;
+      if (result.status === 200) {
+        const token = data.accessToken;
+        const res = await login(token);
+        if (res) {
+          setAuth(true, token, data);
+          router.push('/');
+          return;
+        }
       }
+    } catch (error: unknown) {
+      const message =
+        (error as { response?: { data?: { message?: string } } })?.response
+          ?.data?.message || 'Please provide correct email and password';
+      setError(message);
     }
-    setError(data.error || 'Please provide correct email and password');
   };
 
   const handleGithubLogin = () => {

peerprep-fe/src/app/signup/page.tsx

@@ -26,36 +26,51 @@ export default function SignUpPage() {
 
     // const type = 'user';
     if (password !== confirmPassword) {
-      router.push('/signup');
       setError('Passwords do not match');
       return;
     }
-    const result = await axiosClient.post('/users', {
-      username: name,
-      email: email,
-      password: password,
-    });
 
-    if (result.request.status === 201) {
+    if (!agreeTerms) {
+      setError('Please agree to the Terms of Service and Privacy Policy');
+      return;
+    }
+
+    try {
+      const result = await axiosClient.post('/users', {
+        username: name,
+        email: email,
+        password: password,
+      });
+
+      if (result.request.status !== 201) {
+        setError('Username or Email already exists');
+        return;
+      }
+
       // Auto login after account creation
       const loginResult = await axiosClient.post('/auth/login', {
         email: email,
         password: password,
       });
+      if (loginResult.request.status !== 200) {
+        setError('Unable to login');
+        return;
+      }
+
       const data = loginResult.data.data;
-      if (loginResult.status === 200) {
-        const token = data.accessToken;
-        const res = await login(token);
-        if (res) {
-          setAuth(true, token, data);
-          router.push('/');
-          return;
-        }
+
+      const token = data.accessToken;
+      const res = await login(token);
+      if (res) {
+        setAuth(true, token, data);
+        router.push('/');
+        return;
       }
-      setError(data.error || 'Unable to create account');
-    } else {
-      setError('Username or Email already exists');
-      console.error('Sign up failed');
+    } catch (error: unknown) {
+      const message =
+        (error as { response?: { data?: { message?: string } } })?.response
+          ?.data?.message || 'Username or Email already exists';
+      setError(message);
     }
   };