aboutsummaryrefslogtreecommitdiff
path: root/server/config
diff options
context:
space:
mode:
authorNiall Sheridan <nsheridan@gmail.com>2017-02-04 23:55:31 +0000
committerNiall Sheridan <nsheridan@gmail.com>2017-02-09 12:49:37 +0000
commit44cb8512c9881687e091cca589a0adcb9f72fa7a (patch)
tree7696577468e3a7aae4f97e129729804817d2ee81 /server/config
parent019891ab8b6709b2e3fb6be83d111fb73ec2bd32 (diff)
Remove the oauth_callback_url config option
Infer the redirect url from the request instead
Diffstat (limited to 'server/config')
-rw-r--r--server/config/config.go1
-rw-r--r--server/config/config_test.go1
-rw-r--r--server/config/testdata/test.config1
3 files changed, 0 insertions, 3 deletions
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"
}