rebase strife

vilmibm · vilmibm · commit 1efd3ebb514e · 2020-08-12T12:07:36.000-05:00
diff --git a/pkg/cmd/auth/auth.go b/pkg/cmd/auth/auth.go
@@ -3,6 +3,7 @@ package auth
 import (
 	authLoginCmd "github.com/cli/cli/pkg/cmd/auth/login"
 	authLogoutCmd "github.com/cli/cli/pkg/cmd/auth/logout"
+	authRefreshCmd "github.com/cli/cli/pkg/cmd/auth/refresh"
 	authStatusCmd "github.com/cli/cli/pkg/cmd/auth/status"
 	"github.com/cli/cli/pkg/cmdutil"
 	"github.com/spf13/cobra"
@@ -18,6 +19,7 @@ func NewCmdAuth(f *cmdutil.Factory) *cobra.Command {
 	cmd.AddCommand(authLoginCmd.NewCmdLogin(f, nil))
 	cmd.AddCommand(authLogoutCmd.NewCmdLogout(f, nil))
 	cmd.AddCommand(authStatusCmd.NewCmdStatus(f, nil))
+	cmd.AddCommand(authRefreshCmd.NewCmdRefresh(f, nil))
 
 	return cmd
 }
diff --git a/pkg/cmd/factory/http.go b/pkg/cmd/factory/http.go
@@ -35,7 +35,7 @@ func httpClient(io *iostreams.IOStreams, cfg config.Config, appVersion string, s
 				// TODO: check if stdout is TTY too
 				if errors.As(err, &notFound) && io.IsStdinTTY() {
 					// interactive OAuth flow
-					token, err = config.AuthFlowWithConfig(cfg, hostname, "Notice: authentication required")
+					token, err = config.AuthFlowWithConfig(cfg, hostname, "Notice: authentication required", nil)
 				}
 				if err != nil {
 					return "", err

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func httpClient(io *iostreams.IOStreams, cfg config.Config, appVersion string, s`
`35`	`35`	`// TODO: check if stdout is TTY too`
`36`	`36`	`if errors.As(err, &notFound) && io.IsStdinTTY() {`
`37`	`37`	`// interactive OAuth flow`
`38`		`- token, err = config.AuthFlowWithConfig(cfg, hostname, "Notice: authentication required")`
	`38`	`+ token, err = config.AuthFlowWithConfig(cfg, hostname, "Notice: authentication required", nil)`
`39`	`39`	`}`
`40`	`40`	`if err != nil {`
`41`	`41`	`return "", err`