From bff256ec6bf9c0ca2190bc128dfc5168cda1fc12 Mon Sep 17 00:00:00 2001 From: Justin Baur Date: Thu, 18 Nov 2021 09:26:42 -0500 Subject: [PATCH] Remove ending email --- ...FamiliesForEnterpriseSponsorshipEnding.html.hbs | 9 --------- ...FamiliesForEnterpriseSponsorshipEnding.text.hbs | 3 --- ...iliesForEnterpriseSponsorshipEndingViewModel.cs | 7 ------- src/Core/Services/IMailService.cs | 1 - .../Implementations/HandlebarsMailService.cs | 14 -------------- .../NoopImplementations/NoopMailService.cs | 5 ----- 6 files changed, 39 deletions(-) delete mode 100644 src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.html.hbs delete mode 100644 src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.text.hbs delete mode 100644 src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEndingViewModel.cs diff --git a/src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.html.hbs b/src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.html.hbs deleted file mode 100644 index a3a6b6db7a..0000000000 --- a/src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.html.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{#>FullHtmlLayout}} - - - - -
- Your Families subscription is no longer sponsored and your subscription will expire in {{DaysLeft}} days. Please make sure you have a valid payment method to ensure there's no disruption to your account. Payment method can be updated under Settings → Subscription under your Families Organization. -
-{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.text.hbs b/src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.text.hbs deleted file mode 100644 index 25202e61d2..0000000000 --- a/src/Core/MailTemplates/Handlebars/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEnding.text.hbs +++ /dev/null @@ -1,3 +0,0 @@ -{{#>BasicTextLayout}} -Your Families subscription is no longer sponsored and your subscription will expire in {{DaysLeft}} days. Please make sure you have a valid payment method to ensure there's no disruption to your account. Payment method can be updated under Settings → Subscription under your Families Organization. -{{/BasicTextLayout}} diff --git a/src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEndingViewModel.cs b/src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEndingViewModel.cs deleted file mode 100644 index 02cf27d4ed..0000000000 --- a/src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipEndingViewModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Bit.Core.Models.Mail.FamiliesForEnterprise -{ - public class FamiliesForEnterpriseSponsorshipEndingViewModel : BaseMailModel - { - public int DaysLeft { get; set; } - } -} diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs index 45d1725229..89c8d3d9e3 100644 --- a/src/Core/Services/IMailService.cs +++ b/src/Core/Services/IMailService.cs @@ -53,7 +53,6 @@ namespace Bit.Core.Services Task SendFamiliesForEnterpriseRedeemedEmailsAsync(string familyUserEmail, string sponsorEmail); Task SendFamiliesForEnterpriseReconfirmationRequiredEmailAsync(string email); Task SendFamiliesForEnterpriseSponsorshipRevertingEmailAsync(string email, string familyOrgName); - Task SendFamiliesForEnterpriseSponsorshipEndingEmailAsync(string email, DateTime sponsorshipEndDate); Task SendOTPEmailAsync(string email, string token); } } diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs index c574c88927..cfb4043c82 100644 --- a/src/Core/Services/Implementations/HandlebarsMailService.cs +++ b/src/Core/Services/Implementations/HandlebarsMailService.cs @@ -852,20 +852,6 @@ namespace Bit.Core.Services message.Category = "FamiliesForEnterpriseSponsorshipReverting"; await _mailDeliveryService.SendEmailAsync(message); } - - public async Task SendFamiliesForEnterpriseSponsorshipEndingEmailAsync(string email, DateTime sponsorshipEndDate) - { - var endsInTime = DateTime.UtcNow - sponsorshipEndDate; - - var message = CreateDefaultMessage("Action Required: Renew Families Subscription", email); - var model = new FamiliesForEnterpriseSponsorshipEndingViewModel - { - DaysLeft = (int)endsInTime.TotalDays, - }; - await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseSponsorshipEnding", model); - message.Category = "FamiliesForEnterpriseSponsorshipEnding"; - await _mailDeliveryService.SendEmailAsync(message); - } public async Task SendOTPEmailAsync(string email, string token) { diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs index 8bc7d498c8..a960071723 100644 --- a/src/Core/Services/NoopImplementations/NoopMailService.cs +++ b/src/Core/Services/NoopImplementations/NoopMailService.cs @@ -220,11 +220,6 @@ namespace Bit.Core.Services { return Task.FromResult(0); } - - public Task SendFamiliesForEnterpriseSponsorshipEndingEmailAsync(string email, DateTime sponsorshipEndDate) - { - return Task.FromResult(0); - } public Task SendOTPEmailAsync(string email, string token) {