fix package rename

Author: burmudar

cmd/src/main.go

@@ -16,7 +16,7 @@ import (
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 
 	"github.com/sourcegraph/src-cli/internal/api"
-	"github.com/sourcegraph/src-cli/internal/oauthdevice"
+	"github.com/sourcegraph/src-cli/internal/oauth"
 )
 
 const usageText = `src is a tool that provides access to Sourcegraph instances.
@@ -136,7 +136,7 @@ func (c *config) apiClient(flags *api.Flags, out io.Writer) api.Client {
 
 	// Only use OAuth if we do not have SRC_ACCESS_TOKEN set
 	if c.AccessToken == "" {
-		if t, err := oauthdevice.LoadToken(context.Background(), c.Endpoint); err == nil {
+		if t, err := oauth.LoadToken(context.Background(), c.Endpoint); err == nil {
 			opts.OAuthToken = t
 		} else {
 			// TODO(burmudar): should return an error instead

internal/api/api.go

@@ -18,7 +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/oauth"
 	"github.com/sourcegraph/src-cli/internal/version"
 )
 
@@ -87,7 +87,7 @@ type ClientOpts struct {
 	ProxyURL  *url.URL
 	ProxyPath string
 
-	OAuthToken *oauthdevice.Token
+	OAuthToken *oauth.Token
 }
 
 func buildTransport(opts ClientOpts, flags *Flags) http.RoundTripper {
@@ -111,7 +111,7 @@ func buildTransport(opts ClientOpts, flags *Flags) http.RoundTripper {
 	}
 
 	if opts.AccessToken == "" && opts.OAuthToken != nil {
-		transport = &oauthdevice.Transport{
+		transport = &oauth.Transport{
 			Base:  transport,
 			Token: opts.OAuthToken,
 		}

internal/oauth/flow.go

@@ -80,6 +80,7 @@ type ErrorResponse struct {
 }
 
 type Client interface {
+	ClientID() string
 	Discover(ctx context.Context, endpoint string) (*OIDCConfiguration, error)
 	Start(ctx context.Context, endpoint string, scopes []string) (*DeviceAuthResponse, error)
 	Poll(ctx context.Context, endpoint, deviceCode string, interval time.Duration, expiresIn int) (*TokenResponse, error)
@@ -107,6 +108,10 @@ func NewClientWithHTTPClient(clientID string, c *http.Client) Client {
 	}
 }
 
+func (c *httpClient) ClientID() string {
+	return c.clientID
+}
+
 // Discover fetches the openid-configuration which contains all the routes a client should
 // use for authorization, device flows, tokens etc.
 //

internal/oauth/http_transport.go

@@ -1,4 +1,4 @@
-package oauthdevice
+package oauth
 
 import (
 	"context"

internal/oauth/http_transport_test.go

@@ -1,4 +1,4 @@
-package oauthdevice
+package oauth
 
 import (
 	"context"