Skip to content

Commit c41cd3b

Browse files
committed
Naming convention: count ‘protected’ and ‘protected internal’ members as public, since they are part of the public surface
1 parent d486259 commit c41cd3b

6 files changed

Lines changed: 63 additions & 70 deletions

File tree

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@ dotnet_naming_symbols.types.applicable_accessibilities = public, internal, priva
226226
dotnet_naming_symbols.types.required_modifiers =
227227

228228
dotnet_naming_symbols.public_non_field_members.applicable_kinds = property, event, method
229-
dotnet_naming_symbols.public_non_field_members.applicable_accessibilities = public, internal
229+
dotnet_naming_symbols.public_non_field_members.applicable_accessibilities = public, internal, protected, protected_internal
230230
dotnet_naming_symbols.public_non_field_members.required_modifiers =
231231

232232
dotnet_naming_symbols.private_non_field_members.applicable_kinds = property, event, method
233-
dotnet_naming_symbols.private_non_field_members.applicable_accessibilities = private, protected, protected_internal, private_protected
233+
dotnet_naming_symbols.private_non_field_members.applicable_accessibilities = private, private_protected
234234
dotnet_naming_symbols.private_non_field_members.required_modifiers =
235235

236236
dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field

Src/Authenticator.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void CreateUser(string username, string password, bool canCreateUsers = f
5353
if (password == null)
5454
throw new ArgumentNullException("password");
5555

56-
if (!createUser(username, createHash(password), canCreateUsers))
56+
if (!TryCreateUser(username, createHash(password), canCreateUsers))
5757
throw new InvalidOperationException("The specified user already exists.");
5858
}
5959

@@ -71,7 +71,7 @@ public void CreateUser(string username, string password, bool canCreateUsers = f
7171
/// <remarks>
7272
/// If the user does not exist, the overridden method must return <c>false</c> and not modify <paramref
7373
/// name="username"/>.</remarks>
74-
protected abstract bool getUser(ref string username, out string passwordHash, out bool canCreateUsers);
74+
protected abstract bool GetUser(ref string username, out string passwordHash, out bool canCreateUsers);
7575

7676
/// <summary>
7777
/// When overridden in a derived class, attempts to change a user’s password.</summary>
@@ -85,7 +85,7 @@ public void CreateUser(string username, string password, bool canCreateUsers = f
8585
/// <c>true</c> if the password was successfully changed; <c>false</c> if the specified user does not exist or
8686
/// <paramref name="verifyOldPasswordHash"/> returned <c>false</c> indicating that the old password hash turned
8787
/// out to be invalid.</returns>
88-
protected abstract bool changePassword(string username, string newPasswordHash, Func<string, bool> verifyOldPasswordHash);
88+
protected abstract bool ChangePassword(string username, string newPasswordHash, Func<string, bool> verifyOldPasswordHash);
8989

9090
/// <summary>
9191
/// When overridden in a derived class, creates a new user.</summary>
@@ -97,7 +97,7 @@ public void CreateUser(string username, string password, bool canCreateUsers = f
9797
/// Specifies whether the new user has the right to create new users.</param>
9898
/// <returns>
9999
/// <c>true</c> if a new user was created; <c>false</c> if <paramref name="username"/> is already taken.</returns>
100-
protected abstract bool createUser(string username, string passwordHash, bool canCreateUsers);
100+
protected abstract bool TryCreateUser(string username, string passwordHash, bool canCreateUsers);
101101

102102
private HttpResponse logoutHandler(HttpRequest req, Action<string> setUsername)
103103
{
@@ -117,7 +117,7 @@ private HttpResponse loginHandler(HttpRequest req, Action<string> setUsername)
117117
if (username == null || password == null)
118118
return HttpResponse.Redirect(req.Url.WithQuery("returnto", returnTo));
119119

120-
if (getUser(ref username, out var passwordHash, out var canCreateUsers) && verifyHash(password, passwordHash))
120+
if (GetUser(ref username, out var passwordHash, out var canCreateUsers) && verifyHash(password, passwordHash))
121121
{
122122
// Login successful!
123123
setUsername(username);
@@ -147,7 +147,7 @@ private HttpResponse changePasswordHandler(HttpRequest req, string loggedInUser)
147147
if (newpassword2 != newpassword)
148148
return changePasswordForm(loggedInUser, returnTo, false, true, oldpassword, newpassword, newpassword2, req.Url.WithoutQuery("returnto"));
149149

150-
if (!changePassword(loggedInUser, createHash(newpassword), h => verifyHash(oldpassword, h)))
150+
if (!ChangePassword(loggedInUser, createHash(newpassword), h => verifyHash(oldpassword, h)))
151151
return changePasswordForm(loggedInUser, req.Url["returnto"], true, false, oldpassword, newpassword, newpassword2, req.Url.WithoutQuery("returnto"));
152152

153153
return HttpResponse.Redirect(returnTo ?? _defaultReturnTo(req.Url));
@@ -167,14 +167,14 @@ private HttpResponse createUserHandler(HttpRequest req, string loggedInUserName)
167167
// if returnTo is null, this removes the query parameter
168168
return HttpResponse.Redirect(req.Url.WithQuery("returnto", returnTo));
169169

170-
if (!getUser(ref loggedInUserName, out var passwordHash, out var canCreateUsers) || !canCreateUsers)
170+
if (!GetUser(ref loggedInUserName, out var passwordHash, out var canCreateUsers) || !canCreateUsers)
171171
throw new HttpException(HttpStatusCode._401_Unauthorized);
172172

173173
if (newpassword2 != newpassword)
174174
// Passwords don’t match.
175175
return createUserForm(returnTo, false, true, username, newpassword, newpassword2, req.Url.WithoutQuery("returnto"));
176176

177-
if (!createUser(username, createHash(newpassword), false))
177+
if (!TryCreateUser(username, createHash(newpassword), false))
178178
// The user already exists.
179179
return createUserForm(returnTo, true, false, username, newpassword, newpassword2, req.Url.WithoutQuery("returnto"));
180180

Src/FileAuthenticator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public sealed class FileAuthenticator(string usersFilePath, Func<IHttpUrl, strin
2525
private static object _lock = new();
2626

2727
/// <summary>See base.</summary>
28-
protected override bool getUser(ref string username, out string passwordHash, out bool canCreateUsers)
28+
protected override bool GetUser(ref string username, out string passwordHash, out bool canCreateUsers)
2929
{
3030
passwordHash = null;
3131
canCreateUsers = false;
@@ -50,7 +50,7 @@ protected override bool getUser(ref string username, out string passwordHash, ou
5050
}
5151

5252
/// <summary>See base.</summary>
53-
protected override bool changePassword(string username, string newPasswordHash, Func<string, bool> verifyOldPasswordHash)
53+
protected override bool ChangePassword(string username, string newPasswordHash, Func<string, bool> verifyOldPasswordHash)
5454
{
5555
lock (_lock)
5656
{
@@ -70,7 +70,7 @@ protected override bool changePassword(string username, string newPasswordHash,
7070
}
7171

7272
/// <summary>See base.</summary>
73-
protected override bool createUser(string username, string passwordHash, bool canCreateUsers)
73+
protected override bool TryCreateUser(string username, string passwordHash, bool canCreateUsers)
7474
{
7575
lock (_lock)
7676
{

Src/HttpUrl.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -662,10 +662,10 @@ public override void AppendQueryString(StringBuilder sb, bool first) { }
662662
internal abstract class UrlWithQueryRemovals(IHttpUrl source) : UrlWithNoChanges(source)
663663
{
664664
private string _queryString = null;
665-
protected abstract string getValue(string name);
666-
protected abstract IEnumerable<KeyValuePair<string, string>> getQuery();
667-
public override IEnumerable<KeyValuePair<string, string>> Query => _source.HasQuery ? getQuery() : [];
668-
public override string this[string name] => _source.HasQuery ? getValue(name) : null;
665+
protected abstract string GetValue(string name);
666+
protected abstract IEnumerable<KeyValuePair<string, string>> GetQuery();
667+
public override IEnumerable<KeyValuePair<string, string>> Query => _source.HasQuery ? GetQuery() : [];
668+
public override string this[string name] => _source.HasQuery ? GetValue(name) : null;
669669
public override string QueryString => _source.HasQuery ? (_queryString ??= HttpHelper.MakeQueryString(null, Query)) : "";
670670
public override bool HasQuery => _source.HasQuery && QueryString.Length > 0;
671671
public override void AppendQueryString(StringBuilder sb, bool first)
@@ -685,16 +685,16 @@ internal class UrlWithoutQueryMultiple(IHttpUrl source, HashSet<string> names) :
685685

686686
public UrlWithoutQueryMultiple(IHttpUrl source, IEnumerable<string> names) : this(source, [.. names]) { }
687687

688-
protected override string getValue(string name) => _names.Contains(name) ? null : _source[name];
689-
protected override IEnumerable<KeyValuePair<string, string>> getQuery() => _source.Query.Where(kvp => !_names.Contains(kvp.Key));
688+
protected override string GetValue(string name) => _names.Contains(name) ? null : _source[name];
689+
protected override IEnumerable<KeyValuePair<string, string>> GetQuery() => _source.Query.Where(kvp => !_names.Contains(kvp.Key));
690690
public override IEnumerable<string> QueryValues(string name) => _names.Contains(name) ? [] : _source.QueryValues(name);
691691
}
692692

693693
internal class UrlWithQueryWhere(IHttpUrl source, Func<string, bool> nameFilter) : UrlWithQueryRemovals(source)
694694
{
695695
private readonly Func<string, bool> _nameFilter = nameFilter ?? throw new ArgumentException();
696-
protected override string getValue(string name) => _nameFilter(name) ? _source[name] : null;
697-
protected override IEnumerable<KeyValuePair<string, string>> getQuery() => _source.Query.Where(kvp => _nameFilter(kvp.Key));
696+
protected override string GetValue(string name) => _nameFilter(name) ? _source[name] : null;
697+
protected override IEnumerable<KeyValuePair<string, string>> GetQuery() => _source.Query.Where(kvp => _nameFilter(kvp.Key));
698698

699699
public override IEnumerable<string> QueryValues(string name)
700700
{
@@ -709,15 +709,15 @@ internal class UrlWithQueryWhereValues(IHttpUrl source, Func<string, string, boo
709709
{
710710
private readonly Func<string, string, bool> _nameValueFilter = nameValueFilter ?? throw new ArgumentException();
711711

712-
protected override string getValue(string name)
712+
protected override string GetValue(string name)
713713
{
714-
foreach (var kvp in getQuery())
714+
foreach (var kvp in GetQuery())
715715
if (kvp.Key == name && _nameValueFilter(kvp.Key, kvp.Value))
716716
return kvp.Value;
717717
return null;
718718
}
719719

720-
protected override IEnumerable<KeyValuePair<string, string>> getQuery()
720+
protected override IEnumerable<KeyValuePair<string, string>> GetQuery()
721721
{
722722
return _source.Query.Where(kvp => _nameValueFilter(kvp.Key, kvp.Value));
723723
}

0 commit comments

Comments
 (0)