Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit fbf4b79

Browse files
JunTaoLuoJunTaoLuo
committed
Rename
1 parent b2643f3 commit fbf4b79

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎src/Microsoft.AspNetCore.Http.Features/CookieOptions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public CookieOptions()
4444

4545

4646
/// <summary>
47-
/// Gets or sets the value for the SameSite attribute of the cookie. The default value is <see cref="SameSiteEnforcementMode.Lax"/>
47+
/// Gets or sets the value for the SameSite attribute of the cookie. The default value is <see cref="SameSiteMode.Lax"/>
4848
/// </summary>
49-
/// <returns>The <see cref="SameSiteEnforcementMode"/> representing the enforcement mode of the cookie.</returns>
50-
public SameSiteEnforcementMode SameSite { get; set; } = SameSiteEnforcementMode.Lax;
49+
/// <returns>The <see cref="SameSiteMode"/> representing the enforcement mode of the cookie.</returns>
50+
public SameSiteMode SameSite { get; set; } = SameSiteMode.Lax;
5151

5252
/// <summary>
5353
/// Gets or sets a value that indicates whether a cookie is accessible by client-side script.

‎src/Microsoft.AspNetCore.Http.Features/SameSiteEnforcementMode.cs‎ renamed to ‎src/Microsoft.AspNetCore.Http.Features/SameSiteMode.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
namespace Microsoft.AspNetCore.Http
55
{
66
// RFC Draft: https://tools.ietf.org/html/draft-ietf-httpbis-cookie-same-site-00
7-
// This mirrors Microsoft.Net.Http.Headers.SameSiteEnforcementMode
8-
public enum SameSiteEnforcementMode
7+
// This mirrors Microsoft.Net.Http.Headers.SameSiteMode
8+
public enum SameSiteMode
99
{
1010
None = 0,
1111
Lax,

‎src/Microsoft.AspNetCore.Http/Internal/ResponseCookies.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void Append(string key, string value, CookieOptions options)
6262
Path = options.Path,
6363
Expires = options.Expires,
6464
Secure = options.Secure,
65-
SameSite = (Net.Http.Headers.SameSiteEnforcementMode)options.SameSite,
65+
SameSite = (Net.Http.Headers.SameSiteMode)options.SameSite,
6666
HttpOnly = options.HttpOnly
6767
};
6868

‎src/Microsoft.Net.Http.Headers/SameSiteEnforcementMode.cs‎ renamed to ‎src/Microsoft.Net.Http.Headers/SameSiteMode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace Microsoft.Net.Http.Headers
55
{
66
// RFC Draft: https://tools.ietf.org/html/draft-ietf-httpbis-cookie-same-site-00
7-
public enum SameSiteEnforcementMode
7+
public enum SameSiteMode
88
{
99
None = 0,
1010
Lax,

‎src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class SetCookieHeaderValue
1919
private const string SecureToken = "secure";
2020
// RFC Draft: https://tools.ietf.org/html/draft-ietf-httpbis-cookie-same-site-00
2121
private const string SameSiteToken = "samesite";
22-
private static readonly string SameSiteLaxToken = SameSiteEnforcementMode.Lax.ToString().ToLower();
23-
private static readonly string SameSiteStrictToken = SameSiteEnforcementMode.Strict.ToString().ToLower();
22+
private static readonly string SameSiteLaxToken = SameSiteMode.Lax.ToString().ToLower();
23+
private static readonly string SameSiteStrictToken = SameSiteMode.Strict.ToString().ToLower();
2424
private const string HttpOnlyToken = "httponly";
2525
private const string SeparatorToken = "; ";
2626
private const string EqualsToken = "=";
@@ -91,7 +91,7 @@ public string Value
9191

9292
public bool Secure { get; set; }
9393

94-
public SameSiteEnforcementMode SameSite { get; set; }
94+
public SameSiteMode SameSite { get; set; }
9595

9696
public bool HttpOnly { get; set; }
9797

@@ -131,9 +131,9 @@ public override string ToString()
131131
length += SeparatorToken.Length + SecureToken.Length;
132132
}
133133

134-
if (SameSite != SameSiteEnforcementMode.None)
134+
if (SameSite != SameSiteMode.None)
135135
{
136-
sameSite = SameSite == SameSiteEnforcementMode.Lax ? SameSiteLaxToken : SameSiteStrictToken;
136+
sameSite = SameSite == SameSiteMode.Lax ? SameSiteLaxToken : SameSiteStrictToken;
137137
length += SeparatorToken.Length + SameSiteToken.Length + EqualsToken.Length + sameSite.Length;
138138
}
139139

@@ -173,7 +173,7 @@ public override string ToString()
173173
AppendSegment(ref sb, SecureToken, null);
174174
}
175175

176-
if (SameSite != SameSiteEnforcementMode.None)
176+
if (SameSite != SameSiteMode.None)
177177
{
178178
AppendSegment(ref sb, SameSiteToken, sameSite);
179179
}
@@ -236,9 +236,9 @@ public void AppendToStringBuilder(StringBuilder builder)
236236
AppendSegment(builder, SecureToken, null);
237237
}
238238

239-
if (SameSite != SameSiteEnforcementMode.None)
239+
if (SameSite != SameSiteMode.None)
240240
{
241-
AppendSegment(builder, SameSiteToken, SameSite == SameSiteEnforcementMode.Lax ? SameSiteLaxToken : SameSiteStrictToken);
241+
AppendSegment(builder, SameSiteToken, SameSite == SameSiteMode.Lax ? SameSiteLaxToken : SameSiteStrictToken);
242242
}
243243

244244
if (HttpOnly)
@@ -431,19 +431,19 @@ private static int GetSetCookieLength(string input, int startIndex, out SetCooki
431431
{
432432
if (!ReadEqualsSign(input, ref offset))
433433
{
434-
result.SameSite = SameSiteEnforcementMode.Strict;
434+
result.SameSite = SameSiteMode.Strict;
435435
}
436436
else
437437
{
438438
var enforcementMode = ReadToSemicolonOrEnd(input, ref offset);
439439

440440
if (string.Equals(enforcementMode, SameSiteLaxToken, StringComparison.OrdinalIgnoreCase))
441441
{
442-
result.SameSite = SameSiteEnforcementMode.Lax;
442+
result.SameSite = SameSiteMode.Lax;
443443
}
444444
else
445445
{
446-
result.SameSite = SameSiteEnforcementMode.Strict;
446+
result.SameSite = SameSiteMode.Strict;
447447
}
448448
}
449449
}

‎test/Microsoft.Net.Http.Headers.Tests/SetCookieHeaderValueTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static TheoryData<SetCookieHeaderValue, string> SetCookieHeaderDataSet
2020
{
2121
Domain = "domain1",
2222
Expires = new DateTimeOffset(1994, 11, 6, 8, 49, 37, TimeSpan.Zero),
23-
SameSite = SameSiteEnforcementMode.Strict,
23+
SameSite = SameSiteMode.Strict,
2424
HttpOnly = true,
2525
MaxAge = TimeSpan.FromDays(1),
2626
Path = "path1",
@@ -49,13 +49,13 @@ public static TheoryData<SetCookieHeaderValue, string> SetCookieHeaderDataSet
4949

5050
var header6 = new SetCookieHeaderValue("name6", "value6")
5151
{
52-
SameSite = SameSiteEnforcementMode.Lax,
52+
SameSite = SameSiteMode.Lax,
5353
};
5454
dataset.Add(header6, "name6=value6; samesite=lax");
5555

5656
var header7 = new SetCookieHeaderValue("name7", "value7")
5757
{
58-
SameSite = SameSiteEnforcementMode.None,
58+
SameSite = SameSiteMode.None,
5959
};
6060
dataset.Add(header7, "name7=value7");
6161

@@ -120,7 +120,7 @@ public static TheoryData<IList<SetCookieHeaderValue>, string[]> ListOfSetCookieH
120120
{
121121
Domain = "domain1",
122122
Expires = new DateTimeOffset(1994, 11, 6, 8, 49, 37, TimeSpan.Zero),
123-
SameSite = SameSiteEnforcementMode.Strict,
123+
SameSite = SameSiteMode.Strict,
124124
HttpOnly = true,
125125
MaxAge = TimeSpan.FromDays(1),
126126
Path = "path1",
@@ -146,14 +146,14 @@ public static TheoryData<IList<SetCookieHeaderValue>, string[]> ListOfSetCookieH
146146

147147
var header5 = new SetCookieHeaderValue("name5", "value5")
148148
{
149-
SameSite = SameSiteEnforcementMode.Lax
149+
SameSite = SameSiteMode.Lax
150150
};
151151
var string5a = "name5=value5; samesite=lax";
152152
var string5b = "name5=value5; samesite=Lax";
153153

154154
var header6 = new SetCookieHeaderValue("name6", "value6")
155155
{
156-
SameSite = SameSiteEnforcementMode.Strict
156+
SameSite = SameSiteMode.Strict
157157
};
158158
var string6a = "name6=value6; samesite";
159159
var string6b = "name6=value6; samesite=Strict";
@@ -187,7 +187,7 @@ public static TheoryData<IList<SetCookieHeaderValue>, string[]> ListWithInvalidS
187187
{
188188
Domain = "domain1",
189189
Expires = new DateTimeOffset(1994, 11, 6, 8, 49, 37, TimeSpan.Zero),
190-
SameSite = SameSiteEnforcementMode.Strict,
190+
SameSite = SameSiteMode.Strict,
191191
HttpOnly = true,
192192
MaxAge = TimeSpan.FromDays(1),
193193
Path = "path1",

0 commit comments

Comments
 (0)