🐛 Fix CORS for SignalR (#176)

SSWConsulting · Jan 16, 2025 · 5541b1b · 5541b1b
1 parent 3a91efd
commit 5541b1b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 33 deletions.
diff --git a/src/WebAPI/DependencyInjection.cs b/src/WebAPI/DependencyInjection.cs
@@ -12,8 +12,7 @@ public static class DependencyInjection
 {
     public static IServiceCollection AddWebApi(
         this IServiceCollection services,
-        IConfiguration configuration,
-        string rulesGptCorsPolicy)
+        IConfiguration configuration)
     {
         services.AddHttpContextAccessor();
         services.AddScoped<ICurrentUserService, CurrentUserService>();
@@ -55,14 +54,13 @@ public static IServiceCollection AddWebApi(
 
         services.AddCors(
             options =>
-                options.AddPolicy(
-                    name: rulesGptCorsPolicy,
+                options.AddDefaultPolicy(
                     policy =>
                         policy
                             .WithOrigins(allowedCorsList)
+                            .AllowCredentials()
                             .AllowAnyMethod()
                             .AllowAnyHeader()
-                            .AllowCredentials()
                 )
         );
 

diff --git a/src/WebAPI/Program.cs b/src/WebAPI/Program.cs
@@ -6,17 +6,9 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-const string RulesGptCorsPolicy = nameof(RulesGptCorsPolicy);
-const string ChatHistoryPolicy = nameof(ChatHistoryPolicy);
-
-builder.Services.AddAuthorizationBuilder().AddPolicy(ChatHistoryPolicy, policy =>
-{
-    policy.RequireAuthenticatedUser();
-});
-
 builder.Services.AddApplication();
 builder.Services.AddInfrastructure(builder.Configuration);
-builder.Services.AddWebApi(builder.Configuration, RulesGptCorsPolicy);
+builder.Services.AddWebApi(builder.Configuration);
 
 var app = builder.Build();
 
@@ -26,17 +18,19 @@
     app.UseSwaggerUi();
 }
 
-app.UseCors(RulesGptCorsPolicy);
 app.UseHttpsRedirection();
+app.UseCors();
 
 app.UseAuthentication();
 app.UseAuthorization();
 
-app.MapLeaderboardRoutes();
-app.MapConversationRoutes();
-app.MapHub<RulesHub>("/ruleshub");
+var baseRoute = app.MapGroup("api").RequireAuthorization();
+baseRoute.MapLeaderboardRoutes();
+baseRoute.MapConversationRoutes();
 
 app.MapHealthChecks("/health");
 
+app.MapHub<RulesHub>("/ruleshub");
+
 app.Logger.LogInformation("Starting WebAPI");
-app.Run();
+await app.RunAsync();
diff --git a/src/WebAPI/Routes/ConversationHistoryRoutes.cs b/src/WebAPI/Routes/ConversationHistoryRoutes.cs
@@ -7,7 +7,7 @@ public static class ConversationHistoryRoutes
 {
     private const string ChatHistoryPolicy = nameof(ChatHistoryPolicy);
 
-    public static void MapConversationRoutes(this WebApplication app)
+    public static void MapConversationRoutes(this RouteGroupBuilder app)
     {
         var routeGroup = app.MapGroup("").WithTags("ConversationHistory").WithOpenApi();
 

diff --git a/src/WebAPI/Routes/LeaderboardRoutes.cs b/src/WebAPI/Routes/LeaderboardRoutes.cs
@@ -6,7 +6,7 @@ namespace WebAPI.Routes;
 
 public static class LeaderboardRoutes
 {
-    public static void MapLeaderboardRoutes(this WebApplication app)
+    public static void MapLeaderboardRoutes(this RouteGroupBuilder app)
     {
         var routeGroup = app.MapGroup("leaderboard").WithTags("Leaderboard");
 

diff --git a/src/WebUI/RulesGptApiClients.cs b/src/WebUI/RulesGptApiClients.cs
@@ -75,8 +75,8 @@ private static System.Text.Json.JsonSerializerOptions CreateSerializerSettings()
 
                     var urlBuilder_ = new System.Text.StringBuilder();
 
-                    // Operation Path: "leaderboard/getLeaderboardStats"
-                    urlBuilder_.Append("leaderboard/getLeaderboardStats");
+                    // Operation Path: "api/leaderboard/getLeaderboardStats"
+                    urlBuilder_.Append("api/leaderboard/getLeaderboardStats");
 
                     PrepareRequest(client_, request_, urlBuilder_);
 
@@ -154,8 +154,8 @@ public virtual async System.Threading.Tasks.Task<ConversationHistoryModel> GetCo
 
                     var urlBuilder_ = new System.Text.StringBuilder();
 
-                    // Operation Path: "Conversation/{id}"
-                    urlBuilder_.Append("Conversation/");
+                    // Operation Path: "api/Conversation/{id}"
+                    urlBuilder_.Append("api/Conversation/");
                     urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -237,8 +237,8 @@ public virtual async System.Threading.Tasks.Task UpdateConversationAsync(int id,
 
                     var urlBuilder_ = new System.Text.StringBuilder();
 
-                    // Operation Path: "Conversation/{id}"
-                    urlBuilder_.Append("Conversation/");
+                    // Operation Path: "api/Conversation/{id}"
+                    urlBuilder_.Append("api/Conversation/");
                     urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
                     urlBuilder_.Append('?');
                     urlBuilder_.Append(System.Uri.EscapeDataString("conversation")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(conversation, System.Globalization.CultureInfo.InvariantCulture))).Append('&');
@@ -312,8 +312,8 @@ public virtual async System.Threading.Tasks.Task UpdateConversationAsync(int id,
 
                     var urlBuilder_ = new System.Text.StringBuilder();
 
-                    // Operation Path: "Conversations"
-                    urlBuilder_.Append("Conversations");
+                    // Operation Path: "api/Conversations"
+                    urlBuilder_.Append("api/Conversations");
 
                     PrepareRequest(client_, request_, urlBuilder_);
 
@@ -387,8 +387,8 @@ public virtual async System.Threading.Tasks.Task DeleteAllConversationsAsync(Sys
 
                     var urlBuilder_ = new System.Text.StringBuilder();
 
-                    // Operation Path: "Conversations"
-                    urlBuilder_.Append("Conversations");
+                    // Operation Path: "api/Conversations"
+                    urlBuilder_.Append("api/Conversations");
 
                     PrepareRequest(client_, request_, urlBuilder_);
 
@@ -465,8 +465,8 @@ public virtual async System.Threading.Tasks.Task<int> AddConversationHistoryAsyn
 
                     var urlBuilder_ = new System.Text.StringBuilder();
 
-                    // Operation Path: "Conversation"
-                    urlBuilder_.Append("Conversation");
+                    // Operation Path: "api/Conversation"
+                    urlBuilder_.Append("api/Conversation");
                     urlBuilder_.Append('?');
                     urlBuilder_.Append(System.Uri.EscapeDataString("conversation")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(conversation, System.Globalization.CultureInfo.InvariantCulture))).Append('&');
                     urlBuilder_.Append(System.Uri.EscapeDataString("firstMessage")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(firstMessage, System.Globalization.CultureInfo.InvariantCulture))).Append('&');