Backwards compatability fixes

This commit is contained in:
Thom Seddon
2019-04-23 19:16:24 +01:00
parent fa61c84373
commit 8f6e911045
3 changed files with 12 additions and 2 deletions

View File

@ -104,6 +104,7 @@ func TestConfigFlagBackwardsCompatability(t *testing.T) {
"--client-id=clientid",
"--client-secret=verysecret",
"--prompt=prompt",
"--cookie-secret=veryverysecret",
"--lifetime=200",
"--cookie-secure=false",
"--cookie-domains=test1.com,example.org",
@ -129,6 +130,9 @@ func TestConfigFlagBackwardsCompatability(t *testing.T) {
expected3 := CommaSeparatedList{"test3.com", "example.org", "another3.net"}
assert.Equal(expected3, c.Whitelist, "should read legacy comma separated list whitelist")
// Name changed
assert.Equal([]byte("veryverysecret"), c.Secret)
// Google provider params used to be top level
assert.Equal("clientid", c.ClientIdLegacy)
assert.Equal("clientid", c.Providers.Google.ClientId, "--client-id should set providers.google.client-id")
@ -170,7 +174,8 @@ func TestConfigFileBackwardsCompatability(t *testing.T) {
})
require.Nil(t, err)
assert.Equal("/two", c.Path, "Variable in legacy config file should be read")
assert.Equal("/two", c.Path, "variable in legacy config file should be read")
assert.Equal("auth.legacy.com", c.AuthHost, "variable in legacy config file should be read")
}
func TestConfigParseEnvironment(t *testing.T) {