X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/d6d85de50096eb0053d58c5022fd4e949c830929..59caadc58a0b7ffc92fa95c90b16c99a9af6d942:/src/store/auth/auth-action.ts diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts index 72e2d345..ac2e0b7e 100644 --- a/src/store/auth/auth-action.ts +++ b/src/store/auth/auth-action.ts @@ -2,14 +2,12 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ofType, default as unionize, UnionOf } from "unionize"; +import { ofType, unionize, UnionOf } from '~/common/unionize'; import { Dispatch } from "redux"; import { User } from "~/models/user"; import { RootState } from "../store"; import { ServiceRepository } from "~/services/services"; import { AxiosInstance } from "axios"; -import { initSidePanelTree } from '../side-panel-tree/side-panel-tree-actions'; -import { updateResources } from '../resources/resources-actions'; export const authActions = unionize({ SAVE_API_TOKEN: ofType(), @@ -18,10 +16,7 @@ export const authActions = unionize({ INIT: ofType<{ user: User, token: string }>(), USER_DETAILS_REQUEST: {}, USER_DETAILS_SUCCESS: ofType() -}, { - tag: 'type', - value: 'payload' - }); +}); function setAuthorizationHeader(services: ServiceRepository, token: string) { services.apiClient.defaults.headers.common = { @@ -36,17 +31,16 @@ function removeAuthorizationHeader(client: AxiosInstance) { delete client.defaults.headers.common.Authorization; } -export const initAuth = () => - (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const user = services.authService.getUser(); - const token = services.authService.getApiToken(); - if (token) { - setAuthorizationHeader(services, token); - } - if (token && user) { - dispatch(authActions.INIT({ user, token })); - } - }; +export const initAuth = () => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const user = services.authService.getUser(); + const token = services.authService.getApiToken(); + if (token) { + setAuthorizationHeader(services, token); + } + if (token && user) { + dispatch(authActions.INIT({ user, token })); + } +}; export const saveApiToken = (token: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { services.authService.saveApiToken(token);