Fix tenant id & client id precedence. (#292)

* Fix tenant id & client id precedence.
microsoftgraph · Nov 9, 2023 · 9525811 · 9525811
1 parent 0b5ddfe
commit 9525811
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Microsoft.Graph.Cli.Core/Authentication/EnvironmentCredential.cs b/src/Microsoft.Graph.Cli.Core/Authentication/EnvironmentCredential.cs
@@ -52,8 +52,10 @@ public EnvironmentCredential(string? tenantId, string? clientId, TokenCredential
         {
             _options = options ?? new TokenCredentialOptions();
 
-            tenantId ??= Environment.GetEnvironmentVariable(Utils.Constants.Environment.TenantId);
-            clientId ??= Environment.GetEnvironmentVariable(Utils.Constants.Environment.ClientId);
+            var tId = Environment.GetEnvironmentVariable(Utils.Constants.Environment.TenantId);
+            var cId = Environment.GetEnvironmentVariable(Utils.Constants.Environment.ClientId);
+            tenantId = string.IsNullOrEmpty(tId) ? tenantId : tId;
+            clientId = string.IsNullOrEmpty(cId) ? clientId : cId;
             string? clientSecret = Environment.GetEnvironmentVariable(Utils.Constants.Environment.ClientSecret);
             string? clientCertificatePath = Environment.GetEnvironmentVariable(Utils.Constants.Environment.ClientCertificatePath);
             string? clientCertificatePassword = Environment.GetEnvironmentVariable(Utils.Constants.Environment.ClientCertificatePassword);

diff --git a/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj b/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj
@@ -8,7 +8,7 @@
     <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
     <DebugType>embedded</DebugType>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>preview.8</VersionSuffix>
+    <VersionSuffix>preview.9</VersionSuffix>
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>