Merge pull request #8 from simongottschlag/add_idtoken_response

Add resource to ADFS redirect
simongottschlag · Feb 7, 2019 · 0400071 · 0400071
2 parents 08f946c + aa90268
commit 0400071
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -75,6 +75,8 @@ func loginURL(r *http.Request, state string) string {
 		}
 	} else if cfg.GenOAuth.Provider == cfg.Providers.IndieAuth {
 		url = cfg.OAuthClient.AuthCodeURL(state, oauth2.SetAuthURLParam("response_type", "id"))
+	} else if cfg.GenOAuth.Provider == cfg.Providers.ADFS {
+		url = cfg.OAuthClient.AuthCodeURL(state, cfg.OAuthopts)
 	} else {
 		url = cfg.OAuthClient.AuthCodeURL(state)
 	}

diff --git a/pkg/cfg/cfg.go b/pkg/cfg/cfg.go
@@ -424,6 +424,9 @@ func setDefaults() {
 		} else if GenOAuth.Provider == Providers.GitHub {
 			setDefaultsGitHub()
 			configureOAuthClient()
+		} else if GenOAuth.Provider == Providers.ADFS {
+			setDefaultsADFS()
+			configureOAuthClient()
 		} else {
 			configureOAuthClient()
 		}
@@ -449,6 +452,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 == "" {