Recover DefaultCredentials functionality and update E2E tests

Author: SteveSandersonMS

src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHost.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Blazor.Http;
 using Microsoft.AspNetCore.Blazor.Rendering;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
@@ -17,6 +18,12 @@ internal class WebAssemblyHost : IWebAssemblyHost
         private IServiceScope _scope;
         private WebAssemblyRenderer _renderer;
 
+        static WebAssemblyHost()
+        {
+            // This default most closely matches what web developers expect
+            WebAssemblyHttpMessageHandlerOptions.DefaultCredentials = FetchCredentialsOption.SameOrigin;
+        }
+
         public WebAssemblyHost(IServiceProvider services, IJSRuntime runtime)
         {
             Services = services ?? throw new ArgumentNullException(nameof(services));

src/Components/Blazor/Blazor/src/Http/FetchCredentialsOption.cs

@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Blazor.Http
+{
+    /// <summary>
+    /// Specifies a value for the 'credentials' option on outbound HTTP requests.
+    /// </summary>
+    public enum FetchCredentialsOption
+    {
+        /// <summary>
+        /// Advises the browser never to send credentials (such as cookies or HTTP auth headers).
+        /// </summary>
+        Omit,
+
+        /// <summary>
+        /// Advises the browser to send credentials (such as cookies or HTTP auth headers)
+        /// only if the target URL is on the same origin as the calling application.
+        /// </summary>
+        SameOrigin,
+
+        /// <summary>
+        /// Advises the browser to send credentials (such as cookies or HTTP auth headers)
+        /// even for cross-origin requests.
+        /// </summary>
+        Include,
+    }
+}

src/Components/Blazor/Blazor/src/Http/WebAssemblyHttpMessageHandlerOptions.cs

@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Blazor.Http
+{
+    /// <summary>
+    /// Configures options for the WebAssembly HTTP message handler.
+    /// </summary>
+    public static class WebAssemblyHttpMessageHandlerOptions
+    {
+        /// <summary>
+        /// Gets or sets the default value of the 'credentials' option on outbound HTTP requests.
+        /// Defaults to <see cref="FetchCredentialsOption.SameOrigin"/>.
+        /// </summary>
+        public static FetchCredentialsOption DefaultCredentials
+        {
+            get
+            {
+                var valueString = MonoDefaultCredentialsGetter.Value();
+                var result = default(FetchCredentialsOption);
+                if (valueString != null)
+                {
+                    Enum.TryParse(valueString, out result);
+                }
+                return result;
+            }
+
+            set
+            {
+                MonoDefaultCredentialsSetter.Value(value.ToString());
+            }
+        }
+
+        static Func<Type> MonoWasmHttpMessageHandlerType = ()
+            => Assembly.Load("WebAssembly.Net.Http")
+                .GetType("WebAssembly.Net.Http.HttpClient.WasmHttpMessageHandler");
+
+        static Func<Type> MonoFetchCredentialsOptionType = ()
+            => Assembly.Load("WebAssembly.Net.Http")
+                .GetType("WebAssembly.Net.Http.HttpClient.FetchCredentialsOption");
+
+        static Lazy<PropertyInfo> MonoDefaultCredentialsProperty = new Lazy<PropertyInfo>(
+            () => MonoWasmHttpMessageHandlerType()?.GetProperty("DefaultCredentials", BindingFlags.Public | BindingFlags.Static));
+
+        static Lazy<Func<string>> MonoDefaultCredentialsGetter = new Lazy<Func<string>>(() =>
+        {
+            return () => MonoDefaultCredentialsProperty.Value?.GetValue(null).ToString();
+        });
+
+        static Lazy<Action<string>> MonoDefaultCredentialsSetter = new Lazy<Action<string>>(() =>
+        {
+            var fetchCredentialsOptionsType = MonoFetchCredentialsOptionType();
+            return value => MonoDefaultCredentialsProperty.Value?.SetValue(null, Enum.Parse(fetchCredentialsOptionsType, value));
+        });
+    }
+}

src/Components/Blazor/Build/src/targets/BuiltInBclLinkerDescriptor.xml

@@ -18,4 +18,10 @@
     <type fullname="System.ComponentModel.GuidConverter" />
     <type fullname="System.ComponentModel.TimeSpanConverter" />
   </assembly>
+
+  <assembly fullname="WebAssembly.Net.Http">
+    <!-- Without this, the setter for DefaultCredentials would be removed, but we need it -->
+    <type fullname="WebAssembly.Net.Http.HttpClient.FetchCredentialsOption" />
+    <type fullname="WebAssembly.Net.Http.HttpClient.WasmHttpMessageHandler" />
+  </assembly>
 </linker>

src/Components/test/E2ETest/Tests/HttpClientTest.cs

@@ -89,11 +89,11 @@ public void CanReadResponseHeaders()
         [Fact]
         public void CanSendRequestHeaders()
         {
-            AddRequestHeader("TestHeader", "Value from test");
+            AddRequestHeader("testheader", "Value from test");
             AddRequestHeader("another-header", "Another value");
             IssueRequest("DELETE", "/subdir/api/person");
             Assert.Equal("OK", _responseStatus.Text);
-            Assert.Contains("TestHeader: Value from test", _responseBody.Text);
+            Assert.Contains("testheader: Value from test", _responseBody.Text);
             Assert.Contains("another-header: Another value", _responseBody.Text);
         }
 
@@ -107,15 +107,6 @@ public void CanSendAndReceiveJson()
             Assert.Equal("{\"id\":123,\"name\":\"Bert\"}", _responseBody.Text);
         }
 
-        [Fact]
-        public void CanSetRequestReferer()
-        {
-            SetValue("request-referrer", "/test-referrer");
-            IssueRequest("GET", "/subdir/api/person/referrer");
-            Assert.Equal("OK", _responseStatus.Text);
-            Assert.EndsWith("/test-referrer", _responseBody.Text);
-        }
-
         [Fact]
         public void CanSendAndReceiveCookies()
         {

src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor

@@ -1,6 +1,5 @@
 @using System.Net
 @using System.Net.Http
-@using Microsoft.AspNetCore.Blazor.Http
 @inject HttpClient Http
 
 <h1>HTTP request tester</h1>
@@ -38,11 +37,6 @@
     <button id="add-header" @onclick="AddHeader">Add</button>
 </p>
 
-<p>
-    <div>Request referrer:</div>
-    <input id="request-referrer" type="text" @bind=requestReferrer />
-</p>
-
 <button id="send-request" @onclick="DoRequest">Request</button>
 
 @if (responseStatusCode.HasValue)
@@ -65,7 +59,6 @@
     string method = "GET";
     string requestBody = "";
     List<RequestHeader> requestHeaders = new List<RequestHeader>();
-    string requestReferrer = "";
 
     HttpStatusCode? responseStatusCode;
     string responseBody;
@@ -103,14 +96,6 @@
                 }
             }
 
-            if (!string.IsNullOrEmpty(requestReferrer))
-            {
-                requestMessage.Properties[WebAssemblyHttpMessageHandler.FetchArgs] = new
-                {
-                    referrer = requestReferrer
-                };
-            }
-
             var response = await Http.SendAsync(requestMessage);
             responseStatusCode = response.StatusCode;
             responseBody = await response.Content.ReadAsStringAsync();

src/Components/test/testassets/BasicTestApp/Startup.cs

@@ -30,7 +30,7 @@ public void Configure(IComponentsApplicationBuilder app)
             {
                 // Needed because the test server runs on a different port than the client app,
                 // and we want to test sending/receiving cookies underling this config
-                WebAssemblyHttpMessageHandler.DefaultCredentials = FetchCredentialsOption.Include;
+                WebAssemblyHttpMessageHandlerOptions.DefaultCredentials = FetchCredentialsOption.Include;
             }
 
             app.AddComponent<Index>("root");