Merge branch 'master'

[arvados-workbench2.git] / src / services / services.ts

diff --git a/src/services/services.ts b/src/services/services.ts
index e77b5d3aa89b18a5fa8d4e1f3b2de2826f93f523..61dd399206384c159d0ffe6982e704fe054a405a 100644 (file)
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2,48 +2,41 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+import Axios, { AxiosInstance } from "axios";
 import { AuthService } from "./auth-service/auth-service";
 import { GroupsService } from "./groups-service/groups-service";
 import { ProjectService } from "./project-service/project-service";
 import { LinkService } from "./link-service/link-service";
 import { FavoriteService } from "./favorite-service/favorite-service";
-import { AxiosInstance } from "axios";
 import { CollectionService } from "./collection-service/collection-service";
 import { TagService } from "./tag-service/tag-service";
-import Axios from "axios";
 import { CollectionFilesService } from "./collection-files-service/collection-files-service";
 import { KeepService } from "./keep-service/keep-service";
+import { WebDAV } from "../common/webdav";
+import { Config } from "../common/config";
 
-export interface ServiceRepository {
-    apiClient: AxiosInstance;
+export type ServiceRepository = ReturnType<typeof createServices>;
 
-    authService: AuthService;
-    keepService: KeepService;
-    groupsService: GroupsService;
-    projectService: ProjectService;
-    linkService: LinkService;
-    favoriteService: FavoriteService;
-    tagService: TagService;
-    collectionService: CollectionService;
-    collectionFilesService: CollectionFilesService;
-}
-
-export const createServices = (baseUrl: string): ServiceRepository => {
+export const createServices = (config: Config) => {
     const apiClient = Axios.create();
-    apiClient.defaults.baseURL = `${baseUrl}/arvados/v1`;
+    apiClient.defaults.baseURL = `${config.apiHost}/arvados/v1`;
+
+    const webdavClient = new WebDAV();
+    webdavClient.defaults.baseURL = config.keepWebHost;
 
-    const authService = new AuthService(apiClient, baseUrl);
+    const authService = new AuthService(apiClient, config.apiHost);
     const keepService = new KeepService(apiClient);
     const groupsService = new GroupsService(apiClient);
     const projectService = new ProjectService(apiClient);
     const linkService = new LinkService(apiClient);
     const favoriteService = new FavoriteService(linkService, groupsService);
-    const collectionService = new CollectionService(apiClient, keepService);
+    const collectionService = new CollectionService(apiClient, keepService, webdavClient, authService);
     const tagService = new TagService(linkService);
     const collectionFilesService = new CollectionFilesService(collectionService);
 
     return {
         apiClient,
+        webdavClient,
         authService,
         keepService,
         groupsService,
@@ -55,3 +48,4 @@ export const createServices = (baseUrl: string): ServiceRepository => {
         collectionFilesService
     };
 };
+