No separate DB methods for email domain blocking by address or domain

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Registration.cs

@@ -287,11 +287,9 @@ public bool IsEmailAddressDisallowed(string emailAddress)
     private string GetEmailDomainFromAddress(string emailAddress)
         => emailAddress.Split('@').Last();
 
-    public bool DisallowEmailDomainByAddress(string emailAddress)
-        => this.DisallowEmailDomain(this.GetEmailDomainFromAddress(emailAddress));
-
-    private bool DisallowEmailDomain(string emailDomain)
+    public bool DisallowEmailDomain(string emailAddress)
     {
+        string emailDomain = this.GetEmailDomainFromAddress(emailAddress);
         if (this.IsEmailDomainDisallowed(emailDomain)) 
             return false;
 
@@ -304,11 +302,9 @@ private bool DisallowEmailDomain(string emailDomain)
         return true;
     }
 
-    public bool ReallowEmailDomainByAddress(string emailAddress)
-        => this.ReallowEmailDomain(this.GetEmailDomainFromAddress(emailAddress));
-    
-    private bool ReallowEmailDomain(string emailDomain)
+    public bool ReallowEmailDomain(string emailAddress)
     {
+        string emailDomain = this.GetEmailDomainFromAddress(emailAddress);
         DisallowedEmailDomain? disallowedDomain = this.DisallowedEmailDomains.FirstOrDefault(u => u.Domain == emailDomain);
         if (disallowedDomain == null) 
             return false;
@@ -319,11 +315,9 @@ private bool ReallowEmailDomain(string emailDomain)
         return true;
     }
 
-    public bool IsEmailDomainDisallowedByAddress(string emailAddress)
-        => this.IsEmailDomainDisallowed(this.GetEmailDomainFromAddress(emailAddress));
-
-    private bool IsEmailDomainDisallowed(string emailDomain)
+    public bool IsEmailDomainDisallowed(string emailAddress)
     {
+        string emailDomain = this.GetEmailDomainFromAddress(emailAddress);
         return this.DisallowedEmailDomains.Any(u => u.Domain == emailDomain);
     }
 }

Refresh.GameServer/RefreshGameServer.cs

@@ -303,14 +303,14 @@ public bool DisallowEmailDomain(string domain)
     {
         using GameDatabaseContext context = this.GetContext();
 
-        return context.DisallowEmailDomainByAddress(domain);
+        return context.DisallowEmailDomain(domain);
     }
 
     public bool ReallowEmailDomain(string domain)
     {
         using GameDatabaseContext context = this.GetContext();
 
-        return context.ReallowEmailDomainByAddress(domain);
+        return context.ReallowEmailDomain(domain);
     }
 
     public void RenameUser(GameUser user, string newUsername, bool force = false)

Refresh.Interfaces.APIv3/Endpoints/AuthenticationApiEndpoints.cs

@@ -347,7 +347,7 @@ public ApiResponse<IApiAuthenticationResponse> Register(RequestContext context,
         if (!smtpService.CheckEmailDomainValidity(body.EmailAddress))
             return ApiValidationError.EmailDoesNotActuallyExistError;
 
-        if (database.IsUserDisallowed(body.Username) || database.IsEmailAddressDisallowed(body.EmailAddress) || database.IsEmailDomainDisallowedByAddress(body.EmailAddress))
+        if (database.IsUserDisallowed(body.Username) || database.IsEmailAddressDisallowed(body.EmailAddress) || database.IsEmailDomainDisallowed(body.EmailAddress))
             return new ApiAuthenticationError("You aren't allowed to play on this instance.");
 
         if (!database.IsUsernameValid(body.Username))

RefreshTests.GameServer/Tests/ApiV3/UserApiTests.cs

@@ -85,11 +85,11 @@ public void CannotRegisterAccountsWithDisallowedEmailDomain()
 
         const string email = "guy@moron.com";
         // Not somehow already disallowed
-        Assert.That(context.Database.IsEmailDomainDisallowedByAddress(email), Is.False);
-        context.Database.DisallowEmailDomainByAddress(email);
+        Assert.That(context.Database.IsEmailDomainDisallowed(email), Is.False);
+        context.Database.DisallowEmailDomain(email);
 
         context.Database.Refresh();
-        Assert.That(context.Database.IsEmailDomainDisallowedByAddress(email), Is.True);
+        Assert.That(context.Database.IsEmailDomainDisallowed(email), Is.True);
 
         // Attempt 1 (block)
         ApiResponse<ApiAuthenticationResponse>? response = context.Http.PostData<ApiAuthenticationResponse>("/api/v3/register", new ApiRegisterRequest
@@ -148,9 +148,9 @@ public void CannotRegisterAccountsWithDisallowedEmailDomain()
         Assert.That(quacker!.Username, Is.EqualTo("a_lil_guy"));
 
         // Undo
-        context.Database.ReallowEmailDomainByAddress(email);
+        context.Database.ReallowEmailDomain(email);
         context.Database.Refresh();
-        Assert.That(context.Database.IsEmailDomainDisallowedByAddress(email), Is.False);
+        Assert.That(context.Database.IsEmailDomainDisallowed(email), Is.False);
     }
 
     [Test]