수정건 수정

This commit is contained in:
USER
2022-08-31 12:25:39 +09:00
parent 188a6112b4
commit 648a16ad4f
23 changed files with 182 additions and 127 deletions

View File

@@ -1,7 +1,4 @@
import axios from 'axios';
import { testProp } from './config';
import tokenSvc from '@/common/token-service';
import { consts } from './config';
const config = {
//baseURL: 'http://localhost:7070',
@@ -29,19 +26,12 @@ const authInterceptor = config => {
};
const tokenInterceptor = config => {
// var authToken = tokenSvc.getAuthToken();
// console.log(this.$store);
// alert('tokenInterceptor'+authToken);
// if(tokenSvc.getAuthorization(consts.tokenPart1) != null){
// //config.headers.Authorization = tokenSvc.getAuthorization(consts.tokenPart1);
// //console.log("getToken : "+config.headers.Authorization);
// //config.headers.Authorization = tokenSvc.getToken();
// }
// console.log('http : ',sessionStorage.authToken);
if(sessionStorage.authToken != null) {
config.headers.Authorization = 'Bearer '+ sessionStorage.authToken;
}else if(sessionStorage.authToken == null && sessionStorage.refreshToken != null){
config.headers.Authorization = 'Bearer '+ sessionStorage.refreshToken;
}
return config;
@@ -59,22 +49,6 @@ const loadingLayer = (type, config) => {
get: httpClient.get(url, { params: { ... }, headers: {"show-layer": "Yes"} }) // in 2nd property
post: httpClient.post(url, params, { headers: {"show-layer": "Yes"} }) // 3rd property
*/
// if (config.headers['Show-Layer'] == 'Yes') {
// if (type) {
// loadOverlap.push('add');
// } else {
// loadOverlap.pop();
// }
// if (loadOverlap.length > 0) {
// document.querySelector('html > body').style.overflow = 'hidden'; // 스크롤 block
// document.getElementsByClassName('loading_layer')[0].style.display = 'block';
// } else {
// document.querySelector('html > body').style.removeProperty('overflow'); // 스크롤 allow
// document.getElementsByClassName('loading_layer')[0].style.display = 'none';
// }
// }
if(type){
document.querySelector('html > body').style.overflow = 'hidden'; // 스크롤 block
document.getElementsByClassName('loadingDimmed')[0].style.display = 'block';
@@ -107,17 +81,27 @@ httpClient.interceptors.request.use(loadingLayerInterceptor);
/** Adding the response interceptors */
httpClient.interceptors.response.use(
response => {
loadingLayer(false, response.config);
loadingLayer(false, response.config);
console.log('response status:', response.status, 'data:', response.data);
console.log('response config url :',response.config.url);
if(response.config.url == '/api/v1/bo/comm/refreshToken'){
if(response.data.data != null && typeof response.data.data != undefined){
sessionStorage.setItem('authToken', response.data.data);
window.location.reload();
}else{
delete sessionStorage.authToken;
window.top.location.href = '/login';
}
}
return response;
},
error => {
console.log(error);
//alert(error);
delete sessionStorage.authToken;
if(error.message === 'Network Error'){
alert('네트워크 오류가 발생했습니다. 잠시 후 다시 시도해주세요.');
// tokenSvc.removeToken();
alert('네트워크 오류가 발생했습니다. 잠시 후 다시 시도해주세요.');
delete sessionStorage.authToken;
window.top.location.href = '/login';
}
if (error.response != undefined && error.response != null) loadingLayer(false, error.response.config);
@@ -126,33 +110,31 @@ httpClient.interceptors.response.use(
if (error.code === 'ECONNABORTED') {
alert('서비스가 지연되고 있습니다. 잠시 후 확인하시고 다시 시도해주세요.');
return Promise.reject(error);
}else if(error.response.status == 401){
alert('세션이 만료되었습니다.');
// tokenSvc.removeToken();
}else if(error.response.status == 401){
alert('세션이 만료되었습니다.');
delete sessionStorage.authToken;
window.top.location.href = '/login';
} else if (error.response.status == 418) {
// tokenSvc.removeToken();
alert('세션이 만료되었습니다.');
window.top.location.href = '/login';
}else if (error.response.status == 500) {
if (error.response.data != null && error.response.data.message == '511 NETWORK_AUTHENTICATION_REQUIRED') {
alert('웹템플릿 IP가 브랜드포털에 등록이 필요합니다. 기술지원에 문의해주세요.');
return Promise.reject(error);
} else {
// tokenSvc.removeToken();
window.top.location.href = '/login';
} else if (error.response.status == 418) {
delete sessionStorage.authToken;
if(error.config.url == '/api/v1/bo/comm/refreshToken'){
alert('세션이 만료되었습니다.');
delete sessionStorage.authToken;
delete sessionStorage.refreshToken;
return window.top.location.href = '/login';
//return Promise.reject(error);
}
} else if (error.response.status == 511) {
alert('웹템플릿 IP가 브랜드포털에 등록이 필요합니다. 기술지원에 문의해주세요.');
return Promise.reject(error);
}
var params = {};
httpClient.post('/api/v1/bo/comm/refreshToken',params);
}else if (error.response.status == 500) {
window.top.location.href = '/view/error/500';
}
// else if (error.message == 'Network Error') {
// alert('네트워크 오류가 발생했습니다. 잠시 후 다시 시도해주세요.');
// return Promise.reject(error);
// }
else {
// alert("else");
console.log('response error:', error);
else {
delete sessionStorage.authToken;
console.log('response error:', error);
return Promise.reject(error);
}
}