projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16812-token-appears-in-the-download-URL'
[arvados-workbench2.git]
/
src
/
services
/
services.ts
diff --git
a/src/services/services.ts
b/src/services/services.ts
index af547deccfd81c8f8a00af0a3d2a35cbd0c81b82..6434075cab86024534fa553d7bcfc5be4a667058 100644
(file)
--- a/
src/services/services.ts
+++ b/
src/services/services.ts
@@
-12,7
+12,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 { 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 { KeepService } from "./keep-service/keep-service";
import { WebDAV } from "~/common/webdav";
import { Config } from "~/common/config";
@@
-33,6
+32,7
@@
import { VocabularyService } from '~/services/vocabulary-service/vocabulary-serv
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 { 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";
export type ServiceRepository = ReturnType<typeof createServices>;
export type ServiceRepository = ReturnType<typeof createServices>;
@@
-79,9
+79,12
@@
export const createServices = (config: Config, actions: ApiActions, useApiClient
const linkAccountService = new LinkAccountService(apiClient, actions);
const ancestorsService = new AncestorService(groupsService, userService);
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 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();
const favoriteService = new FavoriteService(linkService, groupsService);
const tagService = new TagService(linkService);
const searchService = new SearchService();
@@
-94,7
+97,6
@@
export const createServices = (config: Config, actions: ApiActions, useApiClient
apiClientAuthorizationService,
authService,
authorizedKeysService,
apiClientAuthorizationService,
authService,
authorizedKeysService,
- collectionFilesService,
collectionService,
containerRequestService,
containerService,
collectionService,
containerRequestService,
containerService,