fix(backport): adapt src auth token for release/6.12.1

Author: burmudar

cmd/src/auth_token.go

@@ -50,11 +50,11 @@ func init() {
 }
 
 func resolveAuthToken(ctx context.Context, cfg *config) (string, error) {
-	if cfg.accessToken != "" {
-		return cfg.accessToken, nil
+	if cfg.AccessToken != "" {
+		return cfg.AccessToken, nil
 	}
 
-	oauthToken, err := loadOAuthToken(ctx, cfg.endpointURL)
+	oauthToken, err := loadOAuthToken(ctx, cfg.Endpoint)
 	if err != nil {
 		return "", errors.Wrap(err, "error loading OAuth token; set SRC_ACCESS_TOKEN or run `src login`")
 	}

cmd/src/auth_token_test.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"net/url"
 	"testing"
 
 	"github.com/sourcegraph/src-cli/internal/oauth"
@@ -18,12 +17,12 @@ func TestResolveAuthToken(t *testing.T) {
 		newOAuthTokenRefresher = func(*oauth.Token) oauthTokenRefresher {
 			newRefresherCalled = true
 			return fakeOAuthTokenRefresher{}
-		}
+			}
 
-		token, err := resolveAuthToken(context.Background(), &config{
-			accessToken: "access-token",
-			endpointURL: mustParseURL(t, "https://example.com"),
-		})
+			token, err := resolveAuthToken(context.Background(), &config{
+				AccessToken: "access-token",
+				Endpoint:    "https://example.com",
+			})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -39,19 +38,19 @@ func TestResolveAuthToken(t *testing.T) {
 		reset := stubAuthTokenDependencies(t)
 		defer reset()
 
-		loadOAuthToken = func(context.Context, *url.URL) (*oauth.Token, error) {
-			return &oauth.Token{
-				AccessToken: "oauth-token",
-			}, nil
+			loadOAuthToken = func(context.Context, string) (*oauth.Token, error) {
+				return &oauth.Token{
+					AccessToken: "oauth-token",
+				}, nil
 		}
 
 		newOAuthTokenRefresher = func(*oauth.Token) oauthTokenRefresher {
 			return fakeOAuthTokenRefresher{token: oauth.Token{AccessToken: "oauth-token"}}
-		}
+			}
 
-		token, err := resolveAuthToken(context.Background(), &config{
-			endpointURL: mustParseURL(t, "https://example.com"),
-		})
+			token, err := resolveAuthToken(context.Background(), &config{
+				Endpoint: "https://example.com",
+			})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -64,17 +63,17 @@ func TestResolveAuthToken(t *testing.T) {
 		reset := stubAuthTokenDependencies(t)
 		defer reset()
 
-		loadOAuthToken = func(context.Context, *url.URL) (*oauth.Token, error) {
-			return &oauth.Token{AccessToken: "old-token"}, nil
-		}
+			loadOAuthToken = func(context.Context, string) (*oauth.Token, error) {
+				return &oauth.Token{AccessToken: "old-token"}, nil
+			}
 
 		newOAuthTokenRefresher = func(*oauth.Token) oauthTokenRefresher {
 			return fakeOAuthTokenRefresher{token: oauth.Token{AccessToken: "new-token"}}
-		}
+			}
 
-		token, err := resolveAuthToken(context.Background(), &config{
-			endpointURL: mustParseURL(t, "https://example.com"),
-		})
+			token, err := resolveAuthToken(context.Background(), &config{
+				Endpoint: "https://example.com",
+			})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -87,20 +86,20 @@ func TestResolveAuthToken(t *testing.T) {
 		reset := stubAuthTokenDependencies(t)
 		defer reset()
 
-		loadOAuthToken = func(context.Context, *url.URL) (*oauth.Token, error) {
-			return &oauth.Token{AccessToken: "old-token"}, nil
-		}
+			loadOAuthToken = func(context.Context, string) (*oauth.Token, error) {
+				return &oauth.Token{AccessToken: "old-token"}, nil
+			}
 		newOAuthTokenRefresher = func(*oauth.Token) oauthTokenRefresher {
 			return fakeOAuthTokenRefresher{err: fmt.Errorf("refresh failed")}
 		}
 
-		_, err := resolveAuthToken(context.Background(), &config{
-			endpointURL: mustParseURL(t, "https://example.com"),
+			_, err := resolveAuthToken(context.Background(), &config{
+				Endpoint: "https://example.com",
+			})
+			if err == nil {
+				t.Fatal("expected error")
+			}
 		})
-		if err == nil {
-			t.Fatal("expected error")
-		}
-	})
 }
 
 func stubAuthTokenDependencies(t *testing.T) func() {

internal/oauth/http_transport.go

@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"sync"
 	"time"
+
+	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
 var _ http.Transport