X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f4012790be2404ce2f5b2594338fac43b1b9c59b..63ee9df0903ee7378be295d9b0656f7ae0aa3ddc:/src/services/services.ts diff --git a/src/services/services.ts b/src/services/services.ts index 7bb83b0d..af547dec 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3,6 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0 import Axios from "axios"; +import { AxiosInstance } from "axios"; +import { ApiClientAuthorizationService } from '~/services/api-client-authorization-service/api-client-authorization-service'; import { AuthService } from "./auth-service/auth-service"; import { GroupsService } from "./groups-service/groups-service"; import { ProjectService } from "./project-service/project-service"; @@ -29,19 +31,38 @@ import { RepositoriesService } from '~/services/repositories-service/repositorie 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 { ClientAuthorizationsService } from "~/services/client-authorizations-service/client-authorizations-service"; +import { FileViewersConfigService } from '~/services/file-viewers-config-service/file-viewers-config-service'; +import { LinkAccountService } from "./link-account-service/link-account-service"; export type ServiceRepository = ReturnType; -export const createServices = (config: Config, actions: ApiActions) => { - const apiClient = Axios.create(); +export function setAuthorizationHeader(services: ServiceRepository, token: string) { + services.apiClient.defaults.headers.common = { + Authorization: `Bearer ${token}` + }; + services.webdavClient.defaults.headers = { + Authorization: `Bearer ${token}` + }; +} + +export function removeAuthorizationHeader(services: ServiceRepository) { + delete services.apiClient.defaults.headers.common; + delete services.webdavClient.defaults.headers.common; +} + +export const createServices = (config: Config, actions: ApiActions, useApiClient?: AxiosInstance) => { + // Need to give empty 'headers' object or it will create an + // instance with a reference to the global default headers object, + // which is very bad because that means setAuthorizationHeader + // would update the global default instead of the instance default. + const apiClient = useApiClient || Axios.create({ headers: {} }); apiClient.defaults.baseURL = config.baseUrl; const webdavClient = new WebDAV(); webdavClient.defaults.baseURL = config.keepWebServiceUrl; + const apiClientAuthorizationService = new ApiClientAuthorizationService(apiClient, actions); const authorizedKeysService = new AuthorizedKeysService(apiClient, actions); - const clientAuthorizationsService = new ClientAuthorizationsService(apiClient, actions); const containerRequestService = new ContainerRequestService(apiClient, actions); const containerService = new ContainerService(apiClient, actions); const groupsService = new GroupsService(apiClient, actions); @@ -55,6 +76,7 @@ export const createServices = (config: Config, actions: ApiActions) => { const userService = new UserService(apiClient, actions); const virtualMachineService = new VirtualMachinesService(apiClient, actions); const workflowService = new WorkflowService(apiClient, actions); + const linkAccountService = new LinkAccountService(apiClient, actions); const ancestorsService = new AncestorService(groupsService, userService); const authService = new AuthService(apiClient, config.rootUrl, actions); @@ -64,18 +86,20 @@ export const createServices = (config: Config, actions: ApiActions) => { const tagService = new TagService(linkService); const searchService = new SearchService(); const vocabularyService = new VocabularyService(config.vocabularyUrl); + const fileViewersConfig = new FileViewersConfigService(config.fileViewersConfigUrl); return { ancestorsService, apiClient, + apiClientAuthorizationService, authService, authorizedKeysService, - clientAuthorizationsService, collectionFilesService, collectionService, containerRequestService, containerService, favoriteService, + fileViewersConfig, groupsService, keepService, linkService, @@ -91,6 +115,7 @@ export const createServices = (config: Config, actions: ApiActions) => { webdavClient, workflowService, vocabularyService, + linkAccountService }; };