Merge branch 'adfs_get_username' of github.com:simongottschlag/vouch-…

…proxy into simongottschlag-adfs_get_username
vouch · Feb 13, 2019 · 8bba8c1 · 8bba8c1
2 parents 1328338 + ed8ef3b
commit 8bba8c1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/pkg/cfg/cfg.go b/pkg/cfg/cfg.go
@@ -406,6 +406,9 @@ func setDefaults() {
 		} else if GenOAuth.Provider == Providers.GitHub {
 			setDefaultsGitHub()
 			configureOAuthClient()
+		} else if GenOAuth.Provider == Providers.ADFS {
+			setDefaultsADFS()
+			configureOAuthClient()
 		} else {
 			configureOAuthClient()
 		}
@@ -431,6 +434,11 @@ func setDefaultsGoogle() {
 	}
 }
 
+func setDefaultsADFS() {
+	log.Info("configuring ADFS OAuth")
+	OAuthopts = oauth2.SetAuthURLParam("resource", GenOAuth.RedirectURL) // Needed or all claims won't be included
+}
+
 func setDefaultsGitHub() {
 	// log.Info("configuring GitHub OAuth")
 	if GenOAuth.AuthURL == "" {