ruby-mcp-client 1.0.1 → 2.0.0

data/lib/mcp_client/auth.rb

@@ -225,7 +225,8 @@ module MCPClient
     # OAuth authorization server metadata
     class ServerMetadata
       attr_reader :issuer, :authorization_endpoint, :token_endpoint, :registration_endpoint,
-                  :scopes_supported, :response_types_supported, :grant_types_supported
+                  :scopes_supported, :response_types_supported, :grant_types_supported,
+                  :code_challenge_methods_supported, :client_id_metadata_document_supported
 
       # @param issuer [String] Issuer identifier URL
       # @param authorization_endpoint [String] Authorization endpoint URL
@@ -234,8 +235,14 @@ module MCPClient
       # @param scopes_supported [Array<String>, nil] Supported OAuth scopes
       # @param response_types_supported [Array<String>, nil] Supported response types
       # @param grant_types_supported [Array<String>, nil] Supported grant types
+      # @param code_challenge_methods_supported [Array<String>, nil] Supported PKCE code challenge methods (RFC 8414)
+      # @param client_id_metadata_document_supported [Boolean, nil] Whether the server accepts
+      #   Client ID Metadata Document client IDs (MCP 2025-11-25 / SEP-991)
+      # rubocop:disable Metrics/ParameterLists
       def initialize(issuer:, authorization_endpoint:, token_endpoint:, registration_endpoint: nil,
-                     scopes_supported: nil, response_types_supported: nil, grant_types_supported: nil)
+                     scopes_supported: nil, response_types_supported: nil, grant_types_supported: nil,
+                     code_challenge_methods_supported: nil, client_id_metadata_document_supported: nil)
+        # rubocop:enable Metrics/ParameterLists
         @issuer = issuer
         @authorization_endpoint = authorization_endpoint
         @token_endpoint = token_endpoint
@@ -243,6 +250,8 @@ module MCPClient
         @scopes_supported = scopes_supported
         @response_types_supported = response_types_supported
         @grant_types_supported = grant_types_supported
+        @code_challenge_methods_supported = code_challenge_methods_supported
+        @client_id_metadata_document_supported = client_id_metadata_document_supported
       end
 
       # Check if dynamic client registration is supported
@@ -251,6 +260,13 @@ module MCPClient
         !@registration_endpoint.nil?
       end
 
+      # Check if the server accepts clients using Client ID Metadata Documents
+      # (MCP 2025-11-25 / SEP-991), i.e. HTTPS URLs as client identifiers
+      # @return [Boolean] true if client_id_metadata_document_supported is true
+      def supports_client_id_metadata_documents?
+        @client_id_metadata_document_supported == true
+      end
+
       # Convert to hash
       # @return [Hash] Hash representation
       def to_h
@@ -261,7 +277,9 @@ module MCPClient
           registration_endpoint: @registration_endpoint,
           scopes_supported: @scopes_supported,
           response_types_supported: @response_types_supported,
-          grant_types_supported: @grant_types_supported
+          grant_types_supported: @grant_types_supported,
+          code_challenge_methods_supported: @code_challenge_methods_supported,
+          client_id_metadata_document_supported: @client_id_metadata_document_supported
         }.compact
       end
 
@@ -276,20 +294,38 @@ module MCPClient
           registration_endpoint: data[:registration_endpoint] || data['registration_endpoint'],
           scopes_supported: data[:scopes_supported] || data['scopes_supported'],
           response_types_supported: data[:response_types_supported] || data['response_types_supported'],
-          grant_types_supported: data[:grant_types_supported] || data['grant_types_supported']
+          grant_types_supported: data[:grant_types_supported] || data['grant_types_supported'],
+          code_challenge_methods_supported: data[:code_challenge_methods_supported] ||
+            data['code_challenge_methods_supported'],
+          client_id_metadata_document_supported: fetch_boolean(data, :client_id_metadata_document_supported)
         )
       end
+
+      # Fetch a possibly-false value from a hash by symbol or string key.
+      # Unlike the `||` chains above, this preserves an explicit false.
+      # @param data [Hash] Source hash
+      # @param key [Symbol] Key to fetch
+      # @return [Object, nil] The value, or nil when absent under both keys
+      def self.fetch_boolean(data, key)
+        return data[key] if data.key?(key)
+
+        data[key.to_s]
+      end
+      private_class_method :fetch_boolean
     end
 
     # Protected resource metadata for authorization server discovery
     class ResourceMetadata
-      attr_reader :resource, :authorization_servers
+      attr_reader :resource, :authorization_servers, :scopes_supported
 
       # @param resource [String] Resource server identifier
       # @param authorization_servers [Array<String>] List of authorization server URLs
-      def initialize(resource:, authorization_servers:)
+      # @param scopes_supported [Array<String>, nil] Scopes the resource supports (RFC 9728);
+      #   per MCP, the default scope set when a challenge provides none
+      def initialize(resource:, authorization_servers:, scopes_supported: nil)
         @resource = resource
         @authorization_servers = authorization_servers
+        @scopes_supported = scopes_supported
       end
 
       # Convert to hash
@@ -297,8 +333,9 @@ module MCPClient
       def to_h
         {
           resource: @resource,
-          authorization_servers: @authorization_servers
-        }
+          authorization_servers: @authorization_servers,
+          scopes_supported: @scopes_supported
+        }.compact
       end
 
       # Create resource metadata from hash
@@ -307,7 +344,8 @@ module MCPClient
       def self.from_h(data)
         new(
           resource: data[:resource] || data['resource'],
-          authorization_servers: data[:authorization_servers] || data['authorization_servers']
+          authorization_servers: data[:authorization_servers] || data['authorization_servers'],
+          scopes_supported: data[:scopes_supported] || data['scopes_supported']
         )
       end
     end