Consolidate to use SameSiteMode

Author: JunTaoLuo

src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyMiddleware.cs

@@ -74,7 +74,7 @@ public IResponseCookies Cookies
 
             private bool PolicyRequiresCookieOptions()
             {
-                return Policy.SameSite != MinimumSameSiteStrictnessPolicy.None || Policy.HttpOnly != HttpOnlyPolicy.None || Policy.Secure != CookieSecurePolicy.None;
+                return Policy.MinimumSameSitePolicy != SameSiteMode.None || Policy.HttpOnly != HttpOnlyPolicy.None || Policy.Secure != CookieSecurePolicy.None;
             }
 
             public void Append(string key, string value)
@@ -151,21 +151,21 @@ private void ApplyPolicy(CookieOptions options)
                     default:
                         throw new InvalidOperationException();
                 }
-                switch (Policy.SameSite)
+                switch (Policy.MinimumSameSitePolicy)
                 {
-                    case MinimumSameSiteStrictnessPolicy.None:
+                    case SameSiteMode.None:
                         break;
-                    case MinimumSameSiteStrictnessPolicy.Lax:
+                    case SameSiteMode.Lax:
                         if (options.SameSite == SameSiteMode.None)
                         {
                             options.SameSite = SameSiteMode.Lax;
                         }
                         break;
-                    case MinimumSameSiteStrictnessPolicy.Strict:
+                    case SameSiteMode.Strict:
                         options.SameSite = SameSiteMode.Strict;
                         break;
                     default:
-                        throw new InvalidOperationException($"Unrecognized {nameof(MinimumSameSiteStrictnessPolicy)} value {Policy.SameSite.ToString()}");
+                        throw new InvalidOperationException($"Unrecognized {nameof(SameSiteMode)} value {Policy.MinimumSameSitePolicy.ToString()}");
                 }
                 switch (Policy.HttpOnly)
                 {

src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyOptions.cs

@@ -15,7 +15,7 @@ public class CookiePolicyOptions
         /// <summary>
         /// Affects the cookie's same site attribute.
         /// </summary>
-        public MinimumSameSiteStrictnessPolicy SameSite { get; set; } = MinimumSameSiteStrictnessPolicy.Strict;
+        public SameSiteMode MinimumSameSitePolicy { get; set; } = SameSiteMode.Strict;
 
         /// <summary>
         /// Affects whether cookies must be HttpOnly.

src/Microsoft.AspNetCore.CookiePolicy/SameSitePolicy.cs

@@ -161,7 +161,7 @@ public async Task SameSiteStrictSetsItAlways()
             await RunTest("/sameSiteStrict",
                 new CookiePolicyOptions
                 {
-                    SameSite = MinimumSameSiteStrictnessPolicy.Strict
+                    MinimumSameSitePolicy = Http.SameSiteMode.Strict
                 },
                 SameSiteCookieAppends,
                 new RequestTest("http://example.com/sameSiteStrict",
@@ -182,7 +182,7 @@ public async Task SameSiteLaxSetsItAlways()
             await RunTest("/sameSiteLax",
                 new CookiePolicyOptions
                 {
-                    SameSite = MinimumSameSiteStrictnessPolicy.Lax
+                    MinimumSameSitePolicy = Http.SameSiteMode.Lax
                 },
                 SameSiteCookieAppends,
                 new RequestTest("http://example.com/sameSiteLax",
@@ -203,17 +203,17 @@ public async Task SameSiteNoneLeavesItAlone()
             await RunTest("/sameSiteNone",
                 new CookiePolicyOptions
                 {
-                    HttpOnly = HttpOnlyPolicy.None
+                    MinimumSameSitePolicy = Http.SameSiteMode.None
                 },
                 SameSiteCookieAppends,
                 new RequestTest("http://example.com/sameSiteNone",
                 transaction =>
                 {
                     Assert.NotNull(transaction.SetCookie);
-                    Assert.Equal("A=A; path=/; samesite=strict", transaction.SetCookie[0]);
-                    Assert.Equal("B=B; path=/; samesite=strict", transaction.SetCookie[1]);
-                    Assert.Equal("C=C; path=/; samesite=strict", transaction.SetCookie[2]);
-                    Assert.Equal("D=D; path=/; samesite=strict", transaction.SetCookie[3]);
+                    Assert.Equal("A=A; path=/", transaction.SetCookie[0]);
+                    Assert.Equal("B=B; path=/", transaction.SetCookie[1]);
+                    Assert.Equal("C=C; path=/; samesite=lax", transaction.SetCookie[2]);
+                    Assert.Equal("D=D; path=/; samesite=lax", transaction.SetCookie[3]);
                     Assert.Equal("E=E; path=/; samesite=strict", transaction.SetCookie[4]);
                 }));
         }