X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/05d13a8a142ccab6425905bd6706ba77cb5f06dd..8fb7517405c53a71782863fcb5863f9b5a948964:/src/store/auth/auth-action.ts diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts index 6b81c317..33a5df90 100644 --- a/src/store/auth/auth-action.ts +++ b/src/store/auth/auth-action.ts @@ -4,9 +4,9 @@ import { ofType, default as unionize, UnionOf } from "unionize"; import { Dispatch } from "redux"; -import { User } from "../../models/user"; +import { User } from "~/models/user"; import { RootState } from "../store"; -import { ServiceRepository } from "../../services/services"; +import { ServiceRepository } from "~/services/services"; import { AxiosInstance } from "axios"; export const authActions = unionize({ @@ -17,12 +17,15 @@ export const authActions = unionize({ USER_DETAILS_REQUEST: {}, USER_DETAILS_SUCCESS: ofType() }, { - tag: 'type', - value: 'payload' -}); + tag: 'type', + value: 'payload' + }); -function setAuthorizationHeader(client: AxiosInstance, token: string) { - client.defaults.headers.common = { +function setAuthorizationHeader(services: ServiceRepository, token: string) { + services.apiClient.defaults.headers.common = { + Authorization: `OAuth2 ${token}` + }; + services.webdavClient.defaults.headers = { Authorization: `OAuth2 ${token}` }; } @@ -35,7 +38,7 @@ export const initAuth = () => (dispatch: Dispatch, getState: () => RootState, se const user = services.authService.getUser(); const token = services.authService.getApiToken(); if (token) { - setAuthorizationHeader(services.apiClient, token); + setAuthorizationHeader(services, token); } if (token && user) { dispatch(authActions.INIT({ user, token })); @@ -44,7 +47,7 @@ export const initAuth = () => (dispatch: Dispatch, getState: () => RootState, se export const saveApiToken = (token: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { services.authService.saveApiToken(token); - setAuthorizationHeader(services.apiClient, token); + setAuthorizationHeader(services, token); dispatch(authActions.SAVE_API_TOKEN(token)); };