fixup! Replace configure method on Twitter, RemoteAuthentication, and OpenIdConnect options with CookieBuilder

Author: Nate McMaster

src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs

@@ -282,7 +282,7 @@ public CookieBuilder NonceCookie
             set => _nonceCookieBuilder = value ?? throw new ArgumentNullException(nameof(value));
         }
 
-        private class OpenIdConnectNonceCookieBuilder : PathScopingCookieBuilder
+        private class OpenIdConnectNonceCookieBuilder : RequestPathCookieBuilder
         {
             private readonly OpenIdConnectOptions _options;
 
@@ -291,7 +291,7 @@ public OpenIdConnectNonceCookieBuilder(OpenIdConnectOptions oidcOptions)
                 _options = oidcOptions;
             }
 
-            protected override string PathScope => _options.CallbackPath;
+            protected override string AdditionalPath => _options.CallbackPath;
 
             public override CookieOptions Build(HttpContext context, DateTimeOffset expiresFrom)
             {

src/Microsoft.AspNetCore.Authentication/Internal/PathScopingCookieBuilder.cs renamed to src/Microsoft.AspNetCore.Authentication/Internal/RequestPathCookieBuilder.cs

@@ -9,12 +9,12 @@ namespace Microsoft.AspNetCore.Authentication.Internal
     /// <summary>
     /// A cookie builder that set <see cref="CookieOptions.Path"/> to the original path base plus some scope.
     /// </summary>
-    public abstract class PathScopingCookieBuilder : CookieBuilder
+    public class RequestPathCookieBuilder : CookieBuilder
     {
         /// <summary>
-        /// Path that is appended to the request path base.
+        /// Optional additional path that is appended to the request path base.
         /// </summary>
-        protected abstract string PathScope { get; }
+        protected virtual string AdditionalPath { get; }
 
         public override CookieOptions Build(HttpContext context, DateTimeOffset expiresFrom)
         {
@@ -23,7 +23,7 @@ public override CookieOptions Build(HttpContext context, DateTimeOffset expiresF
             if (path == null)
             {
                 var originalPathBase = context.Features.Get<IAuthenticationFeature>()?.OriginalPathBase ?? context.Request.PathBase;
-                path = originalPathBase + PathScope;
+                path = originalPathBase + AdditionalPath;
             }
 
             var options = base.Build(context, expiresFrom);

src/Microsoft.AspNetCore.Authentication/RemoteAuthenticationOptions.cs

@@ -112,24 +112,24 @@ public CookieBuilder CorrelationIdCookie
             set => _correlationIdCookieBuilder = value ?? throw new ArgumentNullException(nameof(value));
         }
 
-        private class CorrelationIdCookieBuilder : PathScopingCookieBuilder
+        private class CorrelationIdCookieBuilder : RequestPathCookieBuilder
         {
-            private readonly RemoteAuthenticationOptions _optoins;
+            private readonly RemoteAuthenticationOptions _options;
 
             public CorrelationIdCookieBuilder(RemoteAuthenticationOptions remoteAuthenticationOptions)
             {
-                _optoins = remoteAuthenticationOptions;
+                _options = remoteAuthenticationOptions;
             }
 
-            protected override string PathScope => _optoins.CallbackPath;
+            protected override string AdditionalPath => _options.CallbackPath;
 
             public override CookieOptions Build(HttpContext context, DateTimeOffset expiresFrom)
             {
                 var cookieOptions = base.Build(context, expiresFrom);
 
                 if (!Expiration.HasValue || !cookieOptions.Expires.HasValue)
                 {
-                    cookieOptions.Expires = expiresFrom.Add(_optoins.RemoteAuthenticationTimeout);
+                    cookieOptions.Expires = expiresFrom.Add(_options.RemoteAuthenticationTimeout);
                 }
 
                 return cookieOptions;