X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/055723f58e163f0b5e49c1e8b92fd1bebe81873e..623f5deee7b203090fb71f028e01ed55e0f8a38c:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index 0bc351bbe4..517368aa43 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -69,6 +69,7 @@ import { ownerNameReducer } from '~/store/owner-name/owner-name-reducer'; import { SubprocessMiddlewareService } from '~/store/subprocess-panel/subprocess-panel-middleware-service'; import { SUBPROCESS_PANEL_ID } from '~/store/subprocess-panel/subprocess-panel-actions'; import { ALL_PROCESSES_PANEL_ID } from './all-processes-panel/all-processes-panel-action'; +import { Config } from '~/common/config'; const composeEnhancers = (process.env.NODE_ENV === 'development' && @@ -80,7 +81,7 @@ export type RootState = ReturnType>; export type RootStore = Store & { dispatch: Dispatch }; -export function configureStore(history: History, services: ServiceRepository): RootStore { +export function configureStore(history: History, services: ServiceRepository, config: Config): RootStore { const rootReducer = createRootReducer(services); const projectPanelMiddleware = dataExplorerMiddleware( @@ -135,8 +136,7 @@ export function configureStore(history: History, services: ServiceRepository): R const state = store.getState(); if (state.auth && state.auth.apiToken) { - const { apiToken } = state.auth; - handleRedirects(apiToken); + handleRedirects(state.auth.apiToken, config); } return next(action); @@ -163,6 +163,7 @@ export function configureStore(history: History, services: ServiceRepository): R collectionsContentAddress, subprocessMiddleware, ]; + const enhancer = composeEnhancers(applyMiddleware(redirectToMiddleware, ...middlewares)); return createStore(rootReducer, enhancer); }