Fix creating *http.Client logic

gh/gh.go

@@ -218,22 +218,11 @@ func makeFS(owner, repo string, a *github.ReleaseAsset) (fs.FS, error) {
 }
 
 func downloadAsset(owner, repo string, a *github.ReleaseAsset) ([]byte, error) {
-	var (
-		client *http.Client
-		err    error
-	)
-	token, v3ep, _, _ := factory.GetTokenAndEndpoints()
-	if token == "" {
-		client = &http.Client{
-			Timeout:   30 * time.Second,
-			Transport: http.DefaultTransport.(*http.Transport).Clone(),
-		}
-	} else {
-		client, err = gh.HTTPClient(&api.ClientOptions{})
-		if err != nil {
-			return nil, err
-		}
+	client, err := httpClient()
+	if err != nil {
+		return nil, err
 	}
+	_, v3ep, _, _ := factory.GetTokenAndEndpoints()
 	u := fmt.Sprintf("%s/repos/%s/%s/releases/assets/%d", v3ep, owner, repo, a.GetID())
 	req, err := http.NewRequest(http.MethodGet, u, nil)
 	if err != nil {
@@ -275,3 +264,34 @@ func client(ctx context.Context) (*github.Client, error) {
 	}
 	return c, nil
 }
+
+func httpClient() (*http.Client, error) {
+	token, v3ep, _, _ := factory.GetTokenAndEndpoints()
+	if token == "" {
+		return &http.Client{
+			Timeout:   30 * time.Second,
+			Transport: http.DefaultTransport.(*http.Transport).Clone(),
+		}, nil
+	}
+	client, err := gh.HTTPClient(&api.ClientOptions{})
+	if err != nil {
+		return nil, err
+	}
+	u := fmt.Sprintf("%s/user", v3ep)
+	req, err := http.NewRequest(http.MethodGet, u, nil)
+	if err != nil {
+		return nil, err
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		client = &http.Client{
+			Timeout:   30 * time.Second,
+			Transport: http.DefaultTransport.(*http.Transport).Clone(),
+		}
+	}
+	return client, nil
+}