fix(coding-agent): use UserTenantId for credential resolution#7078
Merged
Conversation
The extension was using Subscription.TenantId (the resource tenant) to create the AzureDeveloperCLICredential after subscription selection. For multi-tenant/guest users, this differs from Subscription.UserTenantId (the user access tenant), causing 'refresh token expired' errors. This aligns the extension with how azd core resolves credentials via SubscriptionsManager.LookupTenant(), which returns UserAccessTenantId. Fixes #7077 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes multi-tenant/guest credential resolution in the azure.coding-agent extension by using the user access tenant (the tenant the user authenticated through) rather than the subscription’s resource tenant when creating the AzureDeveloperCLICredential, aligning behavior with azd core.
Changes:
- Switch tenant selection from
Subscription.TenantIdtoSubscription.UserTenantIdwhen constructingAzureDeveloperCLICredentialOptions. - Keep subscription selection flow unchanged while ensuring the credential targets the correct tenant for token acquisition in multi-tenant scenarios.
Comments suppressed due to low confidence (1)
cli/azd/extensions/azure.coding-agent/internal/cmd/coding_agent_config.go:206
tenantIDis now sourced fromSubscription.UserTenantId(user auth tenant), but the same variable is later used to build the Azure Portal managed identity URL (the#@<tenant>segment). For guest/multi-tenant scenarios the portal blade typically needs the resource tenant (e.g.,Subscription.TenantIdorauthConfig.TenantId) to show the subscription/resource group. Suggest splitting this into two variables (e.g.,userTenantIDforAzureDeveloperCLICredentialOptions.TenantID, andresourceTenantIDfor the portal link) to avoid breaking the portal instructions flow.
tenantID := subscriptionResponse.Subscription.UserTenantId
subscriptionID := subscriptionResponse.Subscription.Id
cred, err := azidentity.NewAzureDeveloperCLICredential(&azidentity.AzureDeveloperCLICredentialOptions{
TenantID: tenantID,
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
rajeshkamal5050
approved these changes
Mar 12, 2026
JeffreyCA
reviewed
Mar 12, 2026
Comment on lines
+202
to
203
| tenantID := subscriptionResponse.Subscription.UserTenantId | ||
| subscriptionID := subscriptionResponse.Subscription.Id |
Contributor
There was a problem hiding this comment.
Can we verify other extensions don't have the same issue too?
Member
Author
There was a problem hiding this comment.
I'll turn the engines on it :)
Member
Author
There was a problem hiding this comment.
Audited all extensions. Found and fixed the same bug in 5 more:
| Extension | Files | Status |
|---|---|---|
| azure.ai.models | custom.go, init.go (2 spots) | ❌ Fixed |
| azure.ai.agents | init.go, init_from_code.go | ❌ Fixed |
| azure.ai.finetune | init.go (2 spots) | ❌ Fixed |
| microsoft.azd.ai.builder | start.go | ❌ Fixed |
| microsoft.azd.demo | prompt.go | ❌ Fixed |
| azure.appservice | swap.go | ✅ Already correct (uses LookupTenant) |
| azure.ai.agents | parser.go, service_target_agent.go | ✅ Already correct (uses LookupTenant) |
Pushed in b5c9ebf.
Member
There was a problem hiding this comment.
It was me the entire time! :|
jongio
pushed a commit
to jongio/azure-dev
that referenced
this pull request
Mar 18, 2026
…7078) The extension was using Subscription.TenantId (the resource tenant) to create the AzureDeveloperCLICredential after subscription selection. For multi-tenant/guest users, this differs from Subscription.UserTenantId (the user access tenant), causing 'refresh token expired' errors. This aligns the extension with how azd core resolves credentials via SubscriptionsManager.LookupTenant(), which returns UserAccessTenantId. Fixes Azure#7077 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jongio
pushed a commit
to jongio/azure-dev
that referenced
this pull request
Mar 27, 2026
…7078) The extension was using Subscription.TenantId (the resource tenant) to create the AzureDeveloperCLICredential after subscription selection. For multi-tenant/guest users, this differs from Subscription.UserTenantId (the user access tenant), causing 'refresh token expired' errors. This aligns the extension with how azd core resolves credentials via SubscriptionsManager.LookupTenant(), which returns UserAccessTenantId. Fixes Azure#7077 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jongio
pushed a commit
to jongio/azure-dev
that referenced
this pull request
Mar 27, 2026
…7078) The extension was using Subscription.TenantId (the resource tenant) to create the AzureDeveloperCLICredential after subscription selection. For multi-tenant/guest users, this differs from Subscription.UserTenantId (the user access tenant), causing 'refresh token expired' errors. This aligns the extension with how azd core resolves credentials via SubscriptionsManager.LookupTenant(), which returns UserAccessTenantId. Fixes Azure#7077 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jongio
pushed a commit
to jongio/azure-dev
that referenced
this pull request
Mar 27, 2026
…7078) The extension was using Subscription.TenantId (the resource tenant) to create the AzureDeveloperCLICredential after subscription selection. For multi-tenant/guest users, this differs from Subscription.UserTenantId (the user access tenant), causing 'refresh token expired' errors. This aligns the extension with how azd core resolves credentials via SubscriptionsManager.LookupTenant(), which returns UserAccessTenantId. Fixes Azure#7077 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jongio
pushed a commit
to jongio/azure-dev
that referenced
this pull request
Mar 27, 2026
…7078) The extension was using Subscription.TenantId (the resource tenant) to create the AzureDeveloperCLICredential after subscription selection. For multi-tenant/guest users, this differs from Subscription.UserTenantId (the user access tenant), causing 'refresh token expired' errors. This aligns the extension with how azd core resolves credentials via SubscriptionsManager.LookupTenant(), which returns UserAccessTenantId. Fixes Azure#7077 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix
Multiple extensions were using
Subscription.TenantId(the resource tenant — the tenant that owns the subscription) when creatingAzureDeveloperCLICredentialafter user subscription selection.For multi-tenant/guest users,
TenantIddiffers fromUserTenantId(the tenant the user authenticated through). Using the resource tenant causes the credential to target a tenant the user may not have direct auth tokens for, resulting inAADSTS70043/AADSTS700082"refresh token expired" errors.Change
This aligns all extensions with how azd core resolves credentials —
SubscriptionsManager.LookupTenant()returnsUserAccessTenantId, notTenantId.For single-tenant users,
TenantId == UserTenantId, so no behavior change.Affected extensions
Extensions already correct (using
LookupTenant()): azure.appservice, azure.ai.agents (parser.go, service_target_agent.go).Fixes #7077
Related: #7070