more strict erroring around missing user/token

vilmibm · vilmibm · commit 815f461e8b0e · 2020-04-20T12:49:46.000-05:00
diff --git a/command/root.go b/command/root.go
@@ -109,11 +109,18 @@ func BasicClient() (*api.Client, error) {
 		opts = append(opts, apiVerboseLog())
 	}
 	opts = append(opts, api.AddHeader("User-Agent", fmt.Sprintf("GitHub CLI %s", Version)))
-	if c, err := context.ParseDefaultConfig(); err == nil {
-		if token, err := c.Get(defaultHostname, "oauth_token"); err == nil {
-			opts = append(opts, api.AddHeader("Authorization", fmt.Sprintf("token %s", token)))
-		}
+
+	c, err := context.ParseDefaultConfig()
+	if err != nil {
+		return nil, err
 	}
+
+	token, err := c.Get(defaultHostname, "oauth_token")
+	if token == "" || err != nil {
+		return nil, err
+	}
+
+	opts = append(opts, api.AddHeader("Authorization", fmt.Sprintf("token %s", token)))
 	return api.NewClient(opts...), nil
 }
 
diff --git a/context/context.go b/context/context.go
@@ -190,7 +190,12 @@ func (c *fsContext) AuthToken() (string, error) {
 		return "", err
 	}
 
-	return config.Get(defaultHostname, "oauth_token")
+	token, err := config.Get(defaultHostname, "token")
+	if token == "" || err != nil {
+		return "", err
+	}
+
+	return token, nil
 }
 
 func (c *fsContext) SetAuthToken(t string) {
@@ -203,7 +208,12 @@ func (c *fsContext) AuthLogin() (string, error) {
 		return "", err
 	}
 
-	return config.Get(defaultHostname, "user")
+	login, err := config.Get(defaultHostname, "user")
+	if login == "" || err != nil {
+		return "", err
+	}
+
+	return login, nil
 }
 
 func (c *fsContext) Branch() (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,12 @@ func (c *fsContext) AuthToken() (string, error) {`
`190`	`190`	`return "", err`
`191`	`191`	`}`
`192`	`192`
`193`		`- return config.Get(defaultHostname, "oauth_token")`
	`193`	`+ token, err := config.Get(defaultHostname, "token")`
	`194`	`+ if token == "" \|\| err != nil {`
	`195`	`+ return "", err`
	`196`	`+ }`
	`197`	`+`
	`198`	`+ return token, nil`
`194`	`199`	`}`
`195`	`200`
`196`	`201`	`func (c *fsContext) SetAuthToken(t string) {`
`@@ -203,7 +208,12 @@ func (c *fsContext) AuthLogin() (string, error) {`
`203`	`208`	`return "", err`
`204`	`209`	`}`
`205`	`210`
`206`		`- return config.Get(defaultHostname, "user")`
	`211`	`+ login, err := config.Get(defaultHostname, "user")`
	`212`	`+ if login == "" \|\| err != nil {`
	`213`	`+ return "", err`
	`214`	`+ }`
	`215`	`+`
	`216`	`+ return login, nil`
`207`	`217`	`}`
`208`	`218`
`209`	`219`	`func (c *fsContext) Branch() (string, error) {`