React to 2.29.0 API changes in gRPC-Web (#18373)

Author: JamesNK

aspnetcore/grpc/browser.md

@@ -4,7 +4,7 @@ author: jamesnk
 description: Learn how to configure gRPC services on ASP.NET Core to be callable from browser apps using gRPC-Web.
 monikerRange: '>= aspnetcore-3.0'
 ms.author: jamesnk
-ms.date: 04/15/2020
+ms.date: 05/19/2020
 no-loc: [Blazor, "Identity", "Let's Encrypt", Razor, SignalR]
 uid: grpc/browser
 ---
@@ -40,7 +40,7 @@ gRPC services hosted in ASP.NET Core can be configured to support gRPC-Web along
 To enable gRPC-Web with an ASP.NET Core gRPC service:
 
 * Add a reference to the [Grpc.AspNetCore.Web](https://www.nuget.org/packages/Grpc.AspNetCore.Web) package.
-* Configure the app to use gRPC-Web by adding `AddGrpcWeb` and `UseGrpcWeb` to *Startup.cs*:
+* Configure the app to use gRPC-Web by adding `UseGrpcWeb` and `EnableGrpcWeb` to *Startup.cs*:
 
 [!code-csharp[](~/grpc/browser/sample/Startup.cs?name=snippet_1&highlight=10,14)]
 
@@ -49,9 +49,9 @@ The preceding code:
 * Adds the gRPC-Web middleware, `UseGrpcWeb`, after routing and before endpoints.
 * Specifies the `endpoints.MapGrpcService<GreeterService>()` method supports gRPC-Web with `EnableGrpcWeb`. 
 
-Alternatively, configure all services to support gRPC-Web by adding `services.AddGrpcWeb(o => o.GrpcWebEnabled = true);` to ConfigureServices.
+Alternatively, the gRPC-Web middleware can be configured so all services support gRPC-Web by default and `EnableGrpcWeb` isn't required. Specify `new GrpcWebOptions { DefaultEnabled = true }` when the middleware is added.
 
-[!code-csharp[](~/grpc/browser/sample/AllServicesSupportExample_Startup.cs?name=snippet_1&highlight=6,13)]
+[!code-csharp[](~/grpc/browser/sample/AllServicesSupportExample_Startup.cs?name=snippet_1&highlight=12)]
 
 > [!NOTE]
 > There is a known issue that causes gRPC-Web to fail when [hosted by Http.sys](xref:fundamentals/servers/httpsys) in .NET Core 3.x.
@@ -91,7 +91,7 @@ The .NET gRPC client can be configured to make gRPC-Web calls. This is useful fo
 To use gRPC-Web:
 
 * Add a reference to the [Grpc.Net.Client.Web](https://www.nuget.org/packages/Grpc.Net.Client.Web) package.
-* Ensure the reference to [Grpc.Net.Client](https://www.nuget.org/packages/Grpc.Net.Client) package is 2.27.0 or greater.
+* Ensure the reference to [Grpc.Net.Client](https://www.nuget.org/packages/Grpc.Net.Client) package is 2.29.0 or greater.
 * Configure the channel to use the `GrpcWebHandler`:
 
 [!code-csharp[](~/grpc/browser/sample/Handler.cs?name=snippet_1)]
@@ -101,10 +101,10 @@ The preceding code:
 * Configures a channel to use gRPC-Web.
 * Creates a client and makes a call using the channel.
 
-The `GrpcWebHandler` has the following configuration options when created:
+`GrpcWebHandler` has the following configuration options:
 
 * **InnerHandler**: The underlying <xref:System.Net.Http.HttpMessageHandler> that makes the gRPC HTTP request, for example, `HttpClientHandler`.
-* **Mode**: An enumeration type that specifies whether the gRPC HTTP request `Content-Type` is `application/grpc-web` or `application/grpc-web-text`.
+* **GrpcWebMode**: An enumeration type that specifies whether the gRPC HTTP request `Content-Type` is `application/grpc-web` or `application/grpc-web-text`.
     * `GrpcWebMode.GrpcWeb` configures content to be sent without encoding. Default value.
     * `GrpcWebMode.GrpcWebText` configures content to be base64 encoded. Required for server streaming calls in browsers.
 * **HttpVersion**: HTTP protocol `Version` used to set [HttpRequestMessage.Version](xref:System.Net.Http.HttpRequestMessage.Version) on the underlying gRPC HTTP request. gRPC-Web doesn't require a specific version and doesn't override the default unless specified.

aspnetcore/grpc/browser/sample/AllServicesSupportExample_Startup.cs

@@ -24,14 +24,13 @@ public class Startup
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddGrpc();
-            services.AddGrpcWeb(o => o.GrpcWebEnabled = true);
         }
 
         public void Configure(IApplicationBuilder app)
         {
             app.UseRouting();
 
-            app.UseGrpcWeb(); // Must be added between UseRouting and UseEndpoints
+            app.UseGrpcWeb(new GrpcWebOptions { DefaultEnabled = true });
 
             app.UseEndpoints(endpoints =>
             {

aspnetcore/grpc/browser/sample/Handler.cs

@@ -1,8 +1,7 @@
 #region snippet_1
-var handler = new GrpcWebHandler(GrpcWebMode.GrpcWebText, new HttpClientHandler());
 var channel = GrpcChannel.ForAddress("https://localhost:5001", new GrpcChannelOptions
     {
-        HttpClient = new HttpClient(handler)
+        HttpHandler = new GrpcWebHandler(new HttpClientHandler())
     });
 
 var client = new Greeter.GreeterClient(channel);