Make sure to return an error when token is empty

ento · ento · commit 6dc71af53ac5 · 2025-03-01T09:13:52.000-08:00
diff --git a/cmd/cloudflared/access/cmd.go b/cmd/cloudflared/access/cmd.go
@@ -388,8 +388,12 @@ func generateToken(c *cli.Context) error {
 	}
 	tok, err := token.GetAppTokenIfExists(appInfo)
 	if err != nil || tok == "" {
-		fmt.Fprintln(os.Stderr, "Unable to find token for provided application. Please run login command to generate token.")
-		return err
+		message := "Unable to find valid token for provided application. Please run login command to generate token."
+		fmt.Fprintln(os.Stderr, message)
+		if err != nil {
+			return err
+		}
+		return errors.New(message)
 	}
 
 	if _, err := fmt.Fprint(os.Stdout, tok); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -388,8 +388,12 @@ func generateToken(c *cli.Context) error {`
`388`	`388`	`}`
`389`	`389`	`tok, err := token.GetAppTokenIfExists(appInfo)`
`390`	`390`	`if err != nil \|\| tok == "" {`
`391`		`- fmt.Fprintln(os.Stderr, "Unable to find token for provided application. Please run login command to generate token.")`
`392`		`- return err`
	`391`	`+ message := "Unable to find valid token for provided application. Please run login command to generate token."`
	`392`	`+ fmt.Fprintln(os.Stderr, message)`
	`393`	`+ if err != nil {`
	`394`	`+ return err`
	`395`	`+ }`
	`396`	`+ return errors.New(message)`
`393`	`397`	`}`
`394`	`398`
`395`	`399`	`if _, err := fmt.Fprint(os.Stdout, tok); err != nil {`