scope fix for m365copilot mcp#457
Closed
sruthikilari wants to merge 1 commit into
Closed
Conversation
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Scanned FilesNone |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses auth failures when connecting to the mcp_M365Copilot MCP server by introducing a static scope/audience mapping and ensuring develop add-mcp-servers can override incorrect catalog metadata.
Changes:
- Add
mcp_M365CopilottoMcpConstants.ServerScopeMappings. - Update
DevelopCommandmanifest upsert logic to override catalog-provided scope/audience when a static mapping exists.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/Microsoft.Agents.A365.DevTools.Cli/Constants/McpConstants.cs | Adds a static scope/audience mapping entry for mcp_M365Copilot. |
| src/Microsoft.Agents.A365.DevTools.Cli/Commands/DevelopCommand.cs | Applies the static mapping during manifest upserts to guard against incorrect catalog scope/audience metadata. |
Comment on lines
+830
to
+836
| // Override catalog scope/audience with static mapping when available. | ||
| var (mappedScope, mappedAudience) = McpConstants.ServerScopeMappings.GetScopeAndAudience(existingServerName); | ||
| if (!string.IsNullOrWhiteSpace(mappedScope)) | ||
| { | ||
| scope = mappedScope; | ||
| audience = McpConstants.WorkIQToolsProdAppId; | ||
| } |
Comment on lines
+908
to
+916
| // Override catalog scope/audience with static mapping when available. | ||
| // This protects against stale catalog data where the catalog advertises V2 | ||
| // scope/audience but the server still enforces a V1 scope. | ||
| var (mappedScope, mappedAudience) = McpConstants.ServerScopeMappings.GetScopeAndAudience(serverName); | ||
| if (!string.IsNullOrWhiteSpace(mappedScope)) | ||
| { | ||
| scope = mappedScope; | ||
| audience = McpConstants.WorkIQToolsProdAppId; | ||
| } |
Comment on lines
+908
to
+912
| // Override catalog scope/audience with static mapping when available. | ||
| // This protects against stale catalog data where the catalog advertises V2 | ||
| // scope/audience but the server still enforces a V1 scope. | ||
| var (mappedScope, mappedAudience) = McpConstants.ServerScopeMappings.GetScopeAndAudience(serverName); | ||
| if (!string.IsNullOrWhiteSpace(mappedScope)) |
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.
Adds scope mapping for the mcp_M365Copilot server (McpServers.CopilotMCP.All to McpConstants.ServerScopeMappings
The V2 catalog endpoint returns incorrect scope metadata for mcp_M365Copilot, causing auth failures when connecting to the server