Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: clear logout (#19823)

pull/19818/head
Zoe Steinkamp 2020-10-26 23:06:52 -06:00 committed by GitHub
parent 485a9d0a7f
commit 87061bb1cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/src/Logout.tsx
View File

@ -33,6 +33,7 @@ const Logout: FC<Props> = ({history}) => {
} }
} }
dispatch(reset()) dispatch(reset())
dispatch({type: 'USER_LOGGED_OUT'})
handleSignOut() handleSignOut()
}, [dispatch, history]) }, [dispatch, history])

11
ui/src/store/configureStore.ts
View File

@ -62,8 +62,12 @@ type ReducerState = Pick<AppState, Exclude<keyof AppState, 'timeRange'>>
import {history} from 'src/store/history' import {history} from 'src/store/history'
export const rootReducer = (history: History) => export const rootReducer = (history: History) => (state, action) => {
combineReducers<ReducerState>({ if (action.type === 'USER_LOGGED_OUT') {
state = undefined
}
return combineReducers<ReducerState>({
router: connectRouter(history), router: connectRouter(history),
...sharedReducers, ...sharedReducers,
autoRefresh: autoRefreshReducer, autoRefresh: autoRefreshReducer,
@ -115,7 +119,8 @@ export const rootReducer = (history: History) =>
userSettings: userSettingsReducer, userSettings: userSettingsReducer,
variableEditor: variableEditorReducer, variableEditor: variableEditorReducer,
VERSION: () => '', VERSION: () => '',
}) })(state, action)
}
const composeEnhancers = const composeEnhancers =
(window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose