User ChainedTokenCredential and fallback to interactive browser to login

PowerShell · Nov 7, 2024 · 5d0072c · 5d0072c
1 parent aa01ff7
commit 5d0072c
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/shell/agents/Microsoft.Azure.Agent/Schema.cs b/shell/agents/Microsoft.Azure.Agent/Schema.cs
@@ -386,24 +386,16 @@ internal async Task CreateOrRenewTokenAsync(CancellationToken cancellationToken)
 
             if (needRefresh)
             {
-                _accessToken = await new AzureCliCredential()
+                _accessToken = await new ChainedTokenCredential(new AzureCliCredential(),
+                    new InteractiveBrowserCredential())
                     .GetTokenAsync(_tokenContext, cancellationToken);
             }
         }
-        catch (Exception azureCliLoginException) when (azureCliLoginException is not OperationCanceledException)
+        catch (Exception e) when (e is not OperationCanceledException)
         {
-            string message = $"Failed to generate the user access token using az cli and try to fallback to interactive browser: {azureCliLoginException.Message}.";
-            Telemetry.Trace(AzTrace.Exception(message), azureCliLoginException);
-            try {
-                _accessToken = await new InteractiveBrowserCredential()
-                    .GetTokenAsync(_tokenContext, cancellationToken);
-            }
-            catch (Exception interactiveBrowserLoginException) when (interactiveBrowserLoginException is not OperationCanceledException)
-            {
-                message = $"Failed to generate the user access token using interactive browser: {interactiveBrowserLoginException.Message}.";
-                Telemetry.Trace(AzTrace.Exception(message), interactiveBrowserLoginException);
-                throw new TokenRequestException(message, interactiveBrowserLoginException);
-            }
+            string message = $"Failed to generate the user access token: {e.Message}.";
+            Telemetry.Trace(AzTrace.Exception(message), e);
+            throw new TokenRequestException(message, e);
         }
     }