User ChainedTokenCredential and fallback to interactive browser to login

wyunchi-ms · wyunchi-ms · commit 0c3429c76e28 · 2024-11-07T21:01:43.000+08:00
diff --git a/shell/agents/Microsoft.Azure.Agent/Schema.cs b/shell/agents/Microsoft.Azure.Agent/Schema.cs
@@ -357,6 +357,7 @@ internal class UserAccessToken
 {
     private readonly TokenRequestContext _tokenContext;
     private AccessToken? _accessToken;
+    private const string AiShellAppId = "04b07795-8ddb-461a-bbee-02f9e1bf7b46"; // Use Azure Cli's Application Id for now
 
     /// <summary>
     /// The access token.
@@ -386,7 +387,8 @@ internal async Task CreateOrRenewTokenAsync(CancellationToken cancellationToken)
 
             if (needRefresh)
             {
-                _accessToken = await new AzureCliCredential()
+                _accessToken = await new ChainedTokenCredential(new AzureCliCredential(),
+                    new InteractiveBrowserCredential(AiShellAppId))
                     .GetTokenAsync(_tokenContext, cancellationToken);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,7 @@ internal class UserAccessToken`
`357`	`357`	`{`
`358`	`358`	`private readonly TokenRequestContext _tokenContext;`
`359`	`359`	`private AccessToken? _accessToken;`
	`360`	`+ private const string AiShellAppId = "04b07795-8ddb-461a-bbee-02f9e1bf7b46"; // Use Azure Cli's Application Id for now`
`360`	`361`
`361`	`362`	`/// <summary>`
`362`	`363`	`/// The access token.`
`@@ -386,7 +387,8 @@ internal async Task CreateOrRenewTokenAsync(CancellationToken cancellationToken)`
`386`	`387`
`387`	`388`	`if (needRefresh)`
`388`	`389`	`{`
`389`		`- _accessToken = await new AzureCliCredential()`
	`390`	`+ _accessToken = await new ChainedTokenCredential(new AzureCliCredential(),`
	`391`	`+ new InteractiveBrowserCredential(AiShellAppId))`
`390`	`392`	`.GetTokenAsync(_tokenContext, cancellationToken);`
`391`	`393`	`}`
`392`	`394`	`}`