[PM-27882] code review

Author: JimmyVo16

src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationBaseView.cs

@@ -2,7 +2,6 @@
 
 namespace Bit.Core.AdminConsole.Models.Mail.Mailer.OrganizationConfirmation;
 
-
 public abstract class OrganizationConfirmationBaseView : BaseMailView
 {
     public required string OrganizationName { get; set; }

src/Core/AdminConsole/Models/Mail/Mailer/OrganizationConfirmation/OrganizationConfirmationFamilyFreeView.cs

@@ -2,8 +2,6 @@
 
 namespace Bit.Core.AdminConsole.Models.Mail.Mailer.OrganizationConfirmation;
 
-#nullable enable
-
 public class OrganizationConfirmationFamilyFreeView : OrganizationConfirmationBaseView
 {
 }

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/OrganizationConfirmation/ISendOrganizationConfirmationCommand.cs

@@ -2,8 +2,6 @@
 
 namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.OrganizationConfirmation;
 
-#nullable enable
-
 public interface ISendOrganizationConfirmationCommand
 {
     /// <summary>

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/OrganizationConfirmation/SendOrganizationConfirmationCommand.cs

@@ -9,6 +9,15 @@ namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Organizat
 
 public class SendOrganizationConfirmationCommand(IMailer mailer, GlobalSettings globalSettings) : ISendOrganizationConfirmationCommand
 {
+    private const string _titleFirst = "You're confirmed as a member of ";
+    private const string _titleThird = "!";
+
+    private static string GetConfirmationSubject(string organizationName) =>
+        $"You Have Been Confirmed To {organizationName}";
+    private string GetWebVaultUrl(bool accessSecretsManager) => accessSecretsManager
+        ? globalSettings.BaseServiceUri.VaultWithHashAndSecretManagerProduct
+        : globalSettings.BaseServiceUri.VaultWithHash;
+
     public async Task SendConfirmationAsync(Organization organization, string userEmail, bool accessSecretsManager = false)
     {
         await SendConfirmationsAsync(organization, [userEmail], accessSecretsManager);
@@ -39,16 +48,14 @@ private async Task SendEnterpriseTeamsEmailsAsync(List<string> userEmailsList, s
         var mail = new OrganizationConfirmationEnterpriseTeams
         {
             ToEmails = userEmailsList,
-            Subject = $"You Have Been Confirmed To {organizationName}",
+            Subject = GetConfirmationSubject(organizationName),
             View = new OrganizationConfirmationEnterpriseTeamsView
             {
                 OrganizationName = organizationName,
-                TitleFirst = "You're confirmed as a member of ",
+                TitleFirst = _titleFirst,
                 TitleSecondBold = organizationName,
-                TitleThird = "!",
-                WebVaultUrl = accessSecretsManager
-                    ? globalSettings.BaseServiceUri.VaultWithHashAndSecretManagerProduct
-                    : globalSettings.BaseServiceUri.VaultWithHash
+                TitleThird = _titleThird,
+                WebVaultUrl = GetWebVaultUrl(accessSecretsManager)
             }
         };
 
@@ -60,16 +67,14 @@ private async Task SendFamilyFreeConfirmEmailsAsync(List<string> userEmailsList,
         var mail = new OrganizationConfirmationFamilyFree
         {
             ToEmails = userEmailsList,
-            Subject = $"You Have Been Confirmed To {organizationName}",
+            Subject = GetConfirmationSubject(organizationName),
             View = new OrganizationConfirmationFamilyFreeView
             {
                 OrganizationName = organizationName,
-                TitleFirst = "You're confirmed as a member of ",
+                TitleFirst = _titleFirst,
                 TitleSecondBold = organizationName,
-                TitleThird = "!",
-                WebVaultUrl = accessSecretsManager
-                    ? globalSettings.BaseServiceUri.VaultWithHashAndSecretManagerProduct
-                    : globalSettings.BaseServiceUri.VaultWithHash
+                TitleThird = _titleThird,
+                WebVaultUrl = GetWebVaultUrl(accessSecretsManager)
             }
         };
 

src/Core/Core.csproj

@@ -76,7 +76,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="MailTemplates\Handlebars\MJML\AdminConsole\OrganizationConfirmation\" />
     <Folder Include="Resources\" />
     <Folder Include="Properties\" />
   </ItemGroup>