diff options
| author | Niall Sheridan <nsheridan@gmail.com> | 2017-02-11 20:20:35 +0000 |
|---|---|---|
| committer | Niall Sheridan <nsheridan@gmail.com> | 2017-02-11 20:20:35 +0000 |
| commit | 9c344a0a95c44ef9cebade7b8a65ac160d9eb900 (patch) | |
| tree | aa3782547656b26a55527295c78aa0b8621f8676 /server/config | |
| parent | 376b8f670a9c80e8ae69581a354cb989571c44c2 (diff) | |
Revert "Remove the oauth_callback_url config option"
Diffstat (limited to 'server/config')
| -rw-r--r-- | server/config/config.go | 1 | ||||
| -rw-r--r-- | server/config/config_test.go | 1 | ||||
| -rw-r--r-- | server/config/testdata/test.config | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/server/config/config.go b/server/config/config.go index 794ba8a..422a135 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -43,6 +43,7 @@ type Server struct { type Auth struct { OauthClientID string `hcl:"oauth_client_id"` OauthClientSecret string `hcl:"oauth_client_secret"` + OauthCallbackURL string `hcl:"oauth_callback_url"` Provider string `hcl:"provider"` ProviderOpts map[string]string `hcl:"provider_opts"` UsersWhitelist []string `hcl:"users_whitelist"` diff --git a/server/config/config_test.go b/server/config/config_test.go index e247917..5536a4e 100644 --- a/server/config/config_test.go +++ b/server/config/config_test.go @@ -23,6 +23,7 @@ var ( Auth: &Auth{ OauthClientID: "client_id", OauthClientSecret: "secret", + OauthCallbackURL: "https://sshca.example.com/auth/callback", Provider: "google", ProviderOpts: map[string]string{"domain": "example.com"}, UsersWhitelist: []string{"a_user"}, diff --git a/server/config/testdata/test.config b/server/config/testdata/test.config index 6584add..96899e7 100644 --- a/server/config/testdata/test.config +++ b/server/config/testdata/test.config @@ -19,6 +19,7 @@ auth { provider = "google" oauth_client_id = "client_id" oauth_client_secret = "secret" + oauth_callback_url = "https://sshca.example.com/auth/callback" provider_opts { domain = "example.com" } |