remove obsolete ensureScopes

vilmibm · vilmibm · commit c06eacf4ee66 · 2020-07-21T17:42:52.000-05:00
diff --git a/command/root.go b/command/root.go
@@ -261,46 +261,6 @@ var apiClientForContext = func(ctx context.Context) (*api.Client, error) {
 	return api.NewClient(opts...), nil
 }
 
-var ensureScopes = func(ctx context.Context, client *api.Client, wantedScopes ...string) (*api.Client, error) {
-	hasScopes, appID, err := client.HasScopes(wantedScopes...)
-	if err != nil {
-		return client, err
-	}
-
-	if hasScopes {
-		return client, nil
-	}
-
-	tokenFromEnv := len(os.Getenv("GITHUB_TOKEN")) > 0
-
-	if config.IsGitHubApp(appID) && !tokenFromEnv && utils.IsTerminal(os.Stdin) && utils.IsTerminal(os.Stderr) {
-		cfg, err := ctx.Config()
-		if err != nil {
-			return nil, err
-		}
-		_, err = config.AuthFlowWithConfig(cfg, defaultHostname, "Notice: additional authorization required")
-		if err != nil {
-			return nil, err
-		}
-
-		reloadedClient, err := apiClientForContext(ctx)
-		if err != nil {
-			return client, err
-		}
-		return reloadedClient, nil
-	} else {
-		fmt.Fprintf(os.Stderr, "Warning: gh now requires %s OAuth scopes.\n", wantedScopes)
-		fmt.Fprintf(os.Stderr, "Visit https://github.com/settings/tokens and edit your token to enable %s\n", wantedScopes)
-		if tokenFromEnv {
-			fmt.Fprintln(os.Stderr, "or generate a new token for the GITHUB_TOKEN environment variable")
-		} else {
-			fmt.Fprintln(os.Stderr, "or generate a new token and paste it via `gh config set -h github.com oauth_token MYTOKEN`")
-		}
-		return client, errors.New("Unable to reauthenticate")
-	}
-
-}
-
 func apiVerboseLog() api.ClientOption {
 	logTraffic := strings.Contains(os.Getenv("DEBUG"), "api")
 	colorize := utils.IsTerminal(os.Stderr)
diff --git a/command/testing.go b/command/testing.go
@@ -97,9 +97,6 @@ func initBlankContext(cfg, repo, branch string) {
 
 func initFakeHTTP() *httpmock.Registry {
 	http := &httpmock.Registry{}
-	ensureScopes = func(ctx context.Context, client *api.Client, wantedScopes ...string) (*api.Client, error) {
-		return client, nil
-	}
 	apiClientForContext = func(context.Context) (*api.Client, error) {
 		return api.NewClient(api.ReplaceTripper(http)), nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,6 @@ func initBlankContext(cfg, repo, branch string) {`
`97`	`97`
`98`	`98`	`func initFakeHTTP() *httpmock.Registry {`
`99`	`99`	`http := &httpmock.Registry{}`
`100`		`- ensureScopes = func(ctx context.Context, client api.Client, wantedScopes ...string) (api.Client, error) {`
`101`		`- return client, nil`
`102`		`- }`
`103`	`100`	`apiClientForContext = func(context.Context) (*api.Client, error) {`
`104`	`101`	`return api.NewClient(api.ReplaceTripper(http)), nil`
`105`	`102`	`}`