don't let auth env argument block other auth options (#316)

* prioritize actual options over implicit env variable for auth token

1 files changed, 12 insertions, 8 deletions

diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 98031116a..889ccef0b 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -7434,6 +7434,14 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			}
 		}
 
+		auto GetEnvAccessToken = [](const std::string& AccessTokenEnv) -> std::string {
+			if (!AccessTokenEnv.empty())
+			{
+				return GetEnvVariable(AccessTokenEnv);
+			}
+			return {};
+		};
+
 		if (!m_AccessToken.empty())
 		{
 			ClientSettings.AccessTokenProvider = httpclientauth::CreateFromStaticToken(m_AccessToken);
@@ -7446,14 +7454,6 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 				ClientSettings.AccessTokenProvider = httpclientauth::CreateFromStaticToken(ResolvedAccessToken);
 			}
 		}
-		else if (!m_AccessTokenEnv.empty())
-		{
-			std::string ResolvedAccessToken = GetEnvVariable(m_AccessTokenEnv);
-			if (!ResolvedAccessToken.empty())
-			{
-				ClientSettings.AccessTokenProvider = httpclientauth::CreateFromStaticToken(ResolvedAccessToken);
-			}
-		}
 		else if (!m_OAuthUrl.empty())
 		{
 			ClientSettings.AccessTokenProvider = httpclientauth::CreateFromOAuthClientCredentials(
@@ -7464,6 +7464,10 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			CreateAuthMgr();
 			ClientSettings.AccessTokenProvider = httpclientauth::CreateFromOpenIdProvider(*Auth, m_OpenIdProviderName);
 		}
+		else if (std::string ResolvedAccessToken = GetEnvAccessToken(m_AccessTokenEnv); !ResolvedAccessToken.empty())
+		{
+			ClientSettings.AccessTokenProvider = httpclientauth::CreateFromStaticToken(ResolvedAccessToken);
+		}
 		else
 		{
 			CreateAuthMgr();