Update McpAuthenticationOptions.cs

Author: localden

src/ModelContextProtocol.AspNetCore/Authentication/McpAuthenticationOptions.cs

@@ -10,20 +10,17 @@ namespace ModelContextProtocol.AspNetCore.Authentication;
 public class McpAuthenticationOptions : AuthenticationSchemeOptions
 {
     private static readonly Uri DefaultResourceMetadataUri = new("/.well-known/oauth-protected-resource", UriKind.Relative);
+    private Func<HttpContext, ProtectedResourceMetadata>? _resourceMetadataProvider;
+    private ProtectedResourceMetadata _resourceMetadata;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="McpAuthenticationOptions"/> class.
     /// </summary>
     public McpAuthenticationOptions()
     {
-        // Initialize the base property instead of hiding it with 'new'
         base.ForwardAuthenticate = "Bearer";
-        
-        // Initialize properties in constructor instead of using property initializers
         ResourceMetadataUri = DefaultResourceMetadataUri;
-        ResourceMetadata = new ProtectedResourceMetadata();
-        
-        // Initialize events
+        _resourceMetadata = new ProtectedResourceMetadata();
         Events = new McpAuthenticationEvents();
     }
 
@@ -50,9 +47,19 @@ public McpAuthenticationOptions()
     /// <remarks>
     /// This contains the OAuth metadata for the protected resource, including authorization servers,
     /// supported scopes, and other information needed for clients to authenticate.
-    /// This property is used when <see cref="ResourceMetadataProvider"/> is not set.
+    /// Setting this property will automatically update the <see cref="ResourceMetadataProvider"/> 
+    /// to return this static instance.
     /// </remarks>
-    public ProtectedResourceMetadata ResourceMetadata { get; set; }
+    public ProtectedResourceMetadata ResourceMetadata
+    {
+        get => _resourceMetadata;
+        set
+        {
+            _resourceMetadata = value ?? new ProtectedResourceMetadata();
+            // When static metadata is set, update the provider to use it
+            _resourceMetadataProvider = _ => _resourceMetadata;
+        }
+    }
 
     /// <summary>
     /// Gets or sets a delegate that dynamically provides resource metadata based on the HTTP context.
@@ -62,7 +69,39 @@ public McpAuthenticationOptions()
     /// allowing dynamic customization based on the caller or other contextual information.
     /// This takes precedence over the static <see cref="ResourceMetadata"/> property.
     /// </remarks>
-    public Func<HttpContext, ProtectedResourceMetadata>? ResourceMetadataProvider { get; set; }
+    public Func<HttpContext, ProtectedResourceMetadata>? ResourceMetadataProvider
+    {
+        get => _resourceMetadataProvider;
+        set => _resourceMetadataProvider = value ?? (_ => _resourceMetadata);
+    }
+
+    /// <summary>
+    /// Sets a static resource metadata instance that will be returned for all requests.
+    /// </summary>
+    /// <param name="metadata">The static resource metadata to use.</param>
+    /// <returns>The current options instance for method chaining.</returns>
+    /// <remarks>
+    /// This is a convenience method equivalent to setting the <see cref="ResourceMetadata"/> property.
+    /// </remarks>
+    public McpAuthenticationOptions UseStaticResourceMetadata(ProtectedResourceMetadata metadata)
+    {
+        ResourceMetadata = metadata ?? new ProtectedResourceMetadata();
+        return this;
+    }
+
+    /// <summary>
+    /// Sets a delegate to dynamically provide resource metadata for each request.
+    /// </summary>
+    /// <param name="provider">A delegate that returns resource metadata for a given HTTP context.</param>
+    /// <returns>The current options instance for method chaining.</returns>
+    /// <remarks>
+    /// This is a convenience method equivalent to setting the <see cref="ResourceMetadataProvider"/> property.
+    /// </remarks>
+    public McpAuthenticationOptions UseDynamicResourceMetadata(Func<HttpContext, ProtectedResourceMetadata> provider)
+    {
+        ResourceMetadataProvider = provider ?? throw new ArgumentNullException(nameof(provider));
+        return this;
+    }
 
     /// <summary>
     /// Gets the resource metadata for the current request.
@@ -71,11 +110,10 @@ public McpAuthenticationOptions()
     /// <returns>The resource metadata to use for the current request.</returns>
     internal ProtectedResourceMetadata GetResourceMetadata(HttpContext context)
     {
-        if (ResourceMetadataProvider != null)
-        {
-            return ResourceMetadataProvider(context);
-        }
-
-        return ResourceMetadata;
+        var provider = _resourceMetadataProvider;
+        
+        return provider != null
+            ? provider(context)
+            : _resourceMetadata;
     }
 }