From 2eb40f8a14e561499134d7631b237fc730664fc6 Mon Sep 17 00:00:00 2001
From: Sam Coe <samcoe@users.noreply.github.com>
Date: Thu, 12 Nov 2020 10:03:39 +0300
Subject: [PATCH] Empty auth token env variables are equal to being unset

---
 cmd/gh/main.go                   |  4 ++--
 internal/config/from_env.go      | 24 +++++++++++-------------
 internal/config/from_env_test.go | 27 ++++-----------------------
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/cmd/gh/main.go b/cmd/gh/main.go
index 539e109c9..ec505d4b8 100644
--- a/cmd/gh/main.go
+++ b/cmd/gh/main.go
@@ -243,8 +243,8 @@ func basicClient(currentVersion string) (*api.Client, error) {
 	}
 	opts = append(opts, api.AddHeader("User-Agent", fmt.Sprintf("GitHub CLI %s", currentVersion)))
 
-	token, _, found := config.AuthTokenFromEnv(ghinstance.Default())
-	if !found {
+	token, _ := config.AuthTokenFromEnv(ghinstance.Default())
+	if token == "" {
 		if c, err := config.ParseDefaultConfig(); err == nil {
 			token, _ = c.Get(ghinstance.Default(), "oauth_token")
 		}
diff --git a/internal/config/from_env.go b/internal/config/from_env.go
index 0522aa39c..da4ac1536 100644
--- a/internal/config/from_env.go
+++ b/internal/config/from_env.go
@@ -30,8 +30,8 @@ func (c *envConfig) Hosts() ([]string, error) {
 			hasDefault = true
 		}
 	}
-	_, _, found := AuthTokenFromEnv(ghinstance.Default())
-	if (err != nil || !hasDefault) && found {
+	token, _ := AuthTokenFromEnv(ghinstance.Default())
+	if (err != nil || !hasDefault) && token != "" {
 		hosts = append([]string{ghinstance.Default()}, hosts...)
 		return hosts, nil
 	}
@@ -45,7 +45,7 @@ func (c *envConfig) Get(hostname, key string) (string, error) {
 
 func (c *envConfig) GetWithSource(hostname, key string) (string, string, error) {
 	if hostname != "" && key == "oauth_token" {
-		if token, env, found := AuthTokenFromEnv(hostname); found {
+		if token, env := AuthTokenFromEnv(hostname); token != "" {
 			return token, env, nil
 		}
 	}
@@ -55,7 +55,7 @@ func (c *envConfig) GetWithSource(hostname, key string) (string, string, error)
 
 func (c *envConfig) CheckWriteable(hostname, key string) error {
 	if hostname != "" && key == "oauth_token" {
-		if _, env, found := AuthTokenFromEnv(hostname); found {
+		if token, env := AuthTokenFromEnv(hostname); token != "" {
 			return fmt.Errorf("read-only token in %s cannot be modified", env)
 		}
 	}
@@ -63,20 +63,18 @@ func (c *envConfig) CheckWriteable(hostname, key string) error {
 	return c.Config.CheckWriteable(hostname, key)
 }
 
-func AuthTokenFromEnv(hostname string) (string, string, bool) {
+func AuthTokenFromEnv(hostname string) (string, string) {
 	if ghinstance.IsEnterprise(hostname) {
-		if token, found := os.LookupEnv(GH_ENTERPRISE_TOKEN); found {
-			return token, GH_ENTERPRISE_TOKEN, found
+		if token := os.Getenv(GH_ENTERPRISE_TOKEN); token != "" {
+			return token, GH_ENTERPRISE_TOKEN
 		}
 
-		token, found := os.LookupEnv(GITHUB_ENTERPRISE_TOKEN)
-		return token, GITHUB_ENTERPRISE_TOKEN, found
+		return os.Getenv(GITHUB_ENTERPRISE_TOKEN), GITHUB_ENTERPRISE_TOKEN
 	}
 
-	if token, found := os.LookupEnv(GH_TOKEN); found {
-		return token, GH_TOKEN, found
+	if token := os.Getenv(GH_TOKEN); token != "" {
+		return token, GH_TOKEN
 	}
 
-	token, found := os.LookupEnv(GITHUB_TOKEN)
-	return token, GITHUB_TOKEN, found
+	return os.Getenv(GITHUB_TOKEN), GITHUB_TOKEN
 }
diff --git a/internal/config/from_env_test.go b/internal/config/from_env_test.go
index 55a45f9a0..baeb63194 100644
--- a/internal/config/from_env_test.go
+++ b/internal/config/from_env_test.go
@@ -260,29 +260,10 @@ func TestInheritEnv(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if tt.GITHUB_TOKEN != "" {
-				os.Setenv("GITHUB_TOKEN", tt.GITHUB_TOKEN)
-			} else {
-				os.Unsetenv("GITHUB_TOKEN")
-			}
-
-			if tt.GITHUB_ENTERPRISE_TOKEN != "" {
-				os.Setenv("GITHUB_ENTERPRISE_TOKEN", tt.GITHUB_ENTERPRISE_TOKEN)
-			} else {
-				os.Unsetenv("GITHUB_ENTERPRISE_TOKEN")
-			}
-
-			if tt.GH_TOKEN != "" {
-				os.Setenv("GH_TOKEN", tt.GH_TOKEN)
-			} else {
-				os.Unsetenv("GH_TOKEN")
-			}
-
-			if tt.GH_ENTERPRISE_TOKEN != "" {
-				os.Setenv("GH_ENTERPRISE_TOKEN", tt.GH_ENTERPRISE_TOKEN)
-			} else {
-				os.Unsetenv("GH_ENTERPRISE_TOKEN")
-			}
+			os.Setenv("GITHUB_TOKEN", tt.GITHUB_TOKEN)
+			os.Setenv("GITHUB_ENTERPRISE_TOKEN", tt.GITHUB_ENTERPRISE_TOKEN)
+			os.Setenv("GH_TOKEN", tt.GH_TOKEN)
+			os.Setenv("GH_ENTERPRISE_TOKEN", tt.GH_ENTERPRISE_TOKEN)
 
 			baseCfg := NewFromString(tt.baseConfig)
 			cfg := InheritEnv(baseCfg)