OAuth transport and use when available in api client

Author: burmudar

cmd/src/main.go

@@ -15,6 +15,8 @@ import (
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 
 	"github.com/sourcegraph/src-cli/internal/api"
+	"github.com/sourcegraph/src-cli/internal/keyring"
+	"github.com/sourcegraph/src-cli/internal/oauthdevice"
 )
 
 const usageText = `src is a tool that provides access to Sourcegraph instances.
@@ -123,15 +125,25 @@ type config struct {
 
 // apiClient returns an api.Client built from the configuration.
 func (c *config) apiClient(flags *api.Flags, out io.Writer) api.Client {
-	return api.NewClient(api.ClientOpts{
+	opts := api.ClientOpts{
 		Endpoint:          c.Endpoint,
 		AccessToken:       c.AccessToken,
 		AdditionalHeaders: c.AdditionalHeaders,
 		Flags:             flags,
 		Out:               out,
 		ProxyURL:          c.ProxyURL,
 		ProxyPath:         c.ProxyPath,
-	})
+	}
+	store, err := keyring.Open()
+	if err != nil {
+		panic("HALP")
+	}
+
+	if t, err := oauthdevice.LoadToken(store, c.Endpoint); err == nil {
+		opts.OAuthToken = t
+	}
+
+	return api.NewClient(opts)
 }
 
 // readConfig reads the config file from the given path.

internal/api/api.go

@@ -18,6 +18,7 @@ import (
 	"github.com/kballard/go-shellquote"
 	"github.com/mattn/go-isatty"
 
+	"github.com/sourcegraph/src-cli/internal/oauthdevice"
 	"github.com/sourcegraph/src-cli/internal/version"
 )
 
@@ -85,6 +86,8 @@ type ClientOpts struct {
 
 	ProxyURL  *url.URL
 	ProxyPath string
+
+	OAuthToken *oauthdevice.Token
 }
 
 func buildTransport(opts ClientOpts, flags *Flags) *http.Transport {
@@ -102,6 +105,13 @@ func buildTransport(opts ClientOpts, flags *Flags) *http.Transport {
 		transport = withProxyTransport(transport, opts.ProxyURL, opts.ProxyPath)
 	}
 
+	if opt.AccessToken == "" && opt.OAuthToken != nil {
+		transport = &oauthdevice.Transport{
+			Base: transport,
+			Token: opts.OAuthToken
+		}
+	}
+
 	return transport
 }
 

internal/oauthdevice/http_transport.go

@@ -12,20 +12,20 @@ var _ http.RoundTripper = (*Transport)(nil)
 
 type Transport struct {
 	Base  http.RoundTripper
-	token *Token
+	Token *Token
 }
 
 // RoundTrip implements http.RoundTripper.
 func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
 	ctx := req.Context()
-	token, err := maybeRefresh(ctx, t.token)
+	token, err := maybeRefresh(ctx, t.Token)
 	if err != nil {
 		return nil, err
 	}
-	t.token = token
+	t.Token = token
 
 	req2 := req.Clone(req.Context())
-	req2.Header.Set("Authorization", "Bearer "+t.token.AccessToken)
+	req2.Header.Set("Authorization", "Bearer "+t.Token.AccessToken)
 
 	if t.Base != nil {
 		return t.Base.RoundTrip(req2)