Simplify names of f4e mail messages

src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseInviteRedeemableViewModel.cs

@@ -1,8 +0,0 @@
-namespace Bit.Core.Models.Mail.FamiliesForEnterprise
-{
-    public class FamiliesForEnterpriseInviteRedeemableViewModel : BaseMailModel
-    {
-        public string OrganizationName { get; set; }
-        public string Url { get; set; }
-    }
-}

src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseOfferViewModel.cs

@@ -0,0 +1,8 @@
+namespace Bit.Core.Models.Mail.FamiliesForEnterprise
+{
+    public class FamiliesForEnterpriseOfferViewModel : BaseMailModel
+    {
+        public string SponsorshipToken { get; set; }
+        public string Url => $"{WebVaultUrl}/sponsored/families-for-enterprise?token={SponsorshipToken}";
+    }
+}

src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseRedeemedToFamilyUserViewModel.cs

@@ -1,6 +1,6 @@
 namespace Bit.Core.Models.Mail.FamiliesForEnterprise
 {
-    public class FamiliesForEnterpriseInviteRedeemedToOrgUserViewModel : BaseMailModel
+    public class FamiliesForEnterpriseRedeemedToFamilyUserViewModel : BaseMailModel
     {
         public string OrganizationName { get; set; }
     }

src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseRedeemedToOrgUserViewModel.cs

@@ -1,6 +1,6 @@
 namespace Bit.Core.Models.Mail.FamiliesForEnterprise
 {
-    public class FamiliesForEnterpriseInviteRedeemedToFamilyUserViewModel : BaseMailModel
+    public class FamiliesForEnterpriseRedeemedToOrgUserViewModel : BaseMailModel
     {
         public string OrganizationName { get; set; }
     }

src/Core/Services/Implementations/HandlebarsMailService.cs

@@ -759,30 +759,22 @@ namespace Bit.Core.Services
 
         public async Task SendFamiliesForEnterpriseOfferEmailAsync(string email, string organizationName, string token)
         {
-            // TODO: Complete emails
+            var message = CreateDefaultMessage("Free Bitwarden Family Plan Offer", email);
-            var message = CreateDefaultMessage("A Family Organization Invite Is Redeemable", email);
 
-            // NOTE: If somehow cloud vault changes this will need to change/be injected
+            var model = new FamiliesForEnterpriseOfferViewModel
-            var url = CoreHelpers.ExtendQuery(new Uri($"https://vault.bitwarden.com/#/sponsored/families-for-enterprise"),
-                new Dictionary<string, string>
             {
-                    ["sponsorshipToken"] = token,
+                WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
-                });
+                SiteName = _globalSettings.SiteName,
-
+                SponsorshipToken = token,
-            var model = new FamiliesForEnterpriseInviteRedeemableViewModel
-            {
-                Url = url.ToString(),
-                OrganizationName = organizationName,
             };
 
-            await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseInviteRedeemable", model);
+            await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseOffer", model);
-            message.Category = "FamiliesForEnterpriseInviteRedeemable";
+            message.Category = "FamiliesForEnterpriseOffer";
             await _mailDeliveryService.SendEmailAsync(message);
         }
 
         public async Task SendFamiliesForEnterpriseRedeemedEmailsAsync(string familyUserEmail, string sponsorEmail, string sponsorOrgName)
         {
-            // TODO: complete emails
             // Email family user
             await SendFamiliesForEnterpriseInviteRedeemedToFamilyUserEmailAsync(familyUserEmail);
 
@@ -794,12 +786,12 @@ namespace Bit.Core.Services
         {
             // TODO: Complete emails
             var message = CreateDefaultMessage("You Have Redeemed A Family Organization Sponsorship", email);
-            var model = new FamiliesForEnterpriseInviteRedeemedToFamilyUserViewModel
+            var model = new FamiliesForEnterpriseRedeemedToFamilyUserViewModel
             {
 
             };
-            await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseInviteRedeemedToFamilyUser", model);
+            await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseRedeemedToFamilyUser", model);
-            message.Category = "FamilyForEnterpriseInviteRedeemedToFamilyUser";
+            message.Category = "FamilyForEnterpriseRedeemedToFamilyUser";
             await _mailDeliveryService.SendEmailAsync(message);
         }
 
@@ -807,12 +799,12 @@ namespace Bit.Core.Services
         {
             // TODO: Complete emails
             var message = CreateDefaultMessage("A User Has Redeemeed Your Sponsorship", email);
-            var model = new FamiliesForEnterpriseInviteRedeemedToOrgUserViewModel
+            var model = new FamiliesForEnterpriseRedeemedToOrgUserViewModel
             {
                 OrganizationName = organizationName,
             };
-            await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseInviteRedeemedToOrgUser", model);
+            await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseRedeemedToOrgUser", model);
-            message.Category = "FamilyForEnterpriseInviteRedeemedToOrgUser";
+            message.Category = "FamilyForEnterpriseRedeemedToOrgUser";
             await _mailDeliveryService.SendEmailAsync(message);
         }