chore: remove FF, references, and restructure code, refs PM-24373 (#6353)

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/SendOrganizationInvitesCommand.cs

@@ -22,8 +22,7 @@ public class SendOrganizationInvitesCommand(
     IPolicyRepository policyRepository,
     IOrgUserInviteTokenableFactory orgUserInviteTokenableFactory,
     IDataProtectorTokenFactory<OrgUserInviteTokenable> dataProtectorTokenFactory,
-    IMailService mailService,
+    IMailService mailService) : ISendOrganizationInvitesCommand
-    IFeatureService featureService) : ISendOrganizationInvitesCommand
 {
     public async Task SendInvitesAsync(SendInvitesRequest request)
     {
@@ -72,15 +71,12 @@ public class SendOrganizationInvitesCommand(
 
         var orgUsersWithExpTokens = orgUsers.Select(MakeOrgUserExpiringTokenPair);
 
-        var isSubjectFeatureEnabled = featureService.IsEnabled(FeatureFlagKeys.InviteEmailImprovements);
-
         return new OrganizationInvitesInfo(
             organization,
             orgSsoEnabled,
             orgSsoLoginRequiredPolicyEnabled,
             orgUsersWithExpTokens,
             orgUserHasExistingUserDict,
-            isSubjectFeatureEnabled,
             initOrganization
         );
     }

src/Core/Constants.cs

@@ -135,7 +135,6 @@ public static class FeatureFlagKeys
     public const string CipherRepositoryBulkResourceCreation = "pm-24951-cipher-repository-bulk-resource-creation-service";
     public const string CollectionVaultRefactor = "pm-25030-resolve-ts-upgrade-errors";
     public const string DeleteClaimedUserAccountRefactor = "pm-25094-refactor-delete-managed-organization-user-command";
-    public const string InviteEmailImprovements = "pm-25644-update-join-organization-subject-line";
 
     /* Auth Team */
     public const string TwoFactorExtensionDataPersistence = "pm-9115-two-factor-extension-data-persistence";

src/Core/Models/Mail/OrganizationInvitesInfo.cs

@@ -15,7 +15,6 @@ public class OrganizationInvitesInfo
         bool orgSsoLoginRequiredPolicyEnabled,
         IEnumerable<(OrganizationUser orgUser, ExpiringToken token)> orgUserTokenPairs,
         Dictionary<Guid, bool> orgUserHasExistingUserDict,
-        bool isSubjectFeatureEnabled = false,
         bool initOrganization = false
         )
     {
@@ -30,8 +29,6 @@ public class OrganizationInvitesInfo
 
         OrgUserTokenPairs = orgUserTokenPairs;
         OrgUserHasExistingUserDict = orgUserHasExistingUserDict;
-
-        IsSubjectFeatureEnabled = isSubjectFeatureEnabled;
     }
 
     public string OrganizationName { get; }
@@ -40,9 +37,6 @@ public class OrganizationInvitesInfo
     public bool OrgSsoEnabled { get; }
     public string OrgSsoIdentifier { get; }
     public bool OrgSsoLoginRequiredPolicyEnabled { get; }
-
-    public bool IsSubjectFeatureEnabled { get; }
-
     public IEnumerable<(OrganizationUser OrgUser, ExpiringToken Token)> OrgUserTokenPairs { get; }
     public Dictionary<Guid, bool> OrgUserHasExistingUserDict { get; }
 

src/Core/Models/Mail/OrganizationUserInvitedViewModel.cs

@@ -20,40 +20,6 @@ public class OrganizationUserInvitedViewModel : BaseTitleContactUsMailModel
         OrganizationUser orgUser,
         ExpiringToken expiringToken,
         GlobalSettings globalSettings)
-    {
-        var freeOrgTitle = "A Bitwarden member invited you to an organization. Join now to start securing your passwords!";
-
-        return new OrganizationUserInvitedViewModel
-        {
-            TitleFirst = orgInvitesInfo.IsFreeOrg ? freeOrgTitle : "Join ",
-            TitleSecondBold =
-                orgInvitesInfo.IsFreeOrg
-                    ? string.Empty
-                    : CoreHelpers.SanitizeForEmail(orgInvitesInfo.OrganizationName, false),
-            TitleThird = orgInvitesInfo.IsFreeOrg ? string.Empty : " on Bitwarden and start securing your passwords!",
-            OrganizationName = CoreHelpers.SanitizeForEmail(orgInvitesInfo.OrganizationName, false),
-            Email = WebUtility.UrlEncode(orgUser.Email),
-            OrganizationId = orgUser.OrganizationId.ToString(),
-            OrganizationUserId = orgUser.Id.ToString(),
-            Token = WebUtility.UrlEncode(expiringToken.Token),
-            ExpirationDate =
-                $"{expiringToken.ExpirationDate.ToLongDateString()} {expiringToken.ExpirationDate.ToShortTimeString()} UTC",
-            OrganizationNameUrlEncoded = WebUtility.UrlEncode(orgInvitesInfo.OrganizationName),
-            WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash,
-            SiteName = globalSettings.SiteName,
-            InitOrganization = orgInvitesInfo.InitOrganization,
-            OrgSsoIdentifier = orgInvitesInfo.OrgSsoIdentifier,
-            OrgSsoEnabled = orgInvitesInfo.OrgSsoEnabled,
-            OrgSsoLoginRequiredPolicyEnabled = orgInvitesInfo.OrgSsoLoginRequiredPolicyEnabled,
-            OrgUserHasExistingUser = orgInvitesInfo.OrgUserHasExistingUserDict[orgUser.Id]
-        };
-    }
-
-    public static OrganizationUserInvitedViewModel CreateFromInviteInfo_v2(
-        OrganizationInvitesInfo orgInvitesInfo,
-        OrganizationUser orgUser,
-        ExpiringToken expiringToken,
-        GlobalSettings globalSettings)
     {
         const string freeOrgTitle = "A Bitwarden member invited you to an organization. " +
                                     "Join now to start securing your passwords!";

src/Core/Services/Implementations/HandlebarsMailService.cs

@@ -355,11 +355,8 @@ public class HandlebarsMailService : IMailService
         {
             Debug.Assert(orgUserTokenPair.OrgUser.Email is not null);
 
-            var orgUserInviteViewModel = orgInvitesInfo.IsSubjectFeatureEnabled
+            var orgUserInviteViewModel = OrganizationUserInvitedViewModel.CreateFromInviteInfo(orgInvitesInfo, orgUserTokenPair.OrgUser,
-                ? OrganizationUserInvitedViewModel.CreateFromInviteInfo_v2(
+                orgUserTokenPair.Token, _globalSettings);
-                    orgInvitesInfo, orgUserTokenPair.OrgUser, orgUserTokenPair.Token, _globalSettings)
-                : OrganizationUserInvitedViewModel.CreateFromInviteInfo(orgInvitesInfo, orgUserTokenPair.OrgUser,
-                    orgUserTokenPair.Token, _globalSettings);
 
             return CreateMessage(orgUserTokenPair.OrgUser.Email, orgUserInviteViewModel);
         });
@@ -369,20 +366,15 @@ public class HandlebarsMailService : IMailService
 
         MailQueueMessage CreateMessage(string email, OrganizationUserInvitedViewModel model)
         {
-            var subject = $"Join {model.OrganizationName}";
+            ArgumentNullException.ThrowIfNull(model);
 
-            if (orgInvitesInfo.IsSubjectFeatureEnabled)
+            var subject = model! switch
             {
-                ArgumentNullException.ThrowIfNull(model);
+                { IsFreeOrg: true, OrgUserHasExistingUser: true } => "You have been invited to a Bitwarden Organization",
-
+                { IsFreeOrg: true, OrgUserHasExistingUser: false } => "You have been invited to Bitwarden Password Manager",
-                subject = model! switch
+                { IsFreeOrg: false, OrgUserHasExistingUser: true } => $"{model.OrganizationName} invited you to their Bitwarden organization",
-                {
+                { IsFreeOrg: false, OrgUserHasExistingUser: false } => $"{model.OrganizationName} set up a Bitwarden account for you"
-                    { IsFreeOrg: true, OrgUserHasExistingUser: true } => "You have been invited to a Bitwarden Organization",
+            };
-                    { IsFreeOrg: true, OrgUserHasExistingUser: false } => "You have been invited to Bitwarden Password Manager",
-                    { IsFreeOrg: false, OrgUserHasExistingUser: true } => $"{model.OrganizationName} invited you to their Bitwarden organization",
-                    { IsFreeOrg: false, OrgUserHasExistingUser: false } => $"{model.OrganizationName} set up a Bitwarden account for you"
-                };
-            }
 
             var message = CreateDefaultMessage(subject, email);