Merge branch 'master' into 13990-collection-files-service-based-on-webdav

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

diff --git a/src/services/services.ts b/src/services/services.ts
index cbf8cc3e45dfab1a0768a249145c838f6b1865b6..61dd399206384c159d0ffe6982e704fe054a405a 100644 (file)
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2,6 +2,7 @@
 //
 // 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";
@@ -9,7 +10,6 @@ import { LinkService } from "./link-service/link-service";
 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";
@@ -19,12 +19,12 @@ export type ServiceRepository = ReturnType<typeof createServices>;
 
 export const createServices = (config: Config) => {
     const apiClient = Axios.create();
-    apiClient.defaults.baseURL = `${config.API_HOST}/arvados/v1`;
+    apiClient.defaults.baseURL = `${config.apiHost}/arvados/v1`;
 
-    const webdavClient = WebDAV.create();
-    webdavClient.defaults.baseUrl = config.KEEP_WEB_HOST;
+    const webdavClient = new WebDAV();
+    webdavClient.defaults.baseURL = config.keepWebHost;
 
-    const authService = new AuthService(apiClient, config.API_HOST);
+    const authService = new AuthService(apiClient, config.apiHost);
     const keepService = new KeepService(apiClient);
     const groupsService = new GroupsService(apiClient);
     const projectService = new ProjectService(apiClient);