Merge branch 'samandar' into 'dev'
401 error See merge request azizziy/cpost!54
This commit is contained in:
@@ -55,8 +55,11 @@ export const AuthContextProvider = (props: { children: React.ReactNode }) => {
|
|||||||
// phone: '99894444444444444',
|
// phone: '99894444444444444',
|
||||||
// },
|
// },
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err: any) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
|
if (err.response.status === 401) {
|
||||||
|
auth_service.logout();
|
||||||
|
}
|
||||||
setState({
|
setState({
|
||||||
isAuth: true,
|
isAuth: true,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import axios, { AxiosInstance, AxiosRequestConfig, AxiosError } from 'axios';
|
|
||||||
import { getCookie, deleteCookie } from 'cookies-next';
|
|
||||||
import { useRouter } from 'next/router';
|
|
||||||
import { BASE_URI } from '@/helpers/constants';
|
import { BASE_URI } from '@/helpers/constants';
|
||||||
|
import { auth_service } from '@/services/auth';
|
||||||
|
import axios, { AxiosError, AxiosInstance } from 'axios';
|
||||||
|
import { useRouter } from 'next/router';
|
||||||
|
|
||||||
const authRequest: AxiosInstance = axios.create({
|
const authRequest: AxiosInstance = axios.create({
|
||||||
baseURL: BASE_URI,
|
baseURL: BASE_URI,
|
||||||
@@ -27,6 +27,7 @@ authRequest.interceptors.response.use(
|
|||||||
(error: AxiosError) => {
|
(error: AxiosError) => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
if (error.response && error.response.status === 401) {
|
if (error.response && error.response.status === 401) {
|
||||||
|
auth_service.logout();
|
||||||
localStorage.removeItem('token');
|
localStorage.removeItem('token');
|
||||||
router.push('/login');
|
router.push('/login');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import axios, { AxiosInstance, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
|
|
||||||
import { BASE_URL } from '@/helpers/constants';
|
import { BASE_URL } from '@/helpers/constants';
|
||||||
|
import { auth_service } from '@/services/auth';
|
||||||
|
import axios, { AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
|
||||||
|
|
||||||
const myAxios: AxiosInstance = axios.create({
|
const myAxios: AxiosInstance = axios.create({
|
||||||
baseURL: BASE_URL,
|
baseURL: BASE_URL,
|
||||||
@@ -25,10 +26,11 @@ myAxios.interceptors.response.use(
|
|||||||
return response.data;
|
return response.data;
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
// if (error.response?.status === 401) {
|
if (error.response?.status === 401) {
|
||||||
// localStorage.removeItem('token');
|
// localStorage.removeItem('token');
|
||||||
// window.location.href = '/';
|
// window.location.href = '/';
|
||||||
// }
|
auth_service.logout();
|
||||||
|
}
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { BROWSER_TOKEN_KEY, backendURL, isServer } from '@/services/request/constants';
|
import { BROWSER_TOKEN_KEY, backendURL, isServer } from '@/services/request/constants';
|
||||||
import axios, { AxiosError, AxiosResponse } from 'axios';
|
import axios, { AxiosError, AxiosResponse } from 'axios';
|
||||||
import { getCookie } from 'cookies-next';
|
import { getCookie } from 'cookies-next';
|
||||||
|
import { auth_service } from '../auth';
|
||||||
|
|
||||||
const request = axios.create({
|
const request = axios.create({
|
||||||
baseURL: backendURL + '/api/v1',
|
baseURL: backendURL + '/api/v1',
|
||||||
@@ -31,6 +32,9 @@ request.interceptors.response.use(
|
|||||||
return response;
|
return response;
|
||||||
},
|
},
|
||||||
async (error: AxiosError) => {
|
async (error: AxiosError) => {
|
||||||
|
if (error.response?.status === 401) {
|
||||||
|
auth_service.logout();
|
||||||
|
}
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user