From bec9c555c6f12ba564a1af6663efde9b80d6f94a Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Fri, 2 May 2025 15:24:08 +0100
Subject: [PATCH] Refactor error handling in
 ProviderClientOrganizationSignUpCommand to use constants for error messages

---
 .../ProviderClientOrganizationSignUpCommand.cs         | 10 +++++++---
 .../ProviderClientOrganizationSignUpCommandTests.cs    |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Core/AdminConsole/OrganizationFeatures/Organizations/ProviderClientOrganizationSignUpCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Organizations/ProviderClientOrganizationSignUpCommand.cs
index 642e94636f..7c0dce6448 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/Organizations/ProviderClientOrganizationSignUpCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Organizations/ProviderClientOrganizationSignUpCommand.cs
@@ -31,6 +31,10 @@ public interface IProviderClientOrganizationSignUpCommand
 
 public class ProviderClientOrganizationSignUpCommand : IProviderClientOrganizationSignUpCommand
 {
+    public const string PlanNullErrorMessage = "Password Manager Plan was null.";
+    public const string PlanDisabledErrorMessage = "Password Manager Plan is disabled.";
+    public const string AdditionalSeatsNegativeErrorMessage = "You can't subtract Password Manager seats!";
+
     private readonly ICurrentContext _currentContext;
     private readonly IPricingClient _pricingClient;
     private readonly IReferenceEventService _referenceEventService;
@@ -120,17 +124,17 @@ public class ProviderClientOrganizationSignUpCommand : IProviderClientOrganizati
     {
         if (plan is null)
         {
-            throw new BadRequestException("Password Manager Plan was null.");
+            throw new BadRequestException(PlanNullErrorMessage);
         }
 
         if (plan.Disabled)
         {
-            throw new BadRequestException("Password Manager Plan is disabled.");
+            throw new BadRequestException(PlanDisabledErrorMessage);
         }
 
         if (additionalSeats < 0)
         {
-            throw new BadRequestException("You can't subtract Password Manager seats!");
+            throw new BadRequestException(AdditionalSeatsNegativeErrorMessage);
         }
     }
 
diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/OrganizationSignUp/ProviderClientOrganizationSignUpCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/OrganizationSignUp/ProviderClientOrganizationSignUpCommandTests.cs
index 936a63d9ca..b13c7e5b65 100644
--- a/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/OrganizationSignUp/ProviderClientOrganizationSignUpCommandTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationFeatures/Organizations/OrganizationSignUp/ProviderClientOrganizationSignUpCommandTests.cs
@@ -114,7 +114,7 @@ public class ProviderClientOrganizationSignUpCommandTests
         var exception = await Assert.ThrowsAsync<BadRequestException>(
             () => sutProvider.Sut.SignUpClientOrganizationAsync(signup));
 
-        Assert.Contains("Password Manager Plan was null", exception.Message);
+        Assert.Contains(ProviderClientOrganizationSignUpCommand.PlanNullErrorMessage, exception.Message);
     }
 
     [Theory]
@@ -134,7 +134,7 @@ public class ProviderClientOrganizationSignUpCommandTests
         var exception = await Assert.ThrowsAsync<BadRequestException>(
             () => sutProvider.Sut.SignUpClientOrganizationAsync(signup));
 
-        Assert.Contains("You can't subtract Password Manager seats", exception.Message);
+        Assert.Contains(ProviderClientOrganizationSignUpCommand.AdditionalSeatsNegativeErrorMessage, exception.Message);
     }
 
     [Theory]