A platform for community discussion. Free, open, simple.
FIX: Allow MCP clients to discover all supported scopes (#43565)
Natalie Tay771c78063b38
diff --git a/app/controllers/mcp_controller.rb b/app/controllers/mcp_controller.rbindex e644007afdd..cb74c772875 100644--- a/app/controllers/mcp_controller.rb+++ b/app/controllers/mcp_controller.rb@@ -58,10 +58,7 @@ class McpController < ApplicationControllerrescue DiscourseMcp::AuthenticationError => errorresponse.set_header("WWW-Authenticate",- DiscourseMcp::Authenticator.challenge(- scope: DiscourseMcp::INITIAL_SCOPE,- error: error.oauth_error,- ),+ DiscourseMcp::Authenticator.challenge(error: error.oauth_error),)render json: jsonrpc_error(nil, -32_001, "Authorization required"), status: :unauthorizedenddiff --git a/app/controllers/mcp_oauth_metadata_controller.rb b/app/controllers/mcp_oauth_metadata_controller.rbindex 0496c5a6754..1fa61179655 100644--- a/app/controllers/mcp_oauth_metadata_controller.rb+++ b/app/controllers/mcp_oauth_metadata_controller.rb@@ -8,7 +8,7 @@ class McpOauthMetadataController < ApplicationControllerrender json: {resource: DiscourseMcp.resource_url,authorization_servers: [DiscourseMcp.issuer],- scopes_supported: [DiscourseMcp::INITIAL_SCOPE],+ scopes_supported: DiscourseMcp.registry.scopes,bearer_methods_supported: ["header"],}enddiff --git a/spec/requests/mcp_controller_spec.rb b/spec/requests/mcp_controller_spec.rbindex 6beb042a782..4377330b0da 100644--- a/spec/requests/mcp_controller_spec.rb+++ b/spec/requests/mcp_controller_spec.rb@@ -78,12 +78,12 @@ describe "MCP transport" doMcpPrimitive.create!(kind: "tool", identifier: "discourse_current_user_get", enabled: true)end- it "challenges requests without bearer credentials" do+ it "directs unauthenticated clients to resource metadata for scope selection" dopost "/mcp", params: payload.to_json, headers: headers.except("HTTP_AUTHORIZATION")expect(response.status).to eq(401)expect(response.headers["WWW-Authenticate"]).to eq(- %(Bearer resource_metadata="#{DiscourseMcp.protected_resource_metadata_url}", scope="mcp:profile:read"),+ %(Bearer resource_metadata="#{DiscourseMcp.protected_resource_metadata_url}"),)expect(response.parsed_body.dig("error", "code")).to eq(-32_001)enddiff --git a/spec/requests/mcp_oauth_metadata_controller_spec.rb b/spec/requests/mcp_oauth_metadata_controller_spec.rbindex 8cb0cb92bf1..f8c08313677 100644--- a/spec/requests/mcp_oauth_metadata_controller_spec.rb+++ b/spec/requests/mcp_oauth_metadata_controller_spec.rb@@ -3,11 +3,11 @@describe McpOauthMetadataController dobefore { SiteSetting.mcp_server_enabled = true }- it "advertises the initial scope in protected resource metadata" do+ it "advertises every registered scope in protected resource metadata" doget "/.well-known/oauth-protected-resource/mcp"expect(response.status).to eq(200)- expect(response.parsed_body["scopes_supported"]).to eq(["mcp:profile:read"])+ expect(response.parsed_body["scopes_supported"]).to eq(DiscourseMcp.registry.scopes)endit "advertises every registered scope in authorization server metadata" do