Fix MCP server resource uri when working with sub path

C0nquistadore · C0nquistadore · commit de3508d981d6 · 2025-09-18T09:33:45.000+02:00
diff --git a/src/Dibix.Http.Host/Program.cs b/src/Dibix.Http.Host/Program.cs
@@ -137,12 +137,12 @@ void ConfigureLogging(ILoggingBuilder logging)
                         else
                         {
                             string externalHostname = hostingOptions.ExternalHostName ?? throw new InvalidOperationException($"Property not configured: {hostingConfigurationSection.Key}:{nameof(hostingOptions.ExternalHostName)}");
-                            resource = new Uri($"https://{externalHostname}{hostingOptions.ApplicationBaseAddress ?? "/"}");
+                            resource = new Uri($"https://{externalHostname}{hostingOptions.ApplicationBaseAddress?.TrimEnd('/')}/");
                         }
 
                         x.ResourceMetadata = new ProtectedResourceMetadata
                         {
-                            Resource = new Uri(resource, new Uri(mcpPath, UriKind.Relative)),
+                            Resource = new Uri(resource, new Uri(mcpPath.TrimStart('/'), UriKind.Relative)),
                             AuthorizationServers = { new Uri(authenticationOptions.Authority) },
                             ScopesSupported = ["openid"],
                             ResourceName = $"{hostingOptions.EnvironmentName ?? "Dibix"} MCP Server",

Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,12 @@ void ConfigureLogging(ILoggingBuilder logging)`
`137`	`137`	`else`
`138`	`138`	`{`
`139`	`139`	`string externalHostname = hostingOptions.ExternalHostName ?? throw new InvalidOperationException($"Property not configured: {hostingConfigurationSection.Key}:{nameof(hostingOptions.ExternalHostName)}");`
`140`		`- resource = new Uri($"https://{externalHostname}{hostingOptions.ApplicationBaseAddress ?? "/"}");`
	`140`	`+ resource = new Uri($"https://{externalHostname}{hostingOptions.ApplicationBaseAddress?.TrimEnd('/')}/");`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`x.ResourceMetadata = new ProtectedResourceMetadata`
`144`	`144`	`{`
`145`		`- Resource = new Uri(resource, new Uri(mcpPath, UriKind.Relative)),`
	`145`	`+ Resource = new Uri(resource, new Uri(mcpPath.TrimStart('/'), UriKind.Relative)),`
`146`	`146`	`AuthorizationServers = { new Uri(authenticationOptions.Authority) },`
`147`	`147`	`ScopesSupported = ["openid"],`
`148`	`148`	`ResourceName = $"{hostingOptions.EnvironmentName ?? "Dibix"} MCP Server",`