If the instance url is set and it is github.com, use a standard client (#12)

jirwin · web-flow · commit 3ec3c340b118 · 2022-12-21T17:51:29.000-08:00
* If the instance url is set and it is github.com, use a standard client

* Actually use githubDotCom constant
diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go
@@ -17,6 +17,8 @@ import (
 	"google.golang.org/grpc/status"
 )
 
+const githubDotCom = "https://github.com"
+
 var ValidAssetDomains = []string{"avatars.githubusercontent.com"}
 
 var (
@@ -139,7 +141,8 @@ func newGithubClient(ctx context.Context, instanceURL string, accessToken string
 	)
 	tc := oauth2.NewClient(ctx, ts)
 
-	if instanceURL != "" {
+	instanceURL = strings.TrimSuffix(instanceURL, "/")
+	if instanceURL != "" && instanceURL != githubDotCom {
 		return github.NewEnterpriseClient(instanceURL, instanceURL, tc)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ import (`
`17`	`17`	`"google.golang.org/grpc/status"`
`18`	`18`	`)`
`19`	`19`
	`20`	`+const githubDotCom = "https://github.com"`
	`21`	`+`
`20`	`22`	`var ValidAssetDomains = []string{"avatars.githubusercontent.com"}`
`21`	`23`
`22`	`24`	`var (`
`@@ -139,7 +141,8 @@ func newGithubClient(ctx context.Context, instanceURL string, accessToken string`
`139`	`141`	`)`
`140`	`142`	`tc := oauth2.NewClient(ctx, ts)`
`141`	`143`
`142`		`- if instanceURL != "" {`
	`144`	`+ instanceURL = strings.TrimSuffix(instanceURL, "/")`
	`145`	`+ if instanceURL != "" && instanceURL != githubDotCom {`
`143`	`146`	`return github.NewEnterpriseClient(instanceURL, instanceURL, tc)`
`144`	`147`	`}`
`145`	`148`