From 696883c5e09bd962525f674c3edc837e8cb777eb Mon Sep 17 00:00:00 2001 From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:16:16 +0100 Subject: [PATCH] [AC-2101] Update welcome emails from trial initiation and org creation (#3836) * Add the email template * add changes fro the trial initiation email * adding featureFlags Signed-off-by: Cy Okeke * adding noopener Signed-off-by: Cy Okeke * Fix the failing test Signed-off-by: Cy Okeke --------- Signed-off-by: Cy Okeke --- .../Implementations/OrganizationService.cs | 9 +++ src/Core/Constants.cs | 1 + .../Handlebars/TrialInitiation.html.hbs | 75 +++++++++++++++++++ .../Handlebars/TrialInitiation.text.hbs | 39 ++++++++++ src/Core/Services/IMailService.cs | 1 + .../Implementations/HandlebarsMailService.cs | 13 ++++ .../NoopImplementations/NoopMailService.cs | 5 ++ .../Services/OrganizationServiceTests.cs | 49 ++++++++++++ 8 files changed, 192 insertions(+) create mode 100644 src/Core/MailTemplates/Handlebars/TrialInitiation.html.hbs create mode 100644 src/Core/MailTemplates/Handlebars/TrialInitiation.text.hbs diff --git a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs index cb68c21557..ba46cda8ce 100644 --- a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs +++ b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs @@ -537,6 +537,15 @@ public class OrganizationService : IOrganizationService Storage = returnValue.Item1.MaxStorageGb, // TODO: add reference events for SmSeats and Service Accounts - see AC-1481 }); + + var isAc2101UpdateTrialInitiationEmail = + _featureService.IsEnabled(FeatureFlagKeys.AC2101UpdateTrialInitiationEmail); + + if (signup.IsFromSecretsManagerTrial && isAc2101UpdateTrialInitiationEmail) + { + await _mailService.SendTrialInitiationEmailAsync(signup.BillingEmail); + } + return returnValue; } diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs index ab78000064..4d1154a0b1 100644 --- a/src/Core/Constants.cs +++ b/src/Core/Constants.cs @@ -132,6 +132,7 @@ public static class FeatureFlagKeys public const string AC1607_PresentUsersWithOffboardingSurvey = "AC-1607_present-user-offboarding-survey"; public const string PM5766AutomaticTax = "PM-5766-automatic-tax"; public const string PM5864DollarThreshold = "PM-5864-dollar-threshold"; + public const string AC2101UpdateTrialInitiationEmail = "AC-2101-update-trial-initiation-email"; public static List GetAllKeys() { diff --git a/src/Core/MailTemplates/Handlebars/TrialInitiation.html.hbs b/src/Core/MailTemplates/Handlebars/TrialInitiation.html.hbs new file mode 100644 index 0000000000..c711195242 --- /dev/null +++ b/src/Core/MailTemplates/Handlebars/TrialInitiation.html.hbs @@ -0,0 +1,75 @@ +{{#>FullHtmlLayout}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Welcome to Bitwarden! You can now get started with secure credential management and extend the benefits of end-to-end encryption across your entire organization. +
+
+
+ Your Master Password is the only way to unlock your account and only you hold the key. Memorize it, or write it down and keep it in a safe place. +
+
+ Install Bitwarden +
+ Access your Bitwarden account from anywhere and any device at {{{WebVaultUrlHostname}}}! For added convenience, download and install Bitwarden on any desktop, device, and browser. +
+
+
+ + Windows, Mac, Linux, Android, Apple, Chrome, Safari, Firefox, Edge, Opera, Brave, Vivaldi, Tor + +
+
+ Securely Share using Bitwarden Organizations +
+ Bitwarden makes it easy for teams and enterprises to securely share passwords, developer secrets, and passkeys via Organizations. Join an Organization if invited, or launch a new one anytime from the Web App with the + New Organization button. +
+
+
+ + Login to Bitwarden + +
+
+ Bitwarden is Here for You +
+ Check out the Help site for documentation, join the Bitwarden Community forums and connect with other enthusiasts on Reddit. If you have any questions or issues, contact support. +
+
+
+ Stay safe and secure,
+ The Bitwarden Team +
+{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/TrialInitiation.text.hbs b/src/Core/MailTemplates/Handlebars/TrialInitiation.text.hbs new file mode 100644 index 0000000000..4d7ea9d521 --- /dev/null +++ b/src/Core/MailTemplates/Handlebars/TrialInitiation.text.hbs @@ -0,0 +1,39 @@ +{{#>FullTextLayout}} + Welcome to Bitwarden! You can now get started with secure credential management and extend the benefits of end-to-end encryption across your entire organization. + + Your Master Password is the only way to unlock your account and only you hold the key. Memorize it, or write it down and keep it in a safe place. + + + Install Bitwarden + ============ + + Access your Bitwarden account from anywhere and any device at the web vault ({{WebVaultUrl}}/?utm_source=welcome_email&utm_medium=email). For added convenience, download and install Bitwarden on any desktop, device and browser (http://www.bitwarden.com/download). + + + Download Options + ============ + + http://www.bitwarden.com/download + + + Securely Share using Bitwarden Organizations + ============ + + Bitwarden makes it easy for teams and enterprises to securely share passwords, developer secrets, and passkeys via Organizations. Join an Organization if invited, or launch a new one anytime from the Web App ({{WebVaultUrl}}/?utm_source=welcome_email&utm_medium=email) with the + New Organization button. + + + Login to Bitwarden + ============ + + {{WebVaultUrl}}/?utm_source=welcome_email&utm_medium=email + + + Bitwarden is Here for You + ============ + + Check out our Help (http://www.bitwarden.com/help) site for documentation, join the Bitwarden Community forums (https://community.bitwarden.com/) and connect with other enthusiasts on Reddit (https://www.reddit.com/r/Bitwarden/). If you have any questions or issues, contact support (http://www.bitwarden.com/contact). + + + Stay safe and secure, + The Bitwarden Team +{{/FullTextLayout}} diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs index 93c6fd6e33..9300e1b131 100644 --- a/src/Core/Services/IMailService.cs +++ b/src/Core/Services/IMailService.cs @@ -77,5 +77,6 @@ public interface IMailService Task SendSecretsManagerMaxSeatLimitReachedEmailAsync(Organization organization, int maxSeatCount, IEnumerable ownerEmails); Task SendSecretsManagerMaxServiceAccountLimitReachedEmailAsync(Organization organization, int maxSeatCount, IEnumerable ownerEmails); Task SendTrustedDeviceAdminApprovalEmailAsync(string email, DateTime utcNow, string ip, string deviceTypeAndIdentifier); + Task SendTrialInitiationEmailAsync(string email); } diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs index fee5ec903a..aec4937f9e 100644 --- a/src/Core/Services/Implementations/HandlebarsMailService.cs +++ b/src/Core/Services/Implementations/HandlebarsMailService.cs @@ -251,6 +251,19 @@ public class HandlebarsMailService : IMailService await _mailDeliveryService.SendEmailAsync(message); } + public async Task SendTrialInitiationEmailAsync(string userEmail) + { + var message = CreateDefaultMessage("Welcome to Bitwarden!", userEmail); + var model = new BaseMailModel + { + WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash, + SiteName = _globalSettings.SiteName + }; + await AddMessageContentAsync(message, "TrialInitiation", model); + message.Category = "Welcome"; + await _mailDeliveryService.SendEmailAsync(message); + } + public async Task SendPasswordlessSignInAsync(string returnUrl, string token, string email) { var message = CreateDefaultMessage("[Admin] Continue Logging In", email); diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs index 81419b1864..b6dbdc6acb 100644 --- a/src/Core/Services/NoopImplementations/NoopMailService.cs +++ b/src/Core/Services/NoopImplementations/NoopMailService.cs @@ -262,5 +262,10 @@ public class NoopMailService : IMailService { return Task.FromResult(0); } + + public Task SendTrialInitiationEmailAsync(string email) + { + return Task.FromResult(0); + } } diff --git a/test/Core.Test/AdminConsole/Services/OrganizationServiceTests.cs b/test/Core.Test/AdminConsole/Services/OrganizationServiceTests.cs index a713935dd3..c3fe9e694e 100644 --- a/test/Core.Test/AdminConsole/Services/OrganizationServiceTests.cs +++ b/test/Core.Test/AdminConsole/Services/OrganizationServiceTests.cs @@ -2363,6 +2363,55 @@ OrganizationUserInvite invite, SutProvider sutProvider) Assert.Contains("custom users can only grant the same custom permissions that they have.", exception.Message.ToLowerInvariant()); } + [Theory] + [BitAutoData(PlanType.EnterpriseAnnually)] + [BitAutoData(PlanType.EnterpriseMonthly)] + [BitAutoData(PlanType.TeamsAnnually)] + [BitAutoData(PlanType.TeamsMonthly)] + public async Task SignUp_EmailSent_When_FromSecretsManagerTrial(PlanType planType, OrganizationSignup signup, SutProvider sutProvider) + { + signup.Plan = planType; + + var plan = StaticStore.GetPlan(signup.Plan); + + signup.UseSecretsManager = true; + signup.AdditionalSeats = 15; + signup.AdditionalSmSeats = 10; + signup.AdditionalServiceAccounts = 20; + signup.PaymentMethodType = PaymentMethodType.Card; + signup.PremiumAccessAddon = false; + signup.IsFromSecretsManagerTrial = true; + sutProvider.GetDependency().IsEnabled(FeatureFlagKeys.AC2101UpdateTrialInitiationEmail).Returns(true); + + await sutProvider.Sut.SignUpAsync(signup); + + await sutProvider.GetDependency().Received(1).SendTrialInitiationEmailAsync(signup.BillingEmail); + } + + [Theory] + [BitAutoData(PlanType.EnterpriseAnnually)] + [BitAutoData(PlanType.EnterpriseMonthly)] + [BitAutoData(PlanType.TeamsAnnually)] + [BitAutoData(PlanType.TeamsMonthly)] + public async Task SignUp_NoEmailSent_When_NotFromSecretsManagerTrial(PlanType planType, OrganizationSignup signup, SutProvider sutProvider) + { + signup.Plan = planType; + + var plan = StaticStore.GetPlan(signup.Plan); + + signup.UseSecretsManager = true; + signup.AdditionalSeats = 15; + signup.AdditionalSmSeats = 10; + signup.AdditionalServiceAccounts = 20; + signup.PaymentMethodType = PaymentMethodType.Card; + signup.PremiumAccessAddon = false; + signup.IsFromSecretsManagerTrial = false; + + await sutProvider.Sut.SignUpAsync(signup); + + await sutProvider.GetDependency().Received(0).SendTrialInitiationEmailAsync(signup.BillingEmail); + } + // Must set real guids in order for dictionary of guids to not throw aggregate exceptions private void SetupOrgUserRepositoryCreateManyAsyncMock(IOrganizationUserRepository organizationUserRepository) {