X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/38d27e9783f7f760cee84cc225e86144069848c4..fe409e309257b4cb9c255c7e8b74d1f97d7297f6:/src/services/services.ts diff --git a/src/services/services.ts b/src/services/services.ts index b911898174..4e4a682ebe 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -29,7 +29,6 @@ import { VirtualMachinesService } from "services/virtual-machines-service/virtua import { RepositoriesService } from 'services/repositories-service/repositories-service'; import { AuthorizedKeysService } from 'services/authorized-keys-service/authorized-keys-service'; import { VocabularyService } from 'services/vocabulary-service/vocabulary-service'; -import { NodeService } from 'services/node-service/node-service'; import { FileViewersConfigService } from 'services/file-viewers-config-service/file-viewers-config-service'; import { LinkAccountService } from "./link-account-service/link-account-service"; import parse from "parse-duration"; @@ -40,14 +39,12 @@ export function setAuthorizationHeader(services: ServiceRepository, token: strin services.apiClient.defaults.headers.common = { Authorization: `Bearer ${token}` }; - services.webdavClient.defaults.headers = { - Authorization: `Bearer ${token}` - }; + services.webdavClient.setAuthorization(`Bearer ${token}`); } export function removeAuthorizationHeader(services: ServiceRepository) { delete services.apiClient.defaults.headers.common; - delete services.webdavClient.defaults.headers.common; + services.webdavClient.setAuthorization(undefined); } export const createServices = (config: Config, actions: ApiActions, useApiClient?: AxiosInstance) => { @@ -58,8 +55,9 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient const apiClient = useApiClient || Axios.create({ headers: {} }); apiClient.defaults.baseURL = config.baseUrl; - const webdavClient = new WebDAV(); - webdavClient.defaults.baseURL = config.keepWebServiceUrl; + const webdavClient = new WebDAV({ + baseURL: config.keepWebServiceUrl + }); const apiClientAuthorizationService = new ApiClientAuthorizationService(apiClient, actions); const authorizedKeysService = new AuthorizedKeysService(apiClient, actions); @@ -69,7 +67,6 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient const keepService = new KeepService(apiClient, actions); const linkService = new LinkService(apiClient, actions); const logService = new LogService(apiClient, actions); - const nodeService = new NodeService(apiClient, actions); const permissionService = new PermissionService(apiClient, actions); const projectService = new ProjectService(apiClient, actions); const repositoriesService = new RepositoriesService(apiClient, actions); @@ -106,7 +103,6 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient keepService, linkService, logService, - nodeService, permissionService, projectService, repositoriesService,