From: Daniel Kos <daniel.kos@contractors.roche.com>
Date: Mon, 13 Aug 2018 18:10:58 +0000 (+0200)
Subject: refs #13989 Merge branch 'origin/13989-webdav-service'
X-Git-Tag: 1.2.0~1
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/f0d519637c997df11d5b1a1b32b3d9e4a2872325

refs #13989 Merge branch 'origin/13989-webdav-service'

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
---

f0d519637c997df11d5b1a1b32b3d9e4a2872325
diff --cc src/services/services.ts
index 427148b4,45d360c1..99f802df
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@@ -10,28 -9,22 +10,21 @@@ import { LinkService } from "./link-ser
  import { FavoriteService } from "./favorite-service/favorite-service";
  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);