Browse Source

Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

feature/auth
sanguu 2 years ago
parent
commit
efbc1b21b1
  1. 7
      .env.development
  2. 7
      .env.production
  3. 5
      src/configs/constants.js
  4. 2
      src/modules/account/login/sagas/authSaga.ts
  5. 13
      src/modules/basis/group/sagas/basisGroupSaga.ts

7
.env.development

@ -1,3 +1,10 @@
REACT_APP_HOST = http://localhost:8080/ REACT_APP_HOST = http://localhost:8080/
REACT_APP_WS_HOST = ws://localhost:8081/ws REACT_APP_WS_HOST = ws://localhost:8081/ws
REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/ REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/
# Naver Search API HOST
NAVER_SEARCH_API_HOST = https://openapi.naver.com/v1/search/local.json
# API KEY
NAVER_APP_CLIENT_KEY = WGEct3bJhQC0pyMsP_GK
NAVER_APP_SECRET_KEY = Q4K4OtUYol

7
.env.production

@ -1,3 +1,10 @@
REACT_APP_HOST = http://pav.palntour.com:8080/ REACT_APP_HOST = http://pav.palntour.com:8080/
REACT_APP_WS_HOST = ws://pav.palntour.com:8081/ws REACT_APP_WS_HOST = ws://pav.palntour.com:8081/ws
REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/ REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/
# Naver Search API HOST
NAVER_SEARCH_API_HOST = https://openapi.naver.com/v1/search/local.json
# API KEY
NAVER_APP_CLIENT_KEY = WGEct3bJhQC0pyMsP_GK
NAVER_APP_SECRET_KEY = Q4K4OtUYol

5
src/configs/constants.js

@ -1,9 +1,14 @@
// 호스트 // 호스트
export const HOST = process.env.REACT_APP_HOST; export const HOST = process.env.REACT_APP_HOST;
export const WS_HOST = process.env.REACT_APP_WS_HOST; export const WS_HOST = process.env.REACT_APP_WS_HOST;
export const NAVER_SEARCH_API_HOST = process.env.NAVER_SEARCH_API_HOST;
export const IMG_PATH = process.env.REACT_APP_IMAGE_HOST; export const IMG_PATH = process.env.REACT_APP_IMAGE_HOST;
// API KEY
export const NAVER_APP_CLIENT_KEY = process.env.NAVER_APP_CLIENT_KEY;
export const NAVER_APP_SECRET_KEY = process.env.NAVER_APP_SECRET_KEY;
// 통신 코드 // 통신 코드
export const HTTP_STATUS_CODE = { export const HTTP_STATUS_CODE = {
OK: '00000' OK: '00000'

2
src/modules/account/login/sagas/authSaga.ts

@ -122,7 +122,7 @@ function* userLogoutSaga() {
// console.log('dddddddddddddddddddddddddddddddddddd'); // console.log('dddddddddddddddddddddddddddddddddddd');
const decodedToken = decode<LoginData>(accessToken); const decodedToken = decode<LoginData>(accessToken);
const res = yield call(authAPI.usersLogout, decodedToken.cstmrSno); const res = yield call(authAPI.usersLogout, decodedToken.cstmrSno);
console.log('res>>>>>>>>', res); // console.log('res>>>>>>>>', res);
// if(res.data=="SUCCESS"){ // if(res.data=="SUCCESS"){
// location.reload(); // location.reload();
// } // }

13
src/modules/basis/group/sagas/basisGroupSaga.ts

@ -128,7 +128,18 @@ function* createGroupSaga(
}) })
); );
} else { } else {
throw Error; if (data.errorCode === 'DT002') {
yield put(
MessageActions.IS_ERROR({
errorCode: ERROR_MESSAGE.code,
errorMessage: data.errorMessage + ' (그룹명)',
isHistoryBack: false,
isRefresh: false
})
);
} else{
throw Error;
}
} }
} catch (error) { } catch (error) {
yield put( yield put(

Loading…
Cancel
Save