Rename CorrelationIdCookie to CorrelationCookie

Author: Nate McMaster

src/Microsoft.AspNetCore.Authentication/Internal/RequestPathBaseCookieBuilder.cs

@@ -28,7 +28,9 @@ public override CookieOptions Build(HttpContext context, DateTimeOffset expiresF
 
             var options = base.Build(context, expiresFrom);
 
-            options.Path = path ?? "/";
+            options.Path = !string.IsNullOrEmpty(path)
+                ? path
+                : "/";
 
             return options;
         }

src/Microsoft.AspNetCore.Authentication/RemoteAuthenticationHandler.cs

@@ -185,11 +185,11 @@ protected virtual void GenerateCorrelationId(AuthenticationProperties properties
             CryptoRandom.GetBytes(bytes);
             var correlationId = Base64UrlTextEncoder.Encode(bytes);
 
-            var cookieOptions = Options.CorrelationIdCookie.Build(Context, Clock.UtcNow);
+            var cookieOptions = Options.CorrelationCookie.Build(Context, Clock.UtcNow);
 
             properties.Items[CorrelationProperty] = correlationId;
 
-            var cookieName = Options.CorrelationIdCookie.Name + Scheme.Name + "." + correlationId;
+            var cookieName = Options.CorrelationCookie.Name + Scheme.Name + "." + correlationId;
 
             Response.Cookies.Append(cookieName, CorrelationMarker, cookieOptions);
         }
@@ -209,7 +209,7 @@ protected virtual bool ValidateCorrelationId(AuthenticationProperties properties
 
             properties.Items.Remove(CorrelationProperty);
 
-            var cookieName = Options.CorrelationIdCookie.Name + Scheme.Name + "." + correlationId;
+            var cookieName = Options.CorrelationCookie.Name + Scheme.Name + "." + correlationId;
 
             var correlationCookie = Request.Cookies[cookieName];
             if (string.IsNullOrEmpty(correlationCookie))
@@ -218,7 +218,7 @@ protected virtual bool ValidateCorrelationId(AuthenticationProperties properties
                 return false;
             }
 
-            var cookieOptions = Options.CorrelationIdCookie.Build(Context, Clock.UtcNow);
+            var cookieOptions = Options.CorrelationCookie.Build(Context, Clock.UtcNow);
 
             Response.Cookies.Delete(cookieName, cookieOptions);
 

src/Microsoft.AspNetCore.Authentication/RemoteAuthenticationOptions.cs

@@ -16,14 +16,14 @@ public class RemoteAuthenticationOptions : AuthenticationSchemeOptions
     {
         internal const string CorrelationPrefix = ".AspNetCore.Correlation.";
 
-        private CookieBuilder _correlationIdCookieBuilder;
+        private CookieBuilder _correlationCookieBuilder;
 
         /// <summary>
         /// Initializes a new <see cref="RemoteAuthenticationOptions"/>.
         /// </summary>
         public RemoteAuthenticationOptions()
         {
-            _correlationIdCookieBuilder = new CorrelationIdCookieBuilder(this)
+            _correlationCookieBuilder = new CorrelationCookieBuilder(this)
             {
                 Name = CorrelationPrefix,
                 HttpOnly = true,
@@ -103,20 +103,20 @@ public override void Validate()
         public bool SaveTokens { get; set; }
 
         /// <summary>
-        /// Determines the settings used to create the correlation id cookie before the
+        /// Determines the settings used to create the correlation cookie before the
         /// cookie gets added to the response.
         /// </summary>
-        public CookieBuilder CorrelationIdCookie
+        public CookieBuilder CorrelationCookie
         {
-            get => _correlationIdCookieBuilder;
-            set => _correlationIdCookieBuilder = value ?? throw new ArgumentNullException(nameof(value));
+            get => _correlationCookieBuilder;
+            set => _correlationCookieBuilder = value ?? throw new ArgumentNullException(nameof(value));
         }
 
-        private class CorrelationIdCookieBuilder : RequestPathBaseCookieBuilder
+        private class CorrelationCookieBuilder : RequestPathBaseCookieBuilder
         {
             private readonly RemoteAuthenticationOptions _options;
 
-            public CorrelationIdCookieBuilder(RemoteAuthenticationOptions remoteAuthenticationOptions)
+            public CorrelationCookieBuilder(RemoteAuthenticationOptions remoteAuthenticationOptions)
             {
                 _options = remoteAuthenticationOptions;
             }

test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectTests.cs

@@ -143,7 +143,7 @@ public async Task RedirectToIdentityProvider_CorrelationIdCookieOptions_CanBeOve
                 {
                     AuthorizationEndpoint = "https://example.com/provider/login"
                 };
-                opt.CorrelationIdCookie.Path = "/";
+                opt.CorrelationCookie.Path = "/";
             });
 
             var server = setting.CreateTestServer();