Commit b8ea6b90 authored by nano's avatar nano

fix auto signing

parent 618b460f
...@@ -116,26 +116,26 @@ export default { ...@@ -116,26 +116,26 @@ export default {
let { data } = yield call(getAuthUser, { token }) let { data } = yield call(getAuthUser, { token })
if(data) { if(data) {
yield put({ type: 'getAuthUserSuccess', payload: { user: data, token }}) yield put({ type: 'getAuthUserSuccess', payload: { user: data, token }})
yield put({ type: 'preLogin'})
} }
}catch(error) { }catch(error) {
message.error(error.message) message.error(error.message)
} }
}, },
*preLogin({ payload }, { call, put, select }) { *preLogin({ payload }, { call, put, select }) {
const {token, user } = yield select(state => state.user) const {token } = payload
if(!token) { if(!token) {
yield put(routerRedux.replace("/signin")) yield put(routerRedux.replace("/signin"))
} }
try { try {
if (user["id"]) { let { data } = yield call(getAuthUser, { token })
if(handleSSO(user)){ if (data) {
if(handleSSO(data)){
return return
} }
if(user.active) { if(data.active) {
yield put(routerRedux.replace("/profiles")) yield put(routerRedux.replace("/profiles"))
}else { }else {
yield put(routerRedux.replace("/verify")) yield put(routerRedux.replace("/verify"))
...@@ -207,7 +207,7 @@ export default { ...@@ -207,7 +207,7 @@ export default {
history.listen(({ pathname, query }) => { history.listen(({ pathname, query }) => {
if(pathname == '/') { if(pathname == '/') {
dispatch({ type: 'preLogin'}) dispatch({ type: 'preLogin', payload: { token } })
} }
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment