From 16d005e00ca6e5b5c87b6868702a30646ab390c9 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Fri, 27 Jul 2018 09:58:45 -0700
Subject: [PATCH] Fix returning arrays in async JS interop calls. Fixes #1205

---
 src/Microsoft.JSInterop/JSRuntimeBase.cs             | 10 ++++++----
 .../Tests/InteropTest.cs                             |  2 ++
 test/testapps/BasicTestApp/InteropComponent.cshtml   |  2 ++
 .../BasicTestApp/wwwroot/js/jsinteroptests.js        | 12 ++++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.JSInterop/JSRuntimeBase.cs b/src/Microsoft.JSInterop/JSRuntimeBase.cs
index db4796521f..09379396cf 100644
--- a/src/Microsoft.JSInterop/JSRuntimeBase.cs
+++ b/src/Microsoft.JSInterop/JSRuntimeBase.cs
@@ -100,10 +100,12 @@ namespace Microsoft.JSInterop
             if (succeeded)
             {
                 var resultType = TaskGenericsUtil.GetTaskCompletionSourceResultType(tcs);
-                var resultValue = resultOrException is SimpleJson.JsonObject
-                    ? ArgSerializerStrategy.DeserializeObject(resultOrException, resultType)
-                    : resultOrException;
-                TaskGenericsUtil.SetTaskCompletionSourceResult(tcs, resultValue);
+                if (resultOrException is SimpleJson.JsonObject || resultOrException is SimpleJson.JsonArray)
+                {
+                    resultOrException = ArgSerializerStrategy.DeserializeObject(resultOrException, resultType);
+                }
+
+                TaskGenericsUtil.SetTaskCompletionSourceResult(tcs, resultOrException);
             }
             else
             {
diff --git a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/InteropTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/InteropTest.cs
index 2327cf5f0b..5553da7118 100644
--- a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/InteropTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/InteropTest.cs
@@ -59,6 +59,7 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests
                 ["testDtoNonSerializedValueAsync"] = "99999",
                 ["testDtoAsync"] = "Same",
                 ["returnPrimitiveAsync"] = "123",
+                ["returnArrayAsync"] = "first,second",
             };
 
             var expectedSyncValues = new Dictionary<string, string>
@@ -92,6 +93,7 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests
                 ["testDtoNonSerializedValueSync"] = "99999",
                 ["testDtoSync"] = "Same",
                 ["returnPrimitive"] = "123",
+                ["returnArray"] = "first,second",
             };
 
             // Include the sync assertions only when running under WebAssembly
diff --git a/test/testapps/BasicTestApp/InteropComponent.cshtml b/test/testapps/BasicTestApp/InteropComponent.cshtml
index 0579d9118b..41b7ad251a 100644
--- a/test/testapps/BasicTestApp/InteropComponent.cshtml
+++ b/test/testapps/BasicTestApp/InteropComponent.cshtml
@@ -122,9 +122,11 @@
         ReceiveDotNetObjectByRefAsyncResult["testDto"] = ReceiveDotNetObjectByRefAsyncResult["testDto"] == passDotNetObjectByRef ? "Same" : "Different";
 
         ReturnValues["returnPrimitiveAsync"] = (await JSRuntime.Current.InvokeAsync<int>("returnPrimitiveAsync")).ToString();
+        ReturnValues["returnArrayAsync"] = string.Join(",", (await JSRuntime.Current.InvokeAsync<Segment[]>("returnArrayAsync")).Select(x => x.Source).ToArray());
         if (shouldSupportSyncInterop)
         {
             ReturnValues["returnPrimitive"] = ((IJSInProcessRuntime)JSRuntime.Current).Invoke<int>("returnPrimitive").ToString();
+            ReturnValues["returnArray"] = string.Join(",", ((IJSInProcessRuntime)JSRuntime.Current).Invoke<Segment[]>("returnArray").Select(x => x.Source).ToArray());
         }
 
         Invocations = invocations;
diff --git a/test/testapps/BasicTestApp/wwwroot/js/jsinteroptests.js b/test/testapps/BasicTestApp/wwwroot/js/jsinteroptests.js
index ef5071509b..10882d9e61 100644
--- a/test/testapps/BasicTestApp/wwwroot/js/jsinteroptests.js
+++ b/test/testapps/BasicTestApp/wwwroot/js/jsinteroptests.js
@@ -186,6 +186,18 @@ function returnPrimitiveAsync() {
   });
 }
 
+function returnArray() {
+  return [{ source: 'first' }, { source: 'second' }];
+}
+
+function returnArrayAsync() {
+  return new Promise((resolve, reject) => {
+    setTimeout(function () {
+      resolve(returnArray());
+    }, 100);
+  });
+}
+
 function functionThrowsException() {
   throw new Error('Function threw an exception!');
 }