Browse Source

logout redux 초기화

feature/auth
김장현 2 years ago
parent
commit
027d2aa041
  1. 21
      src/modules/account/login/sagas/authSaga.ts
  2. 18
      src/redux/reducers/rootReducer.ts

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

@ -122,17 +122,16 @@ 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();
} // }
} }
yield put(Actions.logout.success()); yield put(Actions.logout.success());
cookieStorage.removeCookie(COOKIE_ACCESS_TOKEN); cookieStorage.removeCookie(COOKIE_ACCESS_TOKEN);
cookieStorage.removeCookie(COOKIE_REFRESH_TOKEN); cookieStorage.removeCookie(COOKIE_REFRESH_TOKEN);
yield put(replace('/')); yield put(replace('/'));
} catch (error) { } catch (error) {
yield put(Actions.logout.failure(error)); yield put(Actions.logout.failure(error));
} }
@ -153,7 +152,8 @@ function* userPageSaga(
} }
function* userUpdateSaga( function* userUpdateSaga(
action: ActionType<typeof Actions.userupdateAction.request>) { action: ActionType<typeof Actions.userupdateAction.request>
) {
const param = action.payload; const param = action.payload;
try { try {
const { data, errorCode } = yield call(authAPI.updateUser, param); const { data, errorCode } = yield call(authAPI.updateUser, param);
@ -167,8 +167,7 @@ function* userUpdateSaga(
isRefresh: false isRefresh: false
}) })
); );
} } else {
else{
yield put( yield put(
MessageActions.IS_MESSAGE({ MessageActions.IS_MESSAGE({
messageCode: SAVE_MESSAGE.code, messageCode: SAVE_MESSAGE.code,
@ -190,7 +189,8 @@ function* userUpdateSaga(
} }
} }
function* userPwSaga( function* userPwSaga(
action: ActionType<typeof Actions.pwUpdateAction.request>) { action: ActionType<typeof Actions.pwUpdateAction.request>
) {
const param = action.payload; const param = action.payload;
try { try {
const { data, errorCode } = yield call(authAPI.pwupdate, param); const { data, errorCode } = yield call(authAPI.pwupdate, param);
@ -205,8 +205,7 @@ function* userPwSaga(
isRefresh: false isRefresh: false
}) })
); );
} } else {
else{
yield put( yield put(
MessageActions.IS_MESSAGE({ MessageActions.IS_MESSAGE({
messageCode: SAVE_MESSAGE.code, messageCode: SAVE_MESSAGE.code,

18
src/redux/reducers/rootReducer.ts

@ -14,7 +14,10 @@ import { dronSaga } from '../../modules/basis/dron/sagas/basisDronSaga';
import { groupReducer } from '../../modules/basis/group/reducers/basisGroupReducer'; import { groupReducer } from '../../modules/basis/group/reducers/basisGroupReducer';
import { basGroupSaga } from '../../modules/basis/group/sagas/basisGroupSaga'; import { basGroupSaga } from '../../modules/basis/group/sagas/basisGroupSaga';
import { messageReducer } from '../../modules/comn/message/reducers/comnMessageReducer'; import { messageReducer } from '../../modules/comn/message/reducers/comnMessageReducer';
import { mypageReducer, userPwReducer } from '../../modules/account/login/reducers/authReducer'; import {
mypageReducer,
userPwReducer
} from '../../modules/account/login/reducers/authReducer';
import { findSaga } from '../../modules/account/find/sagas/findSaga'; import { findSaga } from '../../modules/account/find/sagas/findSaga';
import { findAccountReducer } from '../../modules/account/find/reducers/findReducer'; import { findAccountReducer } from '../../modules/account/find/reducers/findReducer';
@ -26,7 +29,7 @@ import {
controlGpFltPlanReducer, controlGpFltPlanReducer,
controlGpSaga, controlGpSaga,
ControlGpState, ControlGpState,
controlGpLogReducer, controlGpLogReducer
} from '../../modules/control/gp'; } from '../../modules/control/gp';
import controlMapReducer from '../../modules/control/map/reducers/controlMapReducer'; import controlMapReducer from '../../modules/control/map/reducers/controlMapReducer';
import { mainDahReducer } from '../../modules/main/dash/reducers/mainDashReducer'; import { mainDahReducer } from '../../modules/main/dash/reducers/mainDashReducer';
@ -57,7 +60,7 @@ export function* saga() {
yield all([fork(findSaga)]); yield all([fork(findSaga)]);
} }
const rootReducer = combineReducers({ const appReducer = combineReducers({
auth, auth,
navbar, navbar,
layout, layout,
@ -80,7 +83,14 @@ const rootReducer = combineReducers({
analysisHistoryState: analysisHistoryReducer, analysisHistoryState: analysisHistoryReducer,
analysisSimulatorState: analysisSimulatorReducer, analysisSimulatorState: analysisSimulatorReducer,
flightState: flightReducer, flightState: flightReducer,
findState: findAccountReducer, findState: findAccountReducer
}); });
const rootReducer = (state, action) => {
if (action.type === 'auth/USERS_LOGOUT_SUCCESS') {
appReducer(undefined, action);
}
return appReducer(state, action);
};
export default rootReducer; export default rootReducer;

Loading…
Cancel
Save