Fixes error where it was showing multiple error in login and forget page #45
@ -35,13 +35,17 @@ const ForgotPasswordPage = () => {
|
|||||||
setLoading(true)
|
setLoading(true)
|
||||||
const response = await AuthRepository.forgotPassword(data)
|
const response = await AuthRepository.forgotPassword(data)
|
||||||
if ( response.data && response.success )
|
if ( response.data && response.success )
|
||||||
showToast( response.message, "success" )
|
showToast( "verification email has been sent to your registered email address", "success" )
|
||||||
reset()
|
reset()
|
||||||
setLoading( false )
|
setLoading( false )
|
||||||
} catch ( err )
|
} 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)
|
setLoading(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,6 +44,7 @@ const LoginPage = () => {
|
|||||||
setLoading(false);
|
setLoading(false);
|
||||||
navigate("/dashboard");
|
navigate("/dashboard");
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
showToast("Invalid username or password.","error")
|
||||||
console.log("Unable to proceed. Please try again.");
|
console.log("Unable to proceed. Please try again.");
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,7 +11,6 @@ export const axiosClient = axios.create({
|
|||||||
"Content-Type": "application/json", // Specify the content type
|
"Content-Type": "application/json", // Specify the content type
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
axiosRetry(axiosClient, { retries: 3 });
|
axiosRetry(axiosClient, { retries: 3 });
|
||||||
|
|
||||||
// Request interceptor to add Bearer token
|
// Request interceptor to add Bearer token
|
||||||
@ -21,6 +20,10 @@ axiosClient.interceptors.request.use(
|
|||||||
const token = localStorage.getItem("jwtToken");
|
const token = localStorage.getItem("jwtToken");
|
||||||
if (token) {
|
if (token) {
|
||||||
config.headers["Authorization"] = `Bearer ${token}`;
|
config.headers["Authorization"] = `Bearer ${token}`;
|
||||||
|
config._retry = true;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
config._retry = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return config;
|
return config;
|
||||||
@ -32,7 +35,9 @@ axiosClient.interceptors.request.use(
|
|||||||
// Add an interceptor to handle expired tokens
|
// Add an interceptor to handle expired tokens
|
||||||
axiosClient.interceptors.response.use(
|
axiosClient.interceptors.response.use(
|
||||||
(response) => response,
|
(response) => response,
|
||||||
|
|
||||||
async (error) => {
|
async (error) => {
|
||||||
|
|
||||||
const originalRequest = error.config;
|
const originalRequest = error.config;
|
||||||
|
|
||||||
if (!originalRequest) {
|
if (!originalRequest) {
|
||||||
@ -80,13 +85,12 @@ axiosClient.interceptors.response.use(
|
|||||||
if (error.config.url.indexOf("refresh-token") != -1) {
|
if (error.config.url.indexOf("refresh-token") != -1) {
|
||||||
//showToast("Server is unreachable. Try again later!", "error");
|
//showToast("Server is unreachable. Try again later!", "error");
|
||||||
console.log("4 - error fetching refresh token :", 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) {
|
if (error.response.status === 401 && !originalRequest._retry) {
|
||||||
originalRequest._retry = true;
|
originalRequest._retry = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Get the refresh token from secure storage
|
// Get the refresh token from secure storage
|
||||||
const refreshToken = localStorage.getItem("refreshToken");
|
const refreshToken = localStorage.getItem("refreshToken");
|
||||||
@ -129,11 +133,11 @@ axiosClient.interceptors.response.use(
|
|||||||
//showToast("Server is unreachable. Try again later!", "error");
|
//showToast("Server is unreachable. Try again later!", "error");
|
||||||
console.log("6 - error fetching refresh token :", error);
|
console.log("6 - error fetching refresh token :", error);
|
||||||
}
|
}
|
||||||
showToast(
|
// showToast(
|
||||||
error.response.data?.message ||
|
// error.response.data?.message ||
|
||||||
"An error occurred. Please try again.",
|
// "An error occurred. Please try again.",
|
||||||
"error"
|
// "error"
|
||||||
);
|
// );
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.error("An unknown error occurred:", error.message);
|
console.error("An unknown error occurred:", error.message);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user