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";
services.apiClient.defaults.headers.common = {
Authorization: `Bearer ${token}`
};
- services.webdavClient.defaults.headers = {
- Authorization: `Bearer ${token}`
- };
+ services.keepWebdavClient.setAuthorization(`Bearer ${token}`);
+ services.apiWebdavClient.setAuthorization(`Bearer ${token}`);
}
export function removeAuthorizationHeader(services: ServiceRepository) {
delete services.apiClient.defaults.headers.common;
- delete services.webdavClient.defaults.headers.common;
+ services.keepWebdavClient.setAuthorization(undefined);
+ services.apiWebdavClient.setAuthorization(undefined);
}
export const createServices = (config: Config, actions: ApiActions, useApiClient?: AxiosInstance) => {
const apiClient = useApiClient || Axios.create({ headers: {} });
apiClient.defaults.baseURL = config.baseUrl;
- const webdavClient = new WebDAV();
- webdavClient.defaults.baseURL = config.keepWebServiceUrl;
+ const keepWebdavClient = new WebDAV({
+ baseURL: config.keepWebServiceUrl
+ });
+
+ const apiWebdavClient = new WebDAV({
+ baseURL: config.baseUrl
+ });
const apiClientAuthorizationService = new ApiClientAuthorizationService(apiClient, actions);
const authorizedKeysService = new AuthorizedKeysService(apiClient, actions);
const groupsService = new GroupsService(apiClient, actions);
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 logService = new LogService(apiClient, apiWebdavClient, actions);
const permissionService = new PermissionService(apiClient, actions);
const projectService = new ProjectService(apiClient, actions);
const repositoriesService = new RepositoriesService(apiClient, actions);
const workflowService = new WorkflowService(apiClient, actions);
const linkAccountService = new LinkAccountService(apiClient, actions);
- const ancestorsService = new AncestorService(groupsService, userService);
-
const idleTimeout = (config && config.clusterConfig && config.clusterConfig.Workbench.IdleTimeout) || '0s';
const authService = new AuthService(apiClient, config.rootUrl, actions,
(parse(idleTimeout, 's') || 0) > 0);
- const collectionService = new CollectionService(apiClient, webdavClient, authService, actions);
+ const collectionService = new CollectionService(apiClient, keepWebdavClient, authService, actions);
+ const ancestorsService = new AncestorService(groupsService, userService, collectionService);
const favoriteService = new FavoriteService(linkService, groupsService);
const tagService = new TagService(linkService);
const searchService = new SearchService();
keepService,
linkService,
logService,
- nodeService,
permissionService,
projectService,
repositoriesService,
tagService,
userService,
virtualMachineService,
- webdavClient,
+ keepWebdavClient,
+ apiWebdavClient,
workflowService,
vocabularyService,
linkAccountService