Fix detecting cases when cfg.Hosts() is empty

mislav · mislav · commit c598a1edc2f1 · 2021-07-20T15:50:58.000+02:00
diff --git a/pkg/cmd/auth/logout/logout.go b/pkg/cmd/auth/logout/logout.go
@@ -74,6 +74,9 @@ func logoutRun(opts *LogoutOptions) error {
 
 	candidates, err := cfg.Hosts()
 	if err != nil {
+		return err
+	}
+	if len(candidates) == 0 {
 		return fmt.Errorf("not logged in to any hosts")
 	}
 
diff --git a/pkg/cmd/auth/refresh/refresh.go b/pkg/cmd/auth/refresh/refresh.go
@@ -83,6 +83,9 @@ func refreshRun(opts *RefreshOptions) error {
 
 	candidates, err := cfg.Hosts()
 	if err != nil {
+		return err
+	}
+	if len(candidates) == 0 {
 		return fmt.Errorf("not logged in to any hosts. Use 'gh auth login' to authenticate with a host")
 	}
 
diff --git a/pkg/cmd/auth/status/status.go b/pkg/cmd/auth/status/status.go
@@ -69,7 +69,10 @@ func statusRun(opts *StatusOptions) error {
 	statusInfo := map[string][]string{}
 
 	hostnames, err := cfg.Hosts()
-	if len(hostnames) == 0 || err != nil {
+	if err != nil {
+		return err
+	}
+	if len(hostnames) == 0 {
 		fmt.Fprintf(stderr,
 			"You are not logged into any GitHub hosts. Run %s to authenticate.\n", cs.Bold("gh auth login"))
 		return cmdutil.SilentError

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ func logoutRun(opts *LogoutOptions) error {`
`74`	`74`
`75`	`75`	`candidates, err := cfg.Hosts()`
`76`	`76`	`if err != nil {`
	`77`	`+ return err`
	`78`	`+ }`
	`79`	`+ if len(candidates) == 0 {`
`77`	`80`	`return fmt.Errorf("not logged in to any hosts")`
`78`	`81`	`}`
`79`	`82`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@ func refreshRun(opts *RefreshOptions) error {`
`83`	`83`
`84`	`84`	`candidates, err := cfg.Hosts()`
`85`	`85`	`if err != nil {`
	`86`	`+ return err`
	`87`	`+ }`
	`88`	`+ if len(candidates) == 0 {`
`86`	`89`	`return fmt.Errorf("not logged in to any hosts. Use 'gh auth login' to authenticate with a host")`
`87`	`90`	`}`
`88`	`91`