From: Lucas Di Pentima <lucas@di-pentima.com.ar>
Date: Tue, 25 Aug 2020 18:00:33 +0000 (-0300)
Subject: Merge branch '16678-login-tokens-lifetime-config'
X-Git-Tag: 2.1.0~109
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/bd8bdd90055d61263eff5bdb9a953c57319aa83d

Merge branch '16678-login-tokens-lifetime-config'
Closes #16678

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
---

bd8bdd90055d61263eff5bdb9a953c57319aa83d
diff --cc lib/config/export.go
index 5cdc3dae6a,76f00c7652..b203dff26a
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@@ -170,9 -170,7 +170,10 @@@ var whitelist = map[string]bool
  	"Login.SSO.Enable":                             true,
  	"Login.SSO.ProviderAppID":                      false,
  	"Login.SSO.ProviderAppSecret":                  false,
 +	"Login.Test":                                   true,
 +	"Login.Test.Enable":                            true,
 +	"Login.Test.Users":                             false,
+ 	"Login.TokenLifetime":                          false,
  	"Mail":                                         true,
  	"Mail.EmailFrom":                               false,
  	"Mail.IssueReporterEmailFrom":                  false,
diff --cc sdk/go/arvados/config.go
index c87f880e5e,86673320da..d98ffd18ed
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@@ -177,12 -177,9 +177,13 @@@ type Cluster struct 
  			ProviderAppID     string
  			ProviderAppSecret string
  		}
 +		Test struct {
 +			Enable bool
 +			Users  map[string]TestUser
 +		}
  		LoginCluster       string
  		RemoteTokenRefresh Duration
+ 		TokenLifetime      Duration
  	}
  	Mail struct {
  		MailchimpAPIKey                string