From bb6c48300cd5dea83b0d4621687cb49d83217dc4 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 21 Apr 2025 17:35:42 +0530
Subject: [PATCH] Fixes error where it was showing multiple error in login and
 forget page

---
 .../authentication/ForgotPasswordPage.jsx     |  8 ++++--
 src/pages/authentication/LoginPage.jsx        |  1 +
 src/utils/axiosClient.jsx                     | 26 +++++++++++--------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/pages/authentication/ForgotPasswordPage.jsx b/src/pages/authentication/ForgotPasswordPage.jsx
index 2a3ab64c..6dc9219c 100644
--- a/src/pages/authentication/ForgotPasswordPage.jsx
+++ b/src/pages/authentication/ForgotPasswordPage.jsx
@@ -35,13 +35,17 @@ const ForgotPasswordPage = () => {
       setLoading(true)
       const response = await  AuthRepository.forgotPassword(data)
       if ( response.data && response.success )
-      showToast( response.message, "success" )    
+      showToast( "verification email has been sent to your registered email address", "success" )    
       reset()
       setLoading( false )
     } catch ( err )
     {
+        if(err.response.status === 404){
+          showToast( "verification email has been sent to your registered email address", "success" )  
+        }else{
+          showToast("Something wrong","error")
+        }
       
-      showToast( err.message, "error" )
       setLoading(false)
     }
   }
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx
index 84b46aeb..92d03ba6 100644
--- a/src/pages/authentication/LoginPage.jsx
+++ b/src/pages/authentication/LoginPage.jsx
@@ -44,6 +44,7 @@ const LoginPage = () => {
       setLoading(false);
       navigate("/dashboard");
     } catch (err) {
+       showToast("Invalid username or password.","error")
       console.log("Unable to proceed. Please try again.");
       setLoading(false);
     }
diff --git a/src/utils/axiosClient.jsx b/src/utils/axiosClient.jsx
index 527ec140..80d2d34e 100644
--- a/src/utils/axiosClient.jsx
+++ b/src/utils/axiosClient.jsx
@@ -11,7 +11,6 @@ export const axiosClient = axios.create({
     "Content-Type": "application/json", // Specify the content type
   },
 });
-
 axiosRetry(axiosClient, { retries: 3 });
 
 // Request interceptor to add Bearer token
@@ -21,6 +20,10 @@ axiosClient.interceptors.request.use(
       const token = localStorage.getItem("jwtToken");
       if (token) {
         config.headers["Authorization"] = `Bearer ${token}`;
+        config._retry = true;
+      }
+      else{
+        config._retry = false;
       }
     }
     return config;
@@ -32,7 +35,9 @@ axiosClient.interceptors.request.use(
 // Add an interceptor to handle expired tokens
 axiosClient.interceptors.response.use(
   (response) => response,
+
   async (error) => {
+
     const originalRequest = error.config;
 
     if (!originalRequest) {
@@ -80,13 +85,12 @@ axiosClient.interceptors.response.use(
         if (error.config.url.indexOf("refresh-token") != -1) {
           //showToast("Server is unreachable. Try again later!", "error");
           console.log("4 - error fetching refresh token :", error);
-        } else {
-          showToast(error.response.data.message, "error");
-        }
-
+        } 
+        // else {
+        //   // showToast(error.response.data.message, "error");  // repeted toast
+        // }
         if (error.response.status === 401 && !originalRequest._retry) {
           originalRequest._retry = true;
-
           try {
             // Get the refresh token from secure storage
             const refreshToken = localStorage.getItem("refreshToken");
@@ -129,11 +133,11 @@ axiosClient.interceptors.response.use(
             //showToast("Server is unreachable. Try again later!", "error");
             console.log("6 - error fetching refresh token :", error);
           }
-          showToast(
-            error.response.data?.message ||
-              "An error occurred. Please try again.",
-            "error"
-          );
+          // showToast(
+          //   error.response.data?.message ||
+          //     "An error occurred. Please try again.",
+          //   "error"
+          // );
         }
       } else {
         console.error("An unknown error occurred:", error.message);
-- 
2.43.0