API updates per review feedback

docs/core.md

@@ -11,13 +11,12 @@ var builder = WebApplication.CreateBuilder();
 builder.Services.AddControllersWithViews();
 builder.Services.AddSystemWebAdapters()
     .AddJsonSessionKeySerializer(options => ClassLibrary.SessionUtils.RegisterSessionKeys(options))
-    .AddRemoteAppClient(remote => remote
-        .Configure(options =>
-        {
-            options.RemoteApp = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
-            options.ApiKey = ClassLibrary.SessionUtils.ApiKey;
-        })
-        .AddSession());
+    .AddRemoteAppClient(options =>
+    {
+        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
+        options.ApiKey = builder.Configuration("RemoteAppApiKey");
+    })
+    .AddSessionClient();
 
 var app = builder.Build();
 

docs/framework.md

@@ -29,9 +29,8 @@ protected void Application_Start()
     SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
         .AddProxySupport(options => options.UseForwardedHeaders = true)
         .AddJsonSessionSerializer(options => ClassLibrary.SessionUtils.RegisterSessionKeys(options.KnownKeys))
-        .AddRemoteAppServer(remote => remote
-            .Configure(options => options.ApiKey = ClassLibrary.SessionUtils.ApiKey)
-            .AddSession());
+        .AddRemoteAppServer(options => options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"])
+        .AddSessionServer();
 }
 ```
 

docs/remote-app-setup.md

@@ -14,10 +14,10 @@ To setup the ASP.NET app to be able to receive requests from the ASP.NET Core ap
 
 ```CSharp
 SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
-    .AddRemoteApp(options =>
+    .AddRemoteAppServer(options =>
     {
         // ApiKey is a string representing a GUID
-        options.ApiKey = "00000000-0000-0000-0000-000000000000";
+        options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"];
     });
 ```
 
@@ -29,12 +29,10 @@ To setup the ASP.NET Core app to be able to send requests to the ASP.NET app, yo
 
 ```CSharp
 builder.Services.AddSystemWebAdapters()
-    .AddRemoteApp(options =>
+    .AddRemoteAppClient(options =>
     {
-        options.RemoteAppUrl = new(builder.Configuration["http://URL-for-the-ASPNet-app"]);
-
-        // ApiKey is a string representing a GUID
-        options.ApiKey = "00000000-0000-0000-0000-000000000000";
+        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
+        options.ApiKey = builder.Configuration("RemoteAppApiKey");
     });
 ```
 

docs/remote-authentication/remote-authentication.md

@@ -17,8 +17,7 @@ SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
     .AddProxySupport(options => options.UseForwardedHeaders = true)
     .AddRemoteApp(options =>
     {
-        // ApiKey is a string representing a GUID
-        options.ApiKey = "00000000-0000-0000-0000-000000000000";
+        options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"];
     })
     .AddRemoteAppAuthentication();
 ```
@@ -31,10 +30,8 @@ Next, the ASP.NET Core app needs to be configured to enable the authentication h
 builder.Services.AddSystemWebAdapters()
     .AddRemoteApp(options =>
     {
-        options.RemoteAppUrl = new(builder.Configuration["http://URL-for-the-ASPNet-app"]);
-
-        // ApiKey is a string representing a GUID
-        options.ApiKey = "00000000-0000-0000-0000-000000000000";
+        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
+        options.ApiKey = builder.Configuration("RemoteAppApiKey");
     })
     .AddRemoteAppAuthentication(true);
 ```

docs/session-state/remote-session.md

@@ -22,22 +22,21 @@ Configuration for ASP.NET Core involves calling `AddRemoteAppSession` and `AddJs
 
 ```csharp
 builder.Services.AddSystemWebAdapters()
-    .AddRemoteApp(options =>
+    .AddJsonSessionSerializer(options =>
+    {
+        // Serialization/deserialization requires each session key to be registered to a type
+        options.RegisterKey<int>("test-value");
+        options.RegisterKey<SessionDemoModel>("SampleSessionItem");
+    })
+    .AddRemoteAppClient(options =>
     {
         // Provide the URL for the remote app that has enabled session querying
         options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
 
         // Provide a strong API key that will be used to authenticate the request on the remote app for querying the session
-        // ApiKey is a string representing a GUID
-        options.ApiKey = "00000000-0000-0000-0000-000000000000";
+        options.ApiKey = builder.Configuration("RemoteAppApiKey");
     })
-    .AddRemoteAppSession()
-    .AddJsonSessionSerializer(options =>
-    {
-        // Serialization/deserialization requires each session key to be registered to a type
-        options.RegisterKey<int>("test-value");
-        options.RegisterKey<SessionDemoModel>("SampleSessionItem");
-    });
+    .AddSessionClient();
 ```
 
 Session support requires additional work for the ASP.NET Core pipeline, and is not turned on by default. It can be configured on a per-route basis via ASP.NET Core metadata.
@@ -62,16 +61,16 @@ The framework equivalent would look like the following change in `Global.asax.cs
 
 ```csharp
 SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
-    // Provide a strong API key that will be used to authenticate the request on the remote app for querying the session
-    // ApiKey is a string representing a GUID
-    .AddRemoteApp(options => options.ApiKey = "00000000-0000-0000-0000-000000000000")
-    .AddRemoteAppSession()
     .AddJsonSessionSerializer(options =>
     {
         // Serialization/deserialization requires each session key to be registered to a type
         options.RegisterKey<int>("test-value");
         options.RegisterKey<SessionDemoModel>("SampleSessionItem");
-    });
+    })
+    // Provide a strong API key that will be used to authenticate the request on the remote app for querying the session
+    // ApiKey is a string representing a GUID
+    .AddRemoteAppServer(options => options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"])
+    .AddSessionServer();
 ```
 
 # Protocol

samples/MvcApp/Global.asax.cs

@@ -20,10 +20,9 @@ protected void Application_Start()
             SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
                 .AddProxySupport(options => options.UseForwardedHeaders = true)
                 .AddJsonSessionSerializer(options => ClassLibrary.RemoteServiceUtils.RegisterSessionKeys(options.KnownKeys))
-                .AddRemoteAppServer(remote => remote
-                    .Configure(options => options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"])
-                    .AddAuthentication()
-                    .AddSession());
+                .AddRemoteAppServer(options => options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"])
+                .AddAuthenticationServer()
+                .AddSessionServer();
         }
     }
 }

samples/MvcCoreApp/Program.cs

@@ -17,15 +17,14 @@
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 builder.Services.AddSystemWebAdapters()
-    .AddRemoteAppClient(remote => remote
-        .Configure(options =>
-        {
-            options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
-            options.ApiKey = builder.Configuration["RemoteAppApiKey"];
-        })
-        .AddAuthentication(true)
-        .AddSession())
-    .AddJsonSessionSerializer(options => ClassLibrary.RemoteServiceUtils.RegisterSessionKeys(options.KnownKeys));
+    .AddJsonSessionSerializer(options => ClassLibrary.RemoteServiceUtils.RegisterSessionKeys(options.KnownKeys))
+    .AddRemoteAppClient(options =>
+    {
+        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
+        options.ApiKey = builder.Configuration["RemoteAppApiKey"];
+    })
+    .AddAuthenticationClient(true)
+    .AddSessionClient();
 
 var app = builder.Build();
 

samples/RemoteAuth/Bearer/RemoteBearer/Global.asax.cs

@@ -13,14 +13,8 @@ protected void Application_Start()
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
 
             SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
-                .AddRemoteAppServer(remote => remote
-                    .Configure(options =>
-                    {
-                        // A real application would not hard code this, but load it
-                        // securely from environment or configuration
-                        options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"];
-                    })
-                    .AddAuthentication());
+                .AddRemoteAppServer(options => options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"])
+                .AddAuthenticationServer();
         }
     }
 }

samples/RemoteAuth/Bearer/RemoteBearerCore/Program.cs

@@ -6,18 +6,17 @@
 builder.Services.AddControllers();
 
 builder.Services.AddSystemWebAdapters()
-    .AddRemoteAppClient(remote => remote
-        .Configure(options =>
-        {
-            options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
-            options.ApiKey = builder.Configuration["RemoteAppApiKey"];
-        })
-
-        // This registers the remote app authentication handler. The boolean argument indicates whether remote app auth
-        // should be the default scheme. If it is set to false, HTTP requests to authenticate will only be made for
-        // endpoints that actually need that behavior, but it is then necessary to annotate endpoints requiring remote app
-        // auth with [Authorize(AuthenticationSchemes = RemoteAppAuthenticationDefaults.AuthenticationScheme)] or something similar.
-        .AddAuthentication(isDefaultScheme: true));
+    .AddRemoteAppClient(options =>
+    {
+        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
+        options.ApiKey = builder.Configuration["RemoteAppApiKey"];
+    })
+
+    // This registers the remote app authentication handler. The boolean argument indicates whether remote app auth
+    // should be the default scheme. If it is set to false, HTTP requests to authenticate will only be made for
+    // endpoints that actually need that behavior, but it is then necessary to annotate endpoints requiring remote app
+    // auth with [Authorize(AuthenticationSchemes = RemoteAppAuthenticationDefaults.AuthenticationScheme)] or something similar.
+    .AddAuthenticationClient(isDefaultScheme: true);
 
 var app = builder.Build();
 

samples/RemoteAuth/Forms/FormsAuth/Global.asax.cs

@@ -17,12 +17,11 @@ void Application_Start(object sender, EventArgs e)
 
             SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
                 .AddProxySupport(options => options.UseForwardedHeaders = true)
-                .AddRemoteAppServer(remote => remote
-                    .Configure(options =>
+                .AddRemoteAppServer(options =>
                     {
                         options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"];
                     })
-                    .AddAuthentication());
+                .AddAuthenticationServer();
         }
     }
 }

samples/RemoteAuth/Forms/FormsAuthCore/Program.cs

@@ -7,13 +7,12 @@
 
 // Add System.Web adapter services, including registering remote app authentication
 builder.Services.AddSystemWebAdapters()
-    .AddRemoteAppClient(remote => remote
-        .Configure(options =>
-        {
-            options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
-            options.ApiKey = builder.Configuration["RemoteAppApiKey"];
-        })
-        .AddAuthentication(true));
+    .AddRemoteAppClient(options =>
+    {
+        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
+        options.ApiKey = builder.Configuration["RemoteAppApiKey"];
+    })
+    .AddAuthenticationClient(true);
 
 var app = builder.Build();
 

samples/RemoteAuth/OIDC/OIDCAuth/Global.asax.cs

@@ -17,9 +17,8 @@ protected void Application_Start()
 
             SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
                 .AddProxySupport(options => options.UseForwardedHeaders = true)
-                .AddRemoteAppServer(remote => remote
-                    .Configure(options => options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"])
-                    .AddAuthentication());
+                .AddRemoteAppServer(options => options.ApiKey = ConfigurationManager.AppSettings["RemoteAppApiKey"])
+                .AddAuthenticationServer();
 
         }
     }

samples/RemoteAuth/OIDC/OIDCAuthCore/Program.cs

@@ -1,13 +1,12 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddSystemWebAdapters()
-    .AddRemoteAppClient(remote => remote
-        .Configure(options =>
-        {
-            options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
-            options.ApiKey = builder.Configuration["RemoteAppApiKey"];
-        })
-        .AddAuthentication(true));
+    .AddRemoteAppClient(options =>
+    {
+        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
+        options.ApiKey = builder.Configuration["RemoteAppApiKey"];
+    })
+    .AddAuthenticationClient(true);
 
 builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
 

src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationExtensions.cs

@@ -69,7 +69,7 @@ public static AuthenticationBuilder AddRemoteAppAuthentication(this Authenticati
     /// </summary>
     /// <param name="isDefaultScheme">Specifies whether the remote authentication scheme should be the default authentication scheme. If false, remote authentication will only be used for endpoints specifically requiring the remote authentication scheme.</param>
     /// <param name="configureOptions">Configuration options for the remote authentication handler.</param>
-    public static ISystemWebAdapterRemoteClientAppBuilder AddAuthentication(this ISystemWebAdapterRemoteClientAppBuilder builder, bool isDefaultScheme, Action<RemoteAppAuthenticationClientOptions>? configureOptions = null)
+    public static ISystemWebAdapterRemoteClientAppBuilder AddAuthenticationClient(this ISystemWebAdapterRemoteClientAppBuilder builder, bool isDefaultScheme, Action<RemoteAppAuthenticationClientOptions>? configureOptions = null)
     {
         if (builder is null)
         {

src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientExtensions.cs

@@ -14,7 +14,7 @@ public static class RemoteAppClientExtensions
     /// Add configuration for connecting to a remote app for System.Web extensions that require a remote
     /// ASP.NET app such as remote app authentication or remote app session sharing.
     /// </summary>
-    public static ISystemWebAdapterBuilder AddRemoteAppClient(this ISystemWebAdapterBuilder builder, Action<ISystemWebAdapterRemoteClientAppBuilder> configure)
+    public static ISystemWebAdapterRemoteClientAppBuilder AddRemoteAppClient(this ISystemWebAdapterBuilder builder, Action<RemoteAppClientOptions> configure)
     {
         if (builder is null)
         {
@@ -27,6 +27,7 @@ public static ISystemWebAdapterBuilder AddRemoteAppClient(this ISystemWebAdapter
         }
 
         builder.Services.AddOptions<RemoteAppClientOptions>()
+            .Configure(configure)
             .ValidateDataAnnotations();
 
         builder.Services.AddHttpClient(RemoteConstants.HttpClientName)
@@ -50,27 +51,7 @@ public static ISystemWebAdapterBuilder AddRemoteAppClient(this ISystemWebAdapter
                 client.DefaultRequestHeaders.Add(options.ApiKeyHeader, options.ApiKey);
             });
 
-        configure(new Builder(builder.Services));
-
-        return builder;
-    }
-
-    public static ISystemWebAdapterRemoteClientAppBuilder Configure(this ISystemWebAdapterRemoteClientAppBuilder builder, Action<RemoteAppClientOptions> configure)
-    {
-        if (builder is null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
-
-        if (configure is null)
-        {
-            throw new ArgumentNullException(nameof(configure));
-        }
-
-        builder.Services.AddOptions<RemoteAppClientOptions>()
-            .Configure(configure);
-
-        return builder;
+        return new Builder(builder.Services);
     }
 
     private class Builder : ISystemWebAdapterRemoteClientAppBuilder

src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/RemoteSession/RemoteAppSessionStateExtensions.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 
 public static class RemoteAppSessionStateExtensions
 {
-    public static ISystemWebAdapterRemoteClientAppBuilder AddSession(this ISystemWebAdapterRemoteClientAppBuilder builder, Action<RemoteAppSessionStateClientOptions>? configure = null)
+    public static ISystemWebAdapterRemoteClientAppBuilder AddSessionClient(this ISystemWebAdapterRemoteClientAppBuilder builder, Action<RemoteAppSessionStateClientOptions>? configure = null)
     {
         if (builder is null)
         {

src/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices/Authentication/RemoteAppAuthenticationExtensions.cs

@@ -18,7 +18,7 @@ public static class RemoteAppAuthenticationExtensions
     /// <param name="builder">The System.Web adapter builder to modify.</param>
     /// <param name="configure">Configuration to use when registering the remote authentication module.</param>
     /// <returns>The System.Web adapter builder updated to include the remote authentication module.</returns>
-    public static ISystemWebAdapterRemoteServerAppBuilder AddAuthentication(this ISystemWebAdapterRemoteServerAppBuilder builder, Action<RemoteAppAuthenticationServerOptions>? configure = null)
+    public static ISystemWebAdapterRemoteServerAppBuilder AddAuthenticationServer(this ISystemWebAdapterRemoteServerAppBuilder builder, Action<RemoteAppAuthenticationServerOptions>? configure = null)
     {
         if (builder is null)
         {