Fix Endpoints (#399)

MikeAlhayek · web-flow · commit bfaa955b3f6e · 2026-03-24T13:32:33.000-07:00
diff --git a/src/Modules/CrestApps.OrchardCore.AI.DataSources/Endpoints/GetDataSourceFieldsEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI.DataSources/Endpoints/GetDataSourceFieldsEndpoint.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
 using OrchardCore.Contents.Indexing;
@@ -23,10 +24,10 @@ public static IEndpointRouteBuilder AddGetDataSourceFieldsEndpoint(this IEndpoin
     }
 
     private static async Task<IResult> HandleAsync(
-        string indexProfileName,
-        IAuthorizationService authorizationService,
-        IIndexProfileStore indexProfileStore,
-        IOptions<AIDataSourceOptions> dataSourceOptions,
+        [FromRoute] string indexProfileName,
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IIndexProfileStore indexProfileStore,
+        [FromServices] IOptions<AIDataSourceOptions> dataSourceOptions,
         HttpContext httpContext)
     {
         if (!await authorizationService.AuthorizeAsync(httpContext.User, AIPermissions.ManageAIDataSources))
diff --git a/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/RemoveDocumentEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/RemoveDocumentEndpoint.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Environment.Shell.Scope;
@@ -26,12 +27,12 @@ public static IEndpointRouteBuilder AddRemoveDocumentEndpoint(this IEndpointRout
     }
 
     private static async Task<IResult> HandleAsync(
-        RemoveDocumentRequest request,
-        IAuthorizationService authorizationService,
-        IHttpContextAccessor httpContextAccessor,
-        ISourceCatalogManager<ChatInteraction> interactionManager,
-        IAIDocumentStore documentStore,
-        IAIDocumentChunkStore chunkStore)
+        [FromBody] RemoveDocumentRequest request,
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IHttpContextAccessor httpContextAccessor,
+        [FromServices] ISourceCatalogManager<ChatInteraction> interactionManager,
+        [FromServices] IAIDocumentStore documentStore,
+        [FromServices] IAIDocumentChunkStore chunkStore)
     {
         if (!await authorizationService.AuthorizeAsync(httpContextAccessor.HttpContext.User, AIPermissions.EditChatInteractions))
         {
diff --git a/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/RemoveSessionDocumentEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/RemoveSessionDocumentEndpoint.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -26,11 +27,11 @@ public static IEndpointRouteBuilder AddRemoveSessionDocumentEndpoint(this IEndpo
 
     private static async Task<IResult> HandleAsync(
         HttpRequest httpRequest,
-        IAuthorizationService authorizationService,
-        IHttpContextAccessor httpContextAccessor,
-        IAIChatSessionManager sessionManager,
-        IAIDocumentStore documentStore,
-        IAIDocumentChunkStore chunkStore)
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IHttpContextAccessor httpContextAccessor,
+        [FromServices] IAIChatSessionManager sessionManager,
+        [FromServices] IAIDocumentStore documentStore,
+        [FromServices] IAIDocumentChunkStore chunkStore)
     {
         var httpContext = httpContextAccessor.HttpContext;
 
diff --git a/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/UploadDocumentEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/UploadDocumentEndpoint.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
@@ -27,15 +28,15 @@ public static IEndpointRouteBuilder AddUploadDocumentEndpoint(this IEndpointRout
 
     private static async Task<IResult> HandleAsync(
         HttpRequest request,
-        IAuthorizationService authorizationService,
-        IHttpContextAccessor httpContextAccessor,
-        ISourceCatalogManager<ChatInteraction> interactionManager,
-        IAIDocumentStore documentStore,
-        IAIDocumentChunkStore chunkStore,
-        IAIDocumentProcessingService documentProcessingService,
-        IOptions<ChatDocumentsOptions> extractorOptions,
-        ILogger<Startup> logger,
-        IStringLocalizer<Startup> S)
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IHttpContextAccessor httpContextAccessor,
+        [FromServices] ISourceCatalogManager<ChatInteraction> interactionManager,
+        [FromServices] IAIDocumentStore documentStore,
+        [FromServices] IAIDocumentChunkStore chunkStore,
+        [FromServices] IAIDocumentProcessingService documentProcessingService,
+        [FromServices] IOptions<ChatDocumentsOptions> extractorOptions,
+        [FromServices] ILogger<Startup> logger,
+        [FromServices] IStringLocalizer<Startup> S)
     {
         if (!await authorizationService.AuthorizeAsync(httpContextAccessor.HttpContext.User, AIPermissions.EditChatInteractions))
         {
diff --git a/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/UploadSessionDocumentEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI.Documents/Endpoints/UploadSessionDocumentEndpoint.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
@@ -31,16 +32,16 @@ public static IEndpointRouteBuilder AddUploadSessionDocumentEndpoint(this IEndpo
 
     private static async Task<IResult> HandleAsync(
         HttpRequest request,
-        IAuthorizationService authorizationService,
-        IHttpContextAccessor httpContextAccessor,
-        IAIChatSessionManager sessionManager,
-        IAIDeploymentManager deploymentManager,
-        IAIDocumentStore documentStore,
-        IAIDocumentChunkStore chunkStore,
-        IAIDocumentProcessingService documentProcessingService,
-        IOptions<ChatDocumentsOptions> extractorOptions,
-        ILogger<Startup> logger,
-        IStringLocalizer<Startup> S)
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IHttpContextAccessor httpContextAccessor,
+        [FromServices] IAIChatSessionManager sessionManager,
+        [FromServices] IAIDeploymentManager deploymentManager,
+        [FromServices] IAIDocumentStore documentStore,
+        [FromServices] IAIDocumentChunkStore chunkStore,
+        [FromServices] IAIDocumentProcessingService documentProcessingService,
+        [FromServices] IOptions<ChatDocumentsOptions> extractorOptions,
+        [FromServices] ILogger<Startup> logger,
+        [FromServices] IStringLocalizer<Startup> S)
     {
         var httpContext = httpContextAccessor.HttpContext;
 
diff --git a/src/Modules/CrestApps.OrchardCore.AI/Endpoints/Api/ApiAIChatSessionEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI/Endpoints/Api/ApiAIChatSessionEndpoint.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using OrchardCore.Entities;
 using OrchardCore.Liquid;
@@ -23,13 +24,13 @@ public static IEndpointRouteBuilder AddApiAIChatSessionEndpoint(this IEndpointRo
     }
 
     private static async Task<IResult> HandleAsync(
-       IAuthorizationService authorizationService,
-       INamedCatalogManager<AIProfile> profileManager,
-       IAIChatSessionManager sessionManager,
-       IAIChatSessionPromptStore promptStore,
-       ILiquidTemplateManager liquidTemplateManager,
-       IHttpContextAccessor httpContextAccessor,
-       string sessionId)
+       [FromServices] IAuthorizationService authorizationService,
+       [FromServices] INamedCatalogManager<AIProfile> profileManager,
+       [FromServices] IAIChatSessionManager sessionManager,
+       [FromServices] IAIChatSessionPromptStore promptStore,
+       [FromServices] ILiquidTemplateManager liquidTemplateManager,
+       [FromServices] IHttpContextAccessor httpContextAccessor,
+       [FromQuery] string sessionId)
     {
         if (string.IsNullOrWhiteSpace(sessionId))
         {
diff --git a/src/Modules/CrestApps.OrchardCore.AI/Endpoints/Api/ApiAICompletionEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI/Endpoints/Api/ApiAICompletionEndpoint.cs
@@ -12,6 +12,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
@@ -33,20 +34,20 @@ public static IEndpointRouteBuilder AddApiAICompletionEndpoint<T>(this IEndpoint
     }
 
     private static async Task<IResult> HandleAsync<T>(
-       IAuthorizationService authorizationService,
-       INamedCatalogManager<AIProfile> chatProfileManager,
-       IAIChatSessionManager sessionManager,
-       IAIChatSessionPromptStore promptStore,
-       ILiquidTemplateManager liquidTemplateManager,
-       IHttpContextAccessor httpContextAccessor,
-       IAICompletionService completionService,
-       IAICompletionContextBuilder completionContextBuilder,
-       IOrchestrationContextBuilder orchestrationContextBuilder,
-       IOrchestratorResolver orchestratorResolver,
-       CitationReferenceCollector citationCollector,
-       IAITemplateService aiTemplateService,
-       ILogger<T> logger,
-       AICompletionRequest requestData)
+       [FromServices] IAuthorizationService authorizationService,
+       [FromServices] INamedCatalogManager<AIProfile> chatProfileManager,
+       [FromServices] IAIChatSessionManager sessionManager,
+       [FromServices] IAIChatSessionPromptStore promptStore,
+       [FromServices] ILiquidTemplateManager liquidTemplateManager,
+       [FromServices] IHttpContextAccessor httpContextAccessor,
+       [FromServices] IAICompletionService completionService,
+       [FromServices] IAICompletionContextBuilder completionContextBuilder,
+       [FromServices] IOrchestrationContextBuilder orchestrationContextBuilder,
+       [FromServices] IOrchestratorResolver orchestratorResolver,
+       [FromServices] CitationReferenceCollector citationCollector,
+       [FromServices] IAITemplateService aiTemplateService,
+       [FromServices] ILogger<T> logger,
+       [FromBody] AICompletionRequest requestData)
     {
         if (string.IsNullOrWhiteSpace(requestData.ProfileId))
         {
diff --git a/src/Modules/CrestApps.OrchardCore.AI/Endpoints/Api/ApiAIUtilityCompletionEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI/Endpoints/Api/ApiAIUtilityCompletionEndpoint.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
@@ -24,13 +25,13 @@ public static IEndpointRouteBuilder AddApiAIUtilityCompletionEndpoint<T>(this IE
     }
 
     private static async Task<IResult> HandleAsync<T>(
-       IAuthorizationService authorizationService,
-       INamedCatalogManager<AIProfile> chatProfileManager,
-       IHttpContextAccessor httpContextAccessor,
-       IAICompletionService completionService,
-       IAICompletionContextBuilder completionContextBuilder,
-       ILogger<T> logger,
-       AIUtilityCompletionRequest requestData)
+       [FromServices] IAuthorizationService authorizationService,
+       [FromServices] INamedCatalogManager<AIProfile> chatProfileManager,
+       [FromServices] IHttpContextAccessor httpContextAccessor,
+       [FromServices] IAICompletionService completionService,
+       [FromServices] IAICompletionContextBuilder completionContextBuilder,
+       [FromServices] ILogger<T> logger,
+       [FromBody] AIUtilityCompletionRequest requestData)
     {
         if (string.IsNullOrWhiteSpace(requestData.ProfileId))
         {
diff --git a/src/Modules/CrestApps.OrchardCore.AI/Endpoints/GetConnectionsEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI/Endpoints/GetConnectionsEndpoint.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
 
@@ -21,10 +22,10 @@ public static IEndpointRouteBuilder AddGetConnectionsEndpoint(this IEndpointRout
     }
 
     private static async Task<IResult> HandleAsync(
-        IAuthorizationService authorizationService,
-        IHttpContextAccessor httpContextAccessor,
-        IOptions<AIProviderOptions> aiProviderOptions,
-        string providerName)
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IHttpContextAccessor httpContextAccessor,
+        [FromServices] IOptions<AIProviderOptions> aiProviderOptions,
+        [FromQuery] string providerName)
     {
         if (!await authorizationService.AuthorizeAsync(httpContextAccessor.HttpContext.User, AIPermissions.ManageAIProfiles))
         {
diff --git a/src/Modules/CrestApps.OrchardCore.AI/Endpoints/GetDeploymentsEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI/Endpoints/GetDeploymentsEndpoint.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 
 namespace CrestApps.OrchardCore.AI.Endpoints;
@@ -19,11 +20,11 @@ public static IEndpointRouteBuilder AddGetDeploymentsEndpoint(this IEndpointRout
     }
 
     private static async Task<IResult> HandleAsync(
-        IAuthorizationService authorizationService,
-        IHttpContextAccessor httpContextAccessor,
-        IAIDeploymentManager deploymentManager,
-        string providerName,
-        string connection)
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IHttpContextAccessor httpContextAccessor,
+        [FromServices] IAIDeploymentManager deploymentManager,
+        [FromQuery] string providerName,
+        [FromQuery] string connection)
     {
         if (!await authorizationService.AuthorizeAsync(httpContextAccessor.HttpContext.User, AIPermissions.ManageAIProfiles))
         {
diff --git a/src/Modules/CrestApps.OrchardCore.AI/Endpoints/GetVoicesEndpoint.cs b/src/Modules/CrestApps.OrchardCore.AI/Endpoints/GetVoicesEndpoint.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using OrchardCore.Localization;
 
@@ -23,12 +24,12 @@ public static IEndpointRouteBuilder AddGetVoicesEndpoint(this IEndpointRouteBuil
     }
 
     private static async Task<IResult> HandleAsync(
-        string deploymentId,
-        IAuthorizationService authorizationService,
-        IHttpContextAccessor httpContextAccessor,
-        IAIDeploymentManager deploymentManager,
-        ISpeechVoiceResolver speechVoiceResolver,
-        ILocalizationService localizationService)
+        [FromQuery] string deploymentId,
+        [FromServices] IAuthorizationService authorizationService,
+        [FromServices] IHttpContextAccessor httpContextAccessor,
+        [FromServices] IAIDeploymentManager deploymentManager,
+        [FromServices] ISpeechVoiceResolver speechVoiceResolver,
+        [FromServices] ILocalizationService localizationService)
     {
         if (!await authorizationService.AuthorizeAsync(httpContextAccessor.HttpContext.User, AIPermissions.ManageAIProfiles))
         {
