oauth2: allow override of grant_type

twpayne · twpayne · commit 51f4c98d90d0 · 2019-01-18T14:49:38.000+01:00
diff --git a/clientcredentials/clientcredentials.go b/clientcredentials/clientcredentials.go
@@ -90,7 +90,9 @@ func (c *tokenSource) Token() (*oauth2.Token, error) {
 		v.Set("scope", strings.Join(c.conf.Scopes, " "))
 	}
 	for k, p := range c.conf.EndpointParams {
-		if _, ok := v[k]; ok {
+		// Allow grant_type to be overridden to allow interoperability with
+		// non-compliant implementations.
+		if _, ok := v[k]; ok && k != "grant_type" {
 			return nil, fmt.Errorf("oauth2: cannot overwrite parameter %q", k)
 		}
 		v[k] = p

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,9 @@ func (c tokenSource) Token() (oauth2.Token, error) {`
`90`	`90`	`v.Set("scope", strings.Join(c.conf.Scopes, " "))`
`91`	`91`	`}`
`92`	`92`	`for k, p := range c.conf.EndpointParams {`
`93`		`- if _, ok := v[k]; ok {`
	`93`	`+ // Allow grant_type to be overridden to allow interoperability with`
	`94`	`+ // non-compliant implementations.`
	`95`	`+ if _, ok := v[k]; ok && k != "grant_type" {`
`94`	`96`	`return nil, fmt.Errorf("oauth2: cannot overwrite parameter %q", k)`
`95`	`97`	`}`
`96`	`98`	`v[k] = p`