v2: fix URL building in oauthConfig

oxtoacart · oxtoacart · commit e89a1ab786c8 · 2024-09-16T16:45:24.000-05:00
The new logic keeps the double slash in https:// as opposed to truncating it to https:/

Updates #cleanup

Signed-off-by: Percy Wegmann &lt;percy@tailscale.com&gt;
diff --git a/v2/oauth.go b/v2/oauth.go
@@ -6,7 +6,6 @@ package tsclient
 import (
 	"context"
 	"net/http"
-	"path"
 
 	"golang.org/x/oauth2/clientcredentials"
 )
@@ -33,7 +32,7 @@ func (ocfg OAuthConfig) HTTPClient() *http.Client {
 		ClientID:     ocfg.ClientID,
 		ClientSecret: ocfg.ClientSecret,
 		Scopes:       ocfg.Scopes,
-		TokenURL:     path.Join(baseURL, "/api/v2/oauth/token"),
+		TokenURL:     baseURL + "/api/v2/oauth/token",
 	}
 
 	// Use context.Background() here, since this is used to refresh the token in the future.

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package tsclient`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`	`8`	`"net/http"`
`9`		`- "path"`
`10`	`9`
`11`	`10`	`"golang.org/x/oauth2/clientcredentials"`
`12`	`11`	`)`
`@@ -33,7 +32,7 @@ func (ocfg OAuthConfig) HTTPClient() *http.Client {`
`33`	`32`	`ClientID: ocfg.ClientID,`
`34`	`33`	`ClientSecret: ocfg.ClientSecret,`
`35`	`34`	`Scopes: ocfg.Scopes,`
`36`		`- TokenURL: path.Join(baseURL, "/api/v2/oauth/token"),`
	`35`	`+ TokenURL: baseURL + "/api/v2/oauth/token",`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`// Use context.Background() here, since this is used to refresh the token in the future.`