Fix ASP0016 warning

arenekosreal · May 15, 2024 · 281b484 · 281b484
1 parent ad21559
commit 281b484
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/E5Renewer/Program.cs b/E5Renewer/Program.cs
@@ -163,11 +163,23 @@
         ).ConfigureApiBehaviorOptions(
             (options) =>
             {
-                options.InvalidModelStateResponseFactory = (actionContext) => GenerateDummyResult(actionContext.HttpContext).Result;
+                options.InvalidModelStateResponseFactory = (actionContext) =>
+                {
+                    InvokeResult result = GenerateDummyResult(actionContext.HttpContext).Result;
+                    return new JsonResult(result);
+                };
             }
         );
         WebApplication app = builder.Build();
-        app.UseExceptionHandler((exceptionHandlerApp) => exceptionHandlerApp.Run(GenerateDummyResult));
+        app.UseExceptionHandler(
+            (exceptionHandlerApp) => exceptionHandlerApp.Run(
+                async (context) =>
+                    {
+                        InvokeResult result = await GenerateDummyResult(context);
+                        await context.Response.WriteAsJsonAsync(result);
+                    }
+            )
+        );
         app.UseRouting();
         string[] allowedMethods = ["GET", "POST"];
         app.Logger.LogDebug("Setting allowed method to {0}", string.Join(", ", allowedMethods));
@@ -306,7 +318,7 @@ bool IsPortUsed(uint port)
     return false;
 }
 
-async Task<IActionResult> GenerateDummyResult(HttpContext context)
+async Task<InvokeResult> GenerateDummyResult(HttpContext context)
 {
     IUnixTimestampGenerator unixTimestampGenerator = context.RequestServices.GetRequiredService<IUnixTimestampGenerator>();
     Dictionary<string, object?> queries;
@@ -338,11 +350,10 @@ async Task<IActionResult> GenerateDummyResult(HttpContext context)
         firstOfQuote > lastOfSlash ?
             fullPath.Substring(lastOfSlash + 1, firstOfQuote - lastOfSlash) :
             fullPath.Substring(lastOfSlash + 1);
-    return new JsonResult(new InvokeResult(
+    return new InvokeResult(
             methodName,
             queries,
             null,
             unixTimestampGenerator.GetUnixTimestamp()
-        )
-    );
+        );
 }