[ARVADOS-WORKBENCH2] updated: 1.4.1-430-gefedeb30
Git user
git at public.arvados.org
Tue Sep 8 21:24:31 UTC 2020
Summary of changes:
src/common/config.ts | 2 --
src/services/services.ts | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
via efedeb30d0641217f1fb27627c9ae4cba7aedd36 (commit)
from 2a15974a93e2fce120e27a07953464764e930c22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit efedeb30d0641217f1fb27627c9ae4cba7aedd36
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date: Tue Sep 8 18:21:38 2020 -0300
16679: Drops TokeLifetime in favor of IdleTimeout on token storage decision.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>
diff --git a/src/common/config.ts b/src/common/config.ts
index 96152248..0f935602 100644
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -62,7 +62,6 @@ export interface ClusterConfigJSON {
};
Login: {
LoginCluster: string;
- TokenLifetime: string;
Google: {
Enable: boolean;
}
@@ -222,7 +221,6 @@ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
},
Login: {
LoginCluster: "",
- TokenLifetime: "0s",
Google: {
Enable: false,
},
diff --git a/src/services/services.ts b/src/services/services.ts
index 9a7b1e04..6434075c 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -80,9 +80,9 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient
const ancestorsService = new AncestorService(groupsService, userService);
- const tokenLifetime = config && config.clusterConfig && config.clusterConfig.Login.TokenLifetime || '0s';
+ const idleTimeout = config && config.clusterConfig && config.clusterConfig.Workbench.IdleTimeout || '0s';
const authService = new AuthService(apiClient, config.rootUrl, actions,
- (parse(tokenLifetime, 's') || 0) > 0);
+ (parse(idleTimeout, 's') || 0) > 0);
const collectionService = new CollectionService(apiClient, webdavClient, authService, actions);
const favoriteService = new FavoriteService(linkService, groupsService);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list