Properly completing Responder task and making sure handler exceptions…

… bubble up Resolves #52
soxtoby · Jun 14, 2020 · 0b5fd5d · 0b5fd5d
1 parent bd6e7b8
commit 0b5fd5d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/SlackNet.AspNetCore/SlackRequestHandler.cs b/SlackNet.AspNetCore/SlackRequestHandler.cs
@@ -191,9 +191,19 @@ private static async Task<SlackResult> RespondAsync<T>(Func<Responder<T>, Task>
 
             var firstCompletedTask = await Task.WhenAny(earlyResponse.Task, handlingComplete).ConfigureAwait(false);
 
-            return firstCompletedTask == earlyResponse.Task
-                ? earlyResponse.Task.Result.OnCompleted(() => handlingComplete)
-                : defaultResult();
+            if (firstCompletedTask == earlyResponse.Task)
+            {
+                return earlyResponse.Task.Result.OnCompleted(() =>
+                {
+                    requestComplete.SetResult(0);
+                    return handlingComplete;
+                });
+            }
+            else
+            {
+                await handlingComplete.ConfigureAwait(false); // Fish for exception
+                return defaultResult();
+            }
         }
 
         public async Task<SlackResult> HandleOptionsRequest(HttpRequest request, SlackEndpointConfiguration config)