Added Api
parent
13b80b143e
commit
5bbfdb3945
|
|
@ -64,8 +64,9 @@ function LoginForm() {
|
|||
onSuccess: (res: any | string) => {
|
||||
router.push("/Verify");
|
||||
localStorage.setItem("VerifyRole", "citizen");
|
||||
localStorage.setItem("verificationToken", res);
|
||||
localStorage.setItem("verificationToken", res.data);
|
||||
localStorage.setItem(appConstants.SH_CT_OTP_TOKEN,res.data);
|
||||
console.log(res);
|
||||
console.log(res.data);
|
||||
},
|
||||
onError: (err: any | string) => {
|
||||
|
|
|
|||
|
|
@ -26,29 +26,25 @@ export const VerifyInput = () => {
|
|||
const CitizenVerifyMutation = useMutation({
|
||||
mutationFn: verifyCitizen,
|
||||
onSuccess: (res) => {
|
||||
router.push("/RecentRequest");
|
||||
console.log("justLogin");
|
||||
saveToken(true);
|
||||
const decodedToken = jwtDecode<any>(res.data.jwtToken);
|
||||
setCookie("Shahrbin_Token", res.data.jwtToken);
|
||||
setCookie("Shahrbin_Refresh_Token", res.data.refreshToken);
|
||||
const userRole =
|
||||
decodedToken[
|
||||
"http://schemas.microsoft.com/ws/2008/06/identity/claims/role"
|
||||
];
|
||||
localStorage.setItem("Shahrbin_Role", userRole);
|
||||
const justLogin = localStorage.getItem("Shahrbin_Login_State");
|
||||
|
||||
// saveToken(true);
|
||||
// const decodedToken = jwtDecode<any>(res.jwtToken);
|
||||
// setCookie("Shahrbin_Token", res.jwtToken);
|
||||
// setCookie("Shahrbin_Refresh_Token", res.refreshToken);
|
||||
// const userRole =
|
||||
// decodedToken[
|
||||
// "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"
|
||||
// ];
|
||||
// localStorage.setItem("Shahrbin_Role", userRole);
|
||||
// const justLogin = localStorage.getItem("Shahrbin_Login_State");
|
||||
|
||||
// if (justLogin) {
|
||||
// // router.push("/Account/Complaints");
|
||||
// router.push("/RecentRequest");
|
||||
// localStorage.removeItem("Shahrbin_Login_State");
|
||||
// console.log("justLogin");
|
||||
// } else {
|
||||
// console.log("Dont justLogin");
|
||||
// // router.push("/RequestStep1");
|
||||
// }
|
||||
if (justLogin) {
|
||||
router.push("/User/RecentRequest");
|
||||
localStorage.removeItem("Shahrbin_Login_State");
|
||||
console.log("justLogin");
|
||||
} else {
|
||||
console.log("Dont justLogin");
|
||||
router.push("/User/RecentRequest");
|
||||
}
|
||||
},
|
||||
onError: (err: any | string) => {
|
||||
console.log("Dont Login");
|
||||
|
|
@ -59,9 +55,9 @@ export const VerifyInput = () => {
|
|||
},
|
||||
});
|
||||
|
||||
// useEffect(() => {
|
||||
// useData.persist.rehydrate();
|
||||
// }, []);
|
||||
useEffect(() => {
|
||||
useData.persist.rehydrate();
|
||||
}, []);
|
||||
|
||||
// SH....
|
||||
const resendOtpMutation = useMutation({
|
||||
|
|
|
|||
|
|
@ -3,3 +3,4 @@ import { cache } from "react";
|
|||
|
||||
const getQueryClient = cache(() => new QueryClient());
|
||||
export default getQueryClient;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
import axios from "axios";
|
||||
import { toast } from "sonner";
|
||||
|
||||
const api = axios.create({ baseURL: "https://shahrbinapi.shetabdahi.ir/" });
|
||||
|
||||
api.interceptors.response.use(
|
||||
function (response) {
|
||||
console.log(response);
|
||||
console.log(response.data?.data);
|
||||
if (response.status == 200 || response.status == 201) {
|
||||
if (response.data?.message) {
|
||||
toast.success(response.data?.message);
|
||||
}
|
||||
}
|
||||
return response;
|
||||
},
|
||||
function (error) {
|
||||
console.log(error);
|
||||
toast.error("مشکلی پیش آمد.");
|
||||
return Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
||||
export default api;
|
||||
|
|
@ -8,6 +8,74 @@ import {
|
|||
const instance = { id: 1 };
|
||||
|
||||
axios.defaults.baseURL = process.env.NEXT_PUBLIC_BASE_URL_APP;
|
||||
let isRefreshing = false;
|
||||
|
||||
|
||||
axios.interceptors.response.use(
|
||||
(response) => {
|
||||
return response;
|
||||
},
|
||||
async function (error) {
|
||||
console.log(error);
|
||||
const originalRequest = error.config;
|
||||
|
||||
if (error.response.status === 401) {
|
||||
if (!originalRequest._retry) {
|
||||
originalRequest._retry = true;
|
||||
const accessToken = getCookie("Shahrbin_Token");
|
||||
const refreshToken = getCookie("Shahrbin_Refresh_Token");
|
||||
//accessToken && refreshToken && !isRefreshing
|
||||
if (!isRefreshing) {
|
||||
isRefreshing = true;
|
||||
|
||||
try {
|
||||
// Perform token refresh
|
||||
const data = await RefreshToken({
|
||||
token: accessToken,
|
||||
refreshToken: refreshToken,
|
||||
});
|
||||
|
||||
// Retry the original request
|
||||
return axios(originalRequest);
|
||||
} catch (refreshError) {
|
||||
console.error("Token refresh failed", refreshError);
|
||||
// Handle refresh error, e.g., redirect to login page
|
||||
return Promise.reject(refreshError);
|
||||
} finally {
|
||||
isRefreshing = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// For other errors or if refresh token logic is not applicable
|
||||
return Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
export async function RefreshToken(payload: { token: any; refreshToken: any }) {
|
||||
try {
|
||||
const response = await axios.post("api/Authenticate/Refresh", payload);
|
||||
setCookie("Shahrbin_Token", response.data.jwtToken);
|
||||
setCookie("Shahrbin_Refresh_Token", response.data.refreshToken);
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
deleteCookie("Shahrbin_Token");
|
||||
deleteCookie("Shahrbin_Refresh_Token");
|
||||
window.location.href = "/";
|
||||
}
|
||||
}
|
||||
|
||||
export async function revoke(payload: {
|
||||
refreshToken: string | CookieValueTypes;
|
||||
}) {
|
||||
const token = getCookie("Shahrbin_Token");
|
||||
const data = await axios.post("api/Authenticate/Revoke", payload, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
});
|
||||
return data.data;
|
||||
}
|
||||
|
||||
|
||||
export async function logisterCitizen(payload: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue