Proper setup

Author: localden

src/ModelContextProtocol.AspNetCore/Auth/McpAuthenticationHandler.cs

@@ -51,21 +51,6 @@ protected override Task HandleChallengeAsync(AuthenticationProperties properties
         // Initialize properties if null
         properties ??= new AuthenticationProperties();
 
-        // Set up the resource URI if not already configured, using the current request as a fallback
-        if (Options.ResourceMetadata.Resource == null)
-        {
-            Options.ResourceMetadata.Resource = new Uri($"{Request.Scheme}://{Request.Host}");
-        }
-        
-        // Configure the resource metadata service with our metadata
-        _resourceMetadataService.ConfigureMetadata(metadata => {
-            metadata.Resource = Options.ResourceMetadata.Resource;
-            metadata.AuthorizationServers = Options.ResourceMetadata.AuthorizationServers;
-            metadata.BearerMethodsSupported = Options.ResourceMetadata.BearerMethodsSupported;
-            metadata.ScopesSupported = Options.ResourceMetadata.ScopesSupported;
-            metadata.ResourceDocumentation = Options.ResourceMetadata.ResourceDocumentation;
-        });
-        
         // Set the WWW-Authenticate header with the resource_metadata
         string headerValue = $"Bearer realm=\"{Scheme.Name}\"";
         headerValue += $", resource_metadata=\"{metadataUrl}\"";

src/ModelContextProtocol.AspNetCore/Auth/McpAuthorizationExtensions.cs

@@ -40,15 +40,36 @@ public static AuthenticationBuilder AddMcp(
         string displayName,
         Action<McpAuthenticationOptions>? configureOptions = null)
     {
-        builder.Services.TryAddSingleton<ResourceMetadataService>();
+        // Create options instance to pass to ResourceMetadataService
+        var options = new McpAuthenticationOptions();
+        configureOptions?.Invoke(options);
+                
+        // Register ResourceMetadataService with options
+        builder.Services.AddSingleton(sp => {
+            var service = new ResourceMetadataService();
+
+            // Configure the service with the resource metadata from options
+            service.ConfigureMetadata(metadata => {
+                metadata.Resource = options.ResourceMetadata.Resource;
+                metadata.AuthorizationServers = options.ResourceMetadata.AuthorizationServers;
+                metadata.BearerMethodsSupported = options.ResourceMetadata.BearerMethodsSupported;
+                metadata.ScopesSupported = options.ResourceMetadata.ScopesSupported;
+                metadata.ResourceDocumentation = options.ResourceMetadata.ResourceDocumentation;
+            });
+            
+            return service;
+        });
 
-        // Register the marker to indicate that MCP authorization is configured
-        // This will be used by MapMcp to apply authorization to endpoints
         builder.Services.TryAddSingleton<McpAuthorizationMarker>();
 
         return builder.AddScheme<McpAuthenticationOptions, McpAuthenticationHandler>(
             authenticationScheme, 
             displayName, 
-            configureOptions ?? (options => { }));
+            opt => {
+                if (configureOptions != null)
+                {
+                    configureOptions(opt);
+                }
+            });
     }
 }