From 44cb8512c9881687e091cca589a0adcb9f72fa7a Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 4 Feb 2017 23:55:31 +0000 Subject: Remove the oauth_callback_url config option Infer the redirect url from the request instead --- server/config/config.go | 1 - server/config/config_test.go | 1 - server/config/testdata/test.config | 1 - 3 files changed, 3 deletions(-) (limited to 'server/config') diff --git a/server/config/config.go b/server/config/config.go index 422a135..794ba8a 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -43,7 +43,6 @@ 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 5536a4e..e247917 100644 --- a/server/config/config_test.go +++ b/server/config/config_test.go @@ -23,7 +23,6 @@ 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 96899e7..6584add 100644 --- a/server/config/testdata/test.config +++ b/server/config/testdata/test.config @@ -19,7 +19,6 @@ 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" } -- cgit v1.2.3