remove oauth flag

Author: burmudar

cmd/src/login.go

@@ -29,14 +29,9 @@ Examples:
 
     $ src login https://sourcegraph.com
 
-  Use OAuth device flow to authenticate:
+  If no access token is configured, 'src login' uses OAuth device flow automatically:
 
-    $ src login --oauth https://sourcegraph.com
-
-
-  Override the default client id used during device flow when authenticating:
-
-    $ src login --oauth https://sourcegraph.com
+    $ src login https://sourcegraph.com
 `
 
 	flagSet := flag.NewFlagSet("login", flag.ExitOnError)
@@ -47,7 +42,6 @@ Examples:
 
 	var (
 		apiFlags = api.NewFlags(flagSet)
-		useOAuth = flagSet.Bool("oauth", false, "Use OAuth device flow to obtain an access token interactively")
 	)
 
 	handler := func(args []string) error {
@@ -69,7 +63,6 @@ Examples:
 			client:      client,
 			endpoint:    endpoint,
 			out:         os.Stdout,
-			useOAuth:    *useOAuth,
 			apiFlags:    apiFlags,
 			oauthClient: oauth.NewClient(oauth.DefaultClientID),
 		})
@@ -87,7 +80,6 @@ type loginParams struct {
 	client      api.Client
 	endpoint    string
 	out         io.Writer
-	useOAuth    bool
 	apiFlags    *api.Flags
 	oauthClient oauth.Client
 }
@@ -117,10 +109,6 @@ func loginCmd(ctx context.Context, p loginParams) error {
 func selectLoginFlow(_ context.Context, p loginParams) (loginFlowKind, loginFlow) {
 	endpointArg := cleanEndpoint(p.endpoint)
 
-	if p.useOAuth {
-		return loginFlowOAuth, runOAuthLogin
-	}
-
 	switch p.cfg.AuthMode() {
 	case AuthModeOAuth:
 		return loginFlowOAuth, runOAuthLogin
@@ -146,6 +134,6 @@ func loginAccessTokenMessage(endpoint string) string {
 
    To verify that it's working, run the login command again.
 
-   Alternatively, you can try logging in using OAuth by running: src login --oauth %s
+   Alternatively, you can try logging in interactively by running: src login %s
 `, endpoint, endpoint, endpoint)
 }

cmd/src/login_oauth.go

@@ -44,7 +44,7 @@ func oauthLoginClient(ctx context.Context, p loginParams, endpoint string) (api.
 	}
 
 	return api.NewClient(api.ClientOpts{
-		Endpoint:          p.cfg.Endpoint,
+		Endpoint:          endpoint,
 		AdditionalHeaders: p.cfg.AdditionalHeaders,
 		Flags:             p.apiFlags,
 		Out:               p.out,

cmd/src/login_test.go

@@ -74,7 +74,7 @@ func TestLogin(t *testing.T) {
 		if err != cmderrors.ExitCode1 {
 			t.Fatal(err)
 		}
-		wantOut := "❌ Problem: Invalid access token.\n\n🛠  To fix: Create an access token by going to $ENDPOINT/user/settings/tokens, then set the following environment variables in your terminal:\n\n   export SRC_ENDPOINT=$ENDPOINT\n   export SRC_ACCESS_TOKEN=(your access token)\n\n   To verify that it's working, run the login command again.\n\n   Alternatively, you can try logging in using OAuth by running: src login --oauth $ENDPOINT\n\n   (If you need to supply custom HTTP request headers, see information about SRC_HEADER_* and SRC_HEADERS env vars at https://github.com/sourcegraph/src-cli/blob/main/AUTH_PROXY.md)"
+		wantOut := "❌ Problem: Invalid access token.\n\n🛠  To fix: Create an access token by going to $ENDPOINT/user/settings/tokens, then set the following environment variables in your terminal:\n\n   export SRC_ENDPOINT=$ENDPOINT\n   export SRC_ACCESS_TOKEN=(your access token)\n\n   To verify that it's working, run the login command again.\n\n   Alternatively, you can try logging in interactively by running: src login $ENDPOINT\n\n   (If you need to supply custom HTTP request headers, see information about SRC_HEADER_* and SRC_HEADERS env vars at https://github.com/sourcegraph/src-cli/blob/main/AUTH_PROXY.md)"
 		wantOut = strings.ReplaceAll(wantOut, "$ENDPOINT", endpoint)
 		if out != wantOut {
 			t.Errorf("got output %q, want %q", out, wantOut)
@@ -125,18 +125,6 @@ func (f fakeOAuthClient) Refresh(context.Context, *oauth.Token) (*oauth.TokenRes
 }
 
 func TestSelectLoginFlow(t *testing.T) {
-	t.Run("uses oauth flow when oauth flag is set", func(t *testing.T) {
-		params := loginParams{
-			cfg:      &config{Endpoint: "https://example.com"},
-			endpoint: "https://example.com",
-			useOAuth: true,
-		}
-
-		if got, _ := selectLoginFlow(context.Background(), params); got != loginFlowOAuth {
-			t.Fatalf("flow = %v, want %v", got, loginFlowOAuth)
-		}
-	})
-
 	t.Run("uses oauth flow when no access token is configured", func(t *testing.T) {
 		params := loginParams{
 			cfg:      &config{Endpoint: "https://example.com"},

internal/api/api.go

@@ -269,7 +269,7 @@ func (r *request) do(ctx context.Context, result any) (bool, error) {
 			if oauth.IsOAuthTransport(r.client.httpClient.Transport) {
 				fmt.Println("The OAuth token is invalid. Please check that the Sourcegraph CLI client is still authorized.")
 				fmt.Println("")
-				fmt.Printf("To re-authorize, run: src login --oauth %s\n", r.client.opts.Endpoint)
+				fmt.Printf("To re-authorize, run: src login %s\n", r.client.opts.Endpoint)
 				fmt.Println("")
 				fmt.Println("Learn more at https://github.com/sourcegraph/src-cli#readme")
 				fmt.Println("")