From 9c344a0a95c44ef9cebade7b8a65ac160d9eb900 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 11 Feb 2017 20:20:35 +0000 Subject: Revert "Remove the oauth_callback_url config option" --- server/config/config.go | 1 + server/config/config_test.go | 1 + server/config/testdata/test.config | 1 + 3 files changed, 3 insertions(+) (limited to 'server/config') 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" } -- cgit v1.2.3