X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c133ed0f3634fe29b082a4501abd04f05f6221d5..55acac755ba2516c63e902a11e90c6e3754e5c48:/src/services/services.ts

diff --git a/src/services/services.ts b/src/services/services.ts
index 89b3d0ff0d..2afb843f6c 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import Axios from "axios";
-import { ApiClientAuthorizationService } from '~/services/api-client-authorization-service/api-client-authorization-service';
+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";
@@ -11,27 +12,26 @@ 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 { 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";
+import { WebDAV } from "common/webdav";
+import { Config } from "common/config";
 import { UserService } from './user-service/user-service';
-import { AncestorService } from "~/services/ancestors-service/ancestors-service";
-import { ResourceKind } from "~/models/resource";
+import { AncestorService } from "services/ancestors-service/ancestors-service";
+import { ResourceKind } from "models/resource";
 import { ContainerRequestService } from './container-request-service/container-request-service';
 import { ContainerService } from './container-service/container-service';
 import { LogService } from './log-service/log-service';
-import { ApiActions } from "~/services/api/api-actions";
-import { WorkflowService } from "~/services/workflow-service/workflow-service";
-import { SearchService } from '~/services/search-service/search-service';
-import { PermissionService } from "~/services/permission-service/permission-service";
-import { VirtualMachinesService } from "~/services/virtual-machines-service/virtual-machines-service";
-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 { ApiActions } from "services/api/api-actions";
+import { WorkflowService } from "services/workflow-service/workflow-service";
+import { SearchService } from 'services/search-service/search-service';
+import { PermissionService } from "services/permission-service/permission-service";
+import { VirtualMachinesService } from "services/virtual-machines-service/virtual-machines-service";
+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 { 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";
 
 export type ServiceRepository = ReturnType<typeof createServices>;
 
@@ -49,12 +49,12 @@ export function removeAuthorizationHeader(services: ServiceRepository) {
     delete services.webdavClient.defaults.headers.common;
 }
 
-export const createServices = (config: Config, actions: ApiActions) => {
+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 = Axios.create({ headers: {} });
+    const apiClient = useApiClient || Axios.create({ headers: {} });
     apiClient.defaults.baseURL = config.baseUrl;
 
     const webdavClient = new WebDAV();
@@ -68,7 +68,6 @@ export const createServices = (config: Config, actions: ApiActions) => {
     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 permissionService = new PermissionService(apiClient, actions);
     const projectService = new ProjectService(apiClient, actions);
     const repositoriesService = new RepositoriesService(apiClient, actions);
@@ -78,9 +77,12 @@ export const createServices = (config: Config, actions: ApiActions) => {
     const linkAccountService = new LinkAccountService(apiClient, actions);
 
     const ancestorsService = new AncestorService(groupsService, userService);
-    const authService = new AuthService(apiClient, config.rootUrl, actions);
+
+    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 collectionFilesService = new CollectionFilesService(collectionService);
     const favoriteService = new FavoriteService(linkService, groupsService);
     const tagService = new TagService(linkService);
     const searchService = new SearchService();
@@ -93,7 +95,6 @@ export const createServices = (config: Config, actions: ApiActions) => {
         apiClientAuthorizationService,
         authService,
         authorizedKeysService,
-        collectionFilesService,
         collectionService,
         containerRequestService,
         containerService,
@@ -103,7 +104,6 @@ export const createServices = (config: Config, actions: ApiActions) => {
         keepService,
         linkService,
         logService,
-        nodeService,
         permissionService,
         projectService,
         repositoriesService,