fix(github): allow to use both token and URL

This commit fix a regresssion introduced in:
#21292

Before that, we were able to use both an URL and
also an authentication token.

Signed-off-by: foyerunix <[email protected]>

Author: foyerunix

applicationset/services/pull_request/github.go

@@ -23,17 +23,13 @@ func NewGithubService(token, url, owner, repo string, labels []string) (PullRequ
 	if token == "" {
 		token = os.Getenv("GITHUB_TOKEN")
 	}
-	httpClient := &http.Client{}
-	var client *github.Client
-	if url == "" {
-		if token == "" {
-			client = github.NewClient(httpClient)
-		} else {
-			client = github.NewClient(httpClient).WithAuthToken(token)
-		}
-	} else {
+	var client = github.NewClient(&http.Client{})
+	if token != "" {
+		client = client.WithAuthToken(token)
+	}
+	if url != "" {
 		var err error
-		client, err = github.NewClient(httpClient).WithEnterpriseURLs(url, url)
+		client, err = client.WithEnterpriseURLs(url, url)
 		if err != nil {
 			return nil, err
 		}