diff --git a/bitwarden_license/test/Commercial.Core.Test/SecretsManager/Queries/Projects/MaxProjectsQueryTests.cs b/bitwarden_license/test/Commercial.Core.Test/SecretsManager/Queries/Projects/MaxProjectsQueryTests.cs index 79ffb421e1..58c944e8eb 100644 --- a/bitwarden_license/test/Commercial.Core.Test/SecretsManager/Queries/Projects/MaxProjectsQueryTests.cs +++ b/bitwarden_license/test/Commercial.Core.Test/SecretsManager/Queries/Projects/MaxProjectsQueryTests.cs @@ -30,29 +30,36 @@ public class MaxProjectsQueryTests [Theory] [BitAutoData(PlanType.FamiliesAnnually2019)] - [BitAutoData(PlanType.TeamsMonthly2019)] - [BitAutoData(PlanType.TeamsAnnually2019)] - [BitAutoData(PlanType.EnterpriseMonthly2019)] - [BitAutoData(PlanType.EnterpriseAnnually2019)] [BitAutoData(PlanType.Custom)] [BitAutoData(PlanType.FamiliesAnnually)] public async Task GetByOrgIdAsync_SmPlanIsNull_ThrowsBadRequest(PlanType planType, SutProvider sutProvider, Organization organization) { organization.PlanType = planType; - sutProvider.GetDependency().GetByIdAsync(organization.Id).Returns(organization); + sutProvider.GetDependency() + .GetByIdAsync(organization.Id) + .Returns(organization); await Assert.ThrowsAsync( async () => await sutProvider.Sut.GetByOrgIdAsync(organization.Id, 1)); - await sutProvider.GetDependency().DidNotReceiveWithAnyArgs() + await sutProvider.GetDependency() + .DidNotReceiveWithAnyArgs() .GetProjectCountByOrganizationIdAsync(organization.Id); } [Theory] + [BitAutoData(PlanType.TeamsMonthly2019)] + [BitAutoData(PlanType.TeamsMonthly2020)] [BitAutoData(PlanType.TeamsMonthly)] + [BitAutoData(PlanType.TeamsAnnually2019)] + [BitAutoData(PlanType.TeamsAnnually2020)] [BitAutoData(PlanType.TeamsAnnually)] + [BitAutoData(PlanType.EnterpriseMonthly2019)] + [BitAutoData(PlanType.EnterpriseMonthly2020)] [BitAutoData(PlanType.EnterpriseMonthly)] + [BitAutoData(PlanType.EnterpriseAnnually2019)] + [BitAutoData(PlanType.EnterpriseAnnually2020)] [BitAutoData(PlanType.EnterpriseAnnually)] public async Task GetByOrgIdAsync_SmNoneFreePlans_ReturnsNull(PlanType planType, SutProvider sutProvider, Organization organization) diff --git a/src/Admin/Views/Shared/_OrganizationFormScripts.cshtml b/src/Admin/Views/Shared/_OrganizationFormScripts.cshtml index 69fd55dc21..5871977fea 100644 --- a/src/Admin/Views/Shared/_OrganizationFormScripts.cshtml +++ b/src/Admin/Views/Shared/_OrganizationFormScripts.cshtml @@ -68,6 +68,10 @@ function togglePlanFeatures(planType) { switch(planType) { + case '@((byte)PlanType.TeamsMonthly2019)': + case '@((byte)PlanType.TeamsAnnually2019)': + case '@((byte)PlanType.TeamsMonthly2020)': + case '@((byte)PlanType.TeamsAnnually2020)': case '@((byte)PlanType.TeamsMonthly)': case '@((byte)PlanType.TeamsAnnually)': document.getElementById('@(nameof(Model.UsePolicies))').checked = false; @@ -85,6 +89,10 @@ document.getElementById('@(nameof(Model.UseScim))').checked = false; break; + case '@((byte)PlanType.EnterpriseMonthly2019)': + case '@((byte)PlanType.EnterpriseAnnually2019)': + case '@((byte)PlanType.EnterpriseMonthly2020)': + case '@((byte)PlanType.EnterpriseAnnually2020)': case '@((byte)PlanType.EnterpriseMonthly)': case '@((byte)PlanType.EnterpriseAnnually)': document.getElementById('@(nameof(Model.UsePolicies))').checked = true; diff --git a/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs b/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs index 1407f8e215..e0d1433c15 100644 --- a/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs @@ -32,8 +32,7 @@ public class ProfileOrganizationResponseModel : ResponseModel UsePasswordManager = organization.UsePasswordManager; UsersGetPremium = organization.UsersGetPremium; UseCustomPermissions = organization.UseCustomPermissions; - UseActivateAutofillPolicy = organization.PlanType == PlanType.EnterpriseAnnually || - organization.PlanType == PlanType.EnterpriseMonthly; + UseActivateAutofillPolicy = StaticStore.GetPlan(organization.PlanType).Product == ProductType.Enterprise; SelfHost = organization.SelfHost; Seats = organization.Seats; MaxCollections = organization.MaxCollections; diff --git a/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs b/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs index 7ff9805b58..d6b7656e4b 100644 --- a/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs @@ -25,8 +25,7 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo UseResetPassword = organization.UseResetPassword; UsersGetPremium = organization.UsersGetPremium; UseCustomPermissions = organization.UseCustomPermissions; - UseActivateAutofillPolicy = organization.PlanType == PlanType.EnterpriseAnnually || - organization.PlanType == PlanType.EnterpriseMonthly; + UseActivateAutofillPolicy = StaticStore.GetPlan(organization.PlanType).Product == ProductType.Enterprise; SelfHost = organization.SelfHost; Seats = organization.Seats; MaxCollections = organization.MaxCollections; diff --git a/src/Api/Controllers/PlansController.cs b/src/Api/Controllers/PlansController.cs index d738e60cfb..14992bd97b 100644 --- a/src/Api/Controllers/PlansController.cs +++ b/src/Api/Controllers/PlansController.cs @@ -1,5 +1,9 @@ using Bit.Api.Models.Response; +using Bit.Core; +using Bit.Core.Context; +using Bit.Core.Enums; using Bit.Core.Repositories; +using Bit.Core.Services; using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -11,17 +15,39 @@ namespace Bit.Api.Controllers; public class PlansController : Controller { private readonly ITaxRateRepository _taxRateRepository; - public PlansController(ITaxRateRepository taxRateRepository) + private readonly IFeatureService _featureService; + private readonly ICurrentContext _currentContext; + + public PlansController( + ITaxRateRepository taxRateRepository, + IFeatureService featureService, + ICurrentContext currentContext) { _taxRateRepository = taxRateRepository; + _featureService = featureService; + _currentContext = currentContext; } [HttpGet("")] [AllowAnonymous] public ListResponseModel Get() { + var plansUpgradeIsEnabled = _featureService.IsEnabled(FeatureFlagKeys.BillingPlansUpgrade, _currentContext); var data = StaticStore.Plans; - var responses = data.Select(plan => new PlanResponseModel(plan)); + var responses = data + .Where(plan => plansUpgradeIsEnabled || plan.Type <= PlanType.EnterpriseAnnually2020) + .Select(plan => + { + if (!plansUpgradeIsEnabled && plan.Type is <= PlanType.EnterpriseAnnually2020 and >= PlanType.TeamsMonthly2020) + { + plan.LegacyYear = null; + } + else if (plansUpgradeIsEnabled && plan.Type is <= PlanType.EnterpriseAnnually2020 and >= PlanType.TeamsMonthly2020) + { + plan.LegacyYear = 2023; + } + return new PlanResponseModel(plan); + }); return new ListResponseModel(responses); } diff --git a/src/Billing/Controllers/FreshsalesController.cs b/src/Billing/Controllers/FreshsalesController.cs index 95b9e25065..a66edd6ca6 100644 --- a/src/Billing/Controllers/FreshsalesController.cs +++ b/src/Billing/Controllers/FreshsalesController.cs @@ -159,14 +159,18 @@ public class FreshsalesController : Controller planName = "Families"; return true; case PlanType.TeamsAnnually: + case PlanType.TeamsAnnually2020: case PlanType.TeamsAnnually2019: case PlanType.TeamsMonthly: + case PlanType.TeamsMonthly2020: case PlanType.TeamsMonthly2019: planName = "Teams"; return true; case PlanType.EnterpriseAnnually: + case PlanType.EnterpriseAnnually2020: case PlanType.EnterpriseAnnually2019: case PlanType.EnterpriseMonthly: + case PlanType.EnterpriseMonthly2020: case PlanType.EnterpriseMonthly2019: planName = "Enterprise"; return true; diff --git a/src/Billing/Controllers/StripeController.cs b/src/Billing/Controllers/StripeController.cs index e71e025dff..64053b31f2 100644 --- a/src/Billing/Controllers/StripeController.cs +++ b/src/Billing/Controllers/StripeController.cs @@ -668,18 +668,7 @@ public class StripeController : Controller return new Tuple(orgId, userId); } - private bool OrgPlanForInvoiceNotifications(Organization org) - { - switch (org.PlanType) - { - case PlanType.FamiliesAnnually: - case PlanType.TeamsAnnually: - case PlanType.EnterpriseAnnually: - return true; - default: - return false; - } - } + private static bool OrgPlanForInvoiceNotifications(Organization org) => StaticStore.GetPlan(org.PlanType).IsAnnual; private async Task AttemptToPayInvoiceAsync(Invoice invoice, bool attemptToPayWithStripe = false) { diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs index 8ce379646c..908d0a7861 100644 --- a/src/Core/Constants.cs +++ b/src/Core/Constants.cs @@ -49,6 +49,7 @@ public static class FeatureFlagKeys public const string BulkCollectionAccess = "bulk-collection-access"; public const string AutofillOverlay = "autofill-overlay"; public const string ItemShare = "item-share"; + public const string BillingPlansUpgrade = "billing-plans-upgrade"; public static List GetAllKeys() { diff --git a/src/Core/Enums/PlanType.cs b/src/Core/Enums/PlanType.cs index ac32f217e4..cb88e83601 100644 --- a/src/Core/Enums/PlanType.cs +++ b/src/Core/Enums/PlanType.cs @@ -20,12 +20,20 @@ public enum PlanType : byte Custom = 6, [Display(Name = "Families")] FamiliesAnnually = 7, + [Display(Name = "Teams (Monthly) 2020")] + TeamsMonthly2020 = 8, + [Display(Name = "Teams (Annually) 2020")] + TeamsAnnually2020 = 9, + [Display(Name = "Enterprise (Monthly) 2020")] + EnterpriseMonthly2020 = 10, + [Display(Name = "Enterprise (Annually) 2020")] + EnterpriseAnnually2020 = 11, [Display(Name = "Teams (Monthly)")] - TeamsMonthly = 8, + TeamsMonthly = 12, [Display(Name = "Teams (Annually)")] - TeamsAnnually = 9, + TeamsAnnually = 13, [Display(Name = "Enterprise (Monthly)")] - EnterpriseMonthly = 10, + EnterpriseMonthly = 14, [Display(Name = "Enterprise (Annually)")] - EnterpriseAnnually = 11, + EnterpriseAnnually = 15, } diff --git a/src/Core/Models/StaticStore/Plan.cs b/src/Core/Models/StaticStore/Plan.cs index 4f8b0435ff..c381215f38 100644 --- a/src/Core/Models/StaticStore/Plan.cs +++ b/src/Core/Models/StaticStore/Plan.cs @@ -28,7 +28,7 @@ public abstract record Plan public bool HasCustomPermissions { get; protected init; } public int UpgradeSortOrder { get; protected init; } public int DisplaySortOrder { get; protected init; } - public int? LegacyYear { get; protected init; } + public int? LegacyYear { get; set; } public bool Disabled { get; protected init; } public PasswordManagerPlanFeatures PasswordManager { get; protected init; } public SecretsManagerPlanFeatures SecretsManager { get; protected init; } diff --git a/src/Core/Models/StaticStore/Plans/Enterprise2019Plan.cs b/src/Core/Models/StaticStore/Plans/Enterprise2019Plan.cs index 8cbb579ea2..7684b0897c 100644 --- a/src/Core/Models/StaticStore/Plans/Enterprise2019Plan.cs +++ b/src/Core/Models/StaticStore/Plans/Enterprise2019Plan.cs @@ -24,6 +24,10 @@ public record Enterprise2019Plan : Models.StaticStore.Plan HasTotp = true; Has2fa = true; HasApi = true; + HasSso = true; + HasKeyConnector = true; + HasScim = true; + HasResetPassword = true; UsersGetPremium = true; HasCustomPermissions = true; @@ -31,9 +35,41 @@ public record Enterprise2019Plan : Models.StaticStore.Plan DisplaySortOrder = 3; LegacyYear = 2020; + SecretsManager = new Enterprise2019SecretsManagerFeatures(isAnnual); PasswordManager = new Enterprise2019PasswordManagerFeatures(isAnnual); } + private record Enterprise2019SecretsManagerFeatures : SecretsManagerPlanFeatures + { + public Enterprise2019SecretsManagerFeatures(bool isAnnual) + { + BaseSeats = 0; + BasePrice = 0; + BaseServiceAccount = 200; + + HasAdditionalSeatsOption = true; + HasAdditionalServiceAccountOption = true; + + AllowSeatAutoscale = true; + AllowServiceAccountsAutoscale = true; + + if (isAnnual) + { + StripeSeatPlanId = "secrets-manager-enterprise-seat-annually"; + StripeServiceAccountPlanId = "secrets-manager-service-account-annually"; + SeatPrice = 144; + AdditionalPricePerServiceAccount = 6; + } + else + { + StripeSeatPlanId = "secrets-manager-enterprise-seat-monthly"; + StripeServiceAccountPlanId = "secrets-manager-service-account-monthly"; + SeatPrice = 13; + AdditionalPricePerServiceAccount = 0.5M; + } + } + } + private record Enterprise2019PasswordManagerFeatures : PasswordManagerPlanFeatures { public Enterprise2019PasswordManagerFeatures(bool isAnnual) diff --git a/src/Core/Models/StaticStore/Plans/Enterprise2020Plan.cs b/src/Core/Models/StaticStore/Plans/Enterprise2020Plan.cs new file mode 100644 index 0000000000..4fa7eee972 --- /dev/null +++ b/src/Core/Models/StaticStore/Plans/Enterprise2020Plan.cs @@ -0,0 +1,101 @@ +using Bit.Core.Enums; + +namespace Bit.Core.Models.StaticStore.Plans; + +public record Enterprise2020Plan : Models.StaticStore.Plan +{ + public Enterprise2020Plan(bool isAnnual) + { + Type = isAnnual ? PlanType.EnterpriseAnnually2020 : PlanType.EnterpriseMonthly2020; + Product = ProductType.Enterprise; + Name = isAnnual ? "Enterprise (Annually) 2020" : "Enterprise (Monthly) 2020"; + IsAnnual = isAnnual; + NameLocalizationKey = "planNameEnterprise"; + DescriptionLocalizationKey = "planDescEnterprise"; + CanBeUsedByBusiness = true; + + TrialPeriodDays = 7; + + HasPolicies = true; + HasSelfHost = true; + HasGroups = true; + HasDirectory = true; + HasEvents = true; + HasTotp = true; + Has2fa = true; + HasApi = true; + HasSso = true; + HasKeyConnector = true; + HasScim = true; + HasResetPassword = true; + UsersGetPremium = true; + HasCustomPermissions = true; + + UpgradeSortOrder = 3; + DisplaySortOrder = 3; + LegacyYear = 2023; + + PasswordManager = new Enterprise2020PasswordManagerFeatures(isAnnual); + SecretsManager = new Enterprise2020SecretsManagerFeatures(isAnnual); + } + + private record Enterprise2020SecretsManagerFeatures : SecretsManagerPlanFeatures + { + public Enterprise2020SecretsManagerFeatures(bool isAnnual) + { + BaseSeats = 0; + BasePrice = 0; + BaseServiceAccount = 200; + + HasAdditionalSeatsOption = true; + HasAdditionalServiceAccountOption = true; + + AllowSeatAutoscale = true; + AllowServiceAccountsAutoscale = true; + + if (isAnnual) + { + StripeSeatPlanId = "secrets-manager-enterprise-seat-annually"; + StripeServiceAccountPlanId = "secrets-manager-service-account-annually"; + SeatPrice = 144; + AdditionalPricePerServiceAccount = 6; + } + else + { + StripeSeatPlanId = "secrets-manager-enterprise-seat-monthly"; + StripeServiceAccountPlanId = "secrets-manager-service-account-monthly"; + SeatPrice = 13; + AdditionalPricePerServiceAccount = 0.5M; + } + } + } + + private record Enterprise2020PasswordManagerFeatures : PasswordManagerPlanFeatures + { + public Enterprise2020PasswordManagerFeatures(bool isAnnual) + { + BaseSeats = 0; + BaseStorageGb = 1; + + HasAdditionalStorageOption = true; + HasAdditionalSeatsOption = true; + + AllowSeatAutoscale = true; + + if (isAnnual) + { + AdditionalStoragePricePerGb = 4; + StripeStoragePlanId = "storage-gb-annually"; + StripeSeatPlanId = "2020-enterprise-org-seat-annually"; + SeatPrice = 60; + } + else + { + StripeSeatPlanId = "2020-enterprise-seat-monthly"; + StripeStoragePlanId = "storage-gb-monthly"; + SeatPrice = 6; + AdditionalStoragePricePerGb = 0.5M; + } + } + } +} diff --git a/src/Core/Models/StaticStore/Plans/EnterprisePlan.cs b/src/Core/Models/StaticStore/Plans/EnterprisePlan.cs index fbb3198839..61eabc6436 100644 --- a/src/Core/Models/StaticStore/Plans/EnterprisePlan.cs +++ b/src/Core/Models/StaticStore/Plans/EnterprisePlan.cs @@ -85,14 +85,14 @@ public record EnterprisePlan : Models.StaticStore.Plan { AdditionalStoragePricePerGb = 4; StripeStoragePlanId = "storage-gb-annually"; - StripeSeatPlanId = "2020-enterprise-org-seat-annually"; - SeatPrice = 60; + StripeSeatPlanId = "2023-enterprise-org-seat-annually"; + SeatPrice = 72; } else { - StripeSeatPlanId = "2020-enterprise-seat-monthly"; + StripeSeatPlanId = "2023-enterprise-seat-monthly"; StripeStoragePlanId = "storage-gb-monthly"; - SeatPrice = 6; + SeatPrice = 7; AdditionalStoragePricePerGb = 0.5M; } } diff --git a/src/Core/Models/StaticStore/Plans/Families2019Plan.cs b/src/Core/Models/StaticStore/Plans/Families2019Plan.cs index 14ddb3405b..4bc9abc1f3 100644 --- a/src/Core/Models/StaticStore/Plans/Families2019Plan.cs +++ b/src/Core/Models/StaticStore/Plans/Families2019Plan.cs @@ -17,6 +17,7 @@ public record Families2019Plan : Models.StaticStore.Plan HasSelfHost = true; HasTotp = true; + UsersGetPremium = true; UpgradeSortOrder = 1; DisplaySortOrder = 1; diff --git a/src/Core/Models/StaticStore/Plans/Teams2019Plan.cs b/src/Core/Models/StaticStore/Plans/Teams2019Plan.cs index f806f37735..d81a015de8 100644 --- a/src/Core/Models/StaticStore/Plans/Teams2019Plan.cs +++ b/src/Core/Models/StaticStore/Plans/Teams2019Plan.cs @@ -16,15 +16,53 @@ public record Teams2019Plan : Models.StaticStore.Plan TrialPeriodDays = 7; + HasGroups = true; + HasDirectory = true; + HasEvents = true; HasTotp = true; + Has2fa = true; + HasApi = true; + UsersGetPremium = true; UpgradeSortOrder = 2; DisplaySortOrder = 2; LegacyYear = 2020; + SecretsManager = new Teams2019SecretsManagerFeatures(isAnnual); PasswordManager = new Teams2019PasswordManagerFeatures(isAnnual); } + private record Teams2019SecretsManagerFeatures : SecretsManagerPlanFeatures + { + public Teams2019SecretsManagerFeatures(bool isAnnual) + { + BaseSeats = 0; + BasePrice = 0; + BaseServiceAccount = 50; + + HasAdditionalSeatsOption = true; + HasAdditionalServiceAccountOption = true; + + AllowSeatAutoscale = true; + AllowServiceAccountsAutoscale = true; + + if (isAnnual) + { + StripeSeatPlanId = "secrets-manager-teams-seat-annually"; + StripeServiceAccountPlanId = "secrets-manager-service-account-annually"; + SeatPrice = 72; + AdditionalPricePerServiceAccount = 6; + } + else + { + StripeSeatPlanId = "secrets-manager-teams-seat-monthly"; + StripeServiceAccountPlanId = "secrets-manager-service-account-monthly"; + SeatPrice = 7; + AdditionalPricePerServiceAccount = 0.5M; + } + } + } + private record Teams2019PasswordManagerFeatures : PasswordManagerPlanFeatures { public Teams2019PasswordManagerFeatures(bool isAnnual) diff --git a/src/Core/Models/StaticStore/Plans/Teams2020Plan.cs b/src/Core/Models/StaticStore/Plans/Teams2020Plan.cs new file mode 100644 index 0000000000..680a5deece --- /dev/null +++ b/src/Core/Models/StaticStore/Plans/Teams2020Plan.cs @@ -0,0 +1,95 @@ +using Bit.Core.Enums; + +namespace Bit.Core.Models.StaticStore.Plans; + +public record Teams2020Plan : Models.StaticStore.Plan +{ + public Teams2020Plan(bool isAnnual) + { + Type = isAnnual ? PlanType.TeamsAnnually2020 : PlanType.TeamsMonthly2020; + Product = ProductType.Teams; + Name = isAnnual ? "Teams (Annually) 2020" : "Teams (Monthly) 2020"; + IsAnnual = isAnnual; + NameLocalizationKey = "planNameTeams"; + DescriptionLocalizationKey = "planDescTeams"; + CanBeUsedByBusiness = true; + + TrialPeriodDays = 7; + + HasGroups = true; + HasDirectory = true; + HasEvents = true; + HasTotp = true; + Has2fa = true; + HasApi = true; + UsersGetPremium = true; + + UpgradeSortOrder = 2; + DisplaySortOrder = 2; + LegacyYear = 2023; + + PasswordManager = new Teams2020PasswordManagerFeatures(isAnnual); + SecretsManager = new Teams2020SecretsManagerFeatures(isAnnual); + } + + private record Teams2020SecretsManagerFeatures : SecretsManagerPlanFeatures + { + public Teams2020SecretsManagerFeatures(bool isAnnual) + { + BaseSeats = 0; + BasePrice = 0; + BaseServiceAccount = 50; + + HasAdditionalSeatsOption = true; + HasAdditionalServiceAccountOption = true; + + AllowSeatAutoscale = true; + AllowServiceAccountsAutoscale = true; + + if (isAnnual) + { + StripeSeatPlanId = "secrets-manager-teams-seat-annually"; + StripeServiceAccountPlanId = "secrets-manager-service-account-annually"; + SeatPrice = 72; + AdditionalPricePerServiceAccount = 6; + } + else + { + StripeSeatPlanId = "secrets-manager-teams-seat-monthly"; + StripeServiceAccountPlanId = "secrets-manager-service-account-monthly"; + SeatPrice = 7; + AdditionalPricePerServiceAccount = 0.5M; + } + } + } + + private record Teams2020PasswordManagerFeatures : PasswordManagerPlanFeatures + { + public Teams2020PasswordManagerFeatures(bool isAnnual) + { + BaseSeats = 0; + BaseStorageGb = 1; + BasePrice = 0; + + HasAdditionalStorageOption = true; + HasAdditionalSeatsOption = true; + + AllowSeatAutoscale = true; + + if (isAnnual) + { + StripeStoragePlanId = "storage-gb-annually"; + StripeSeatPlanId = "2020-teams-org-seat-annually"; + SeatPrice = 36; + AdditionalStoragePricePerGb = 4; + } + else + { + StripeSeatPlanId = "2020-teams-org-seat-monthly"; + StripeStoragePlanId = "storage-gb-monthly"; + SeatPrice = 4; + AdditionalStoragePricePerGb = 0.5M; + } + } + } +} diff --git a/src/Core/Models/StaticStore/Plans/TeamsPlan.cs b/src/Core/Models/StaticStore/Plans/TeamsPlan.cs index 0e325242e3..77482d10fb 100644 --- a/src/Core/Models/StaticStore/Plans/TeamsPlan.cs +++ b/src/Core/Models/StaticStore/Plans/TeamsPlan.cs @@ -78,15 +78,15 @@ public record TeamsPlan : Models.StaticStore.Plan if (isAnnual) { StripeStoragePlanId = "storage-gb-annually"; - StripeSeatPlanId = "2020-teams-org-seat-annually"; - SeatPrice = 36; + StripeSeatPlanId = "2023-teams-org-seat-annually"; + SeatPrice = 48; AdditionalStoragePricePerGb = 4; } else { - StripeSeatPlanId = "2020-teams-org-seat-monthly"; + StripeSeatPlanId = "2023-teams-org-seat-monthly"; StripeStoragePlanId = "storage-gb-monthly"; - SeatPrice = 4; + SeatPrice = 5; AdditionalStoragePricePerGb = 0.5M; } } diff --git a/src/Core/Services/Implementations/PolicyService.cs b/src/Core/Services/Implementations/PolicyService.cs index 5f4e680df7..2c9b6c73e1 100644 --- a/src/Core/Services/Implementations/PolicyService.cs +++ b/src/Core/Services/Implementations/PolicyService.cs @@ -98,14 +98,6 @@ public class PolicyService : IPolicyService await DependsOnSingleOrgAsync(org); } break; - - // Activate Autofill is only available to Enterprise 2020-current plans - case PolicyType.ActivateAutofill: - if (policy.Enabled) - { - LockedTo2020Plan(org); - } - break; } var now = DateTime.UtcNow; @@ -274,14 +266,6 @@ public class PolicyService : IPolicyService } } - private void LockedTo2020Plan(Organization org) - { - if (org.PlanType != PlanType.EnterpriseAnnually && org.PlanType != PlanType.EnterpriseMonthly) - { - throw new BadRequestException("This policy is only available to 2020 Enterprise plans."); - } - } - private async Task RequiredBySsoTrustedDeviceEncryptionAsync(Organization org) { var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(org.Id); diff --git a/src/Core/Utilities/StaticStore.cs b/src/Core/Utilities/StaticStore.cs index 6726d9cd31..11052a4468 100644 --- a/src/Core/Utilities/StaticStore.cs +++ b/src/Core/Utilities/StaticStore.cs @@ -6,7 +6,7 @@ using Bit.Core.Models.StaticStore.Plans; namespace Bit.Core.Utilities; -public class StaticStore +public static class StaticStore { static StaticStore() { @@ -112,6 +112,11 @@ public class StaticStore new EnterprisePlan(false), new TeamsPlan(true), new TeamsPlan(false), + + new Enterprise2020Plan(true), + new Enterprise2020Plan(false), + new Teams2020Plan(true), + new Teams2020Plan(false), new FamiliesPlan(), new FreePlan(), new CustomPlan(), @@ -139,8 +144,7 @@ public class StaticStore } }; - public static Models.StaticStore.Plan GetPlan(PlanType planType) => - Plans.SingleOrDefault(p => p.Type == planType); + public static Plan GetPlan(PlanType planType) => Plans.SingleOrDefault(p => p.Type == planType); public static SponsoredPlan GetSponsoredPlan(PlanSponsorshipType planSponsorshipType) => diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs index 62f4df63e3..b20026a6b7 100644 --- a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs +++ b/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs @@ -95,41 +95,44 @@ public class OrganizationRepository : Repository> SearchUnassignedToProviderAsync(string name, string ownerEmail, int skip, int take) { - using (var scope = ServiceScopeFactory.CreateScope()) + using var scope = ServiceScopeFactory.CreateScope(); + var dbContext = GetDatabaseContext(scope); + var query = from o in dbContext.Organizations + where o.PlanType >= PlanType.TeamsMonthly2020 && o.PlanType <= PlanType.EnterpriseAnnually && + !dbContext.ProviderOrganizations.Any(po => po.OrganizationId == o.Id) && + (string.IsNullOrWhiteSpace(name) || EF.Functions.Like(o.Name, $"%{name}%")) + select o; + + if (string.IsNullOrWhiteSpace(ownerEmail)) { - var dbContext = GetDatabaseContext(scope); - var query = from o in dbContext.Organizations - where o.PlanType >= PlanType.TeamsMonthly && o.PlanType <= PlanType.EnterpriseAnnually && - !dbContext.ProviderOrganizations.Any(po => po.OrganizationId == o.Id) && - (string.IsNullOrWhiteSpace(name) || EF.Functions.Like(o.Name, $"%{name}%")) - select o; - - if (!string.IsNullOrWhiteSpace(ownerEmail)) - { - if (dbContext.Database.IsNpgsql()) - { - query = from o in query - join ou in dbContext.OrganizationUsers - on o.Id equals ou.OrganizationId - join u in dbContext.Users - on ou.UserId equals u.Id - where ou.Type == OrganizationUserType.Owner && EF.Functions.ILike(EF.Functions.Collate(u.Email, "default"), $"{ownerEmail}%") - select o; - } - else - { - query = from o in query - join ou in dbContext.OrganizationUsers - on o.Id equals ou.OrganizationId - join u in dbContext.Users - on ou.UserId equals u.Id - where ou.Type == OrganizationUserType.Owner && EF.Functions.Like(u.Email, $"{ownerEmail}%") - select o; - } - } - - return await query.OrderByDescending(o => o.CreationDate).Skip(skip).Take(take).ToArrayAsync(); + return await query.OrderByDescending(o => o.CreationDate) + .Skip(skip) + .Take(take) + .ToArrayAsync(); } + + if (dbContext.Database.IsNpgsql()) + { + query = from o in query + join ou in dbContext.OrganizationUsers + on o.Id equals ou.OrganizationId + join u in dbContext.Users + on ou.UserId equals u.Id + where ou.Type == OrganizationUserType.Owner && EF.Functions.ILike(EF.Functions.Collate(u.Email, "default"), $"{ownerEmail}%") + select o; + } + else + { + query = from o in query + join ou in dbContext.OrganizationUsers + on o.Id equals ou.OrganizationId + join u in dbContext.Users + on ou.UserId equals u.Id + where ou.Type == OrganizationUserType.Owner && EF.Functions.Like(u.Email, $"{ownerEmail}%") + select o; + } + + return await query.OrderByDescending(o => o.CreationDate).Skip(skip).Take(take).ToArrayAsync(); } public async Task UpdateStorageAsync(Guid id) diff --git a/test/Core.Test/AutoFixture/OrganizationFixtures.cs b/test/Core.Test/AutoFixture/OrganizationFixtures.cs index 658964b73d..297dbe8933 100644 --- a/test/Core.Test/AutoFixture/OrganizationFixtures.cs +++ b/test/Core.Test/AutoFixture/OrganizationFixtures.cs @@ -133,8 +133,8 @@ public class SecretsManagerOrganizationCustomization : ICustomization { public void Customize(IFixture fixture) { + const PlanType planType = PlanType.EnterpriseAnnually; var organizationId = Guid.NewGuid(); - var planType = PlanType.EnterpriseAnnually; fixture.Customize(composer => composer .With(o => o.Id, organizationId) @@ -143,8 +143,7 @@ public class SecretsManagerOrganizationCustomization : ICustomization .With(o => o.PlanType, planType) .With(o => o.Plan, StaticStore.GetPlan(planType).Name) .With(o => o.MaxAutoscaleSmSeats, (int?)null) - .With(o => o.MaxAutoscaleSmServiceAccounts, (int?)null) - ); + .With(o => o.MaxAutoscaleSmServiceAccounts, (int?)null)); } } diff --git a/test/Core.Test/Models/Business/SecretsManagerSubscriptionUpdateTests.cs b/test/Core.Test/Models/Business/SecretsManagerSubscriptionUpdateTests.cs index 0adef6b473..88e21862b5 100644 --- a/test/Core.Test/Models/Business/SecretsManagerSubscriptionUpdateTests.cs +++ b/test/Core.Test/Models/Business/SecretsManagerSubscriptionUpdateTests.cs @@ -15,17 +15,45 @@ public class SecretsManagerSubscriptionUpdateTests [BitAutoData(PlanType.Custom)] [BitAutoData(PlanType.FamiliesAnnually)] [BitAutoData(PlanType.FamiliesAnnually2019)] - [BitAutoData(PlanType.EnterpriseMonthly2019)] - [BitAutoData(PlanType.EnterpriseAnnually2019)] - [BitAutoData(PlanType.TeamsMonthly2019)] - [BitAutoData(PlanType.TeamsAnnually2019)] - public async Task UpdateSubscriptionAsync_WithNonSecretsManagerPlanType_ThrowsBadRequestException( + public Task UpdateSubscriptionAsync_WithNonSecretsManagerPlanType_ThrowsBadRequestException( PlanType planType, Organization organization) { + // Arrange organization.PlanType = planType; + // Act var exception = Assert.Throws(() => new SecretsManagerSubscriptionUpdate(organization, false)); + + // Assert Assert.Contains("Invalid Secrets Manager plan", exception.Message, StringComparison.InvariantCultureIgnoreCase); + return Task.CompletedTask; + } + + [Theory] + [BitAutoData(PlanType.EnterpriseMonthly2019)] + [BitAutoData(PlanType.EnterpriseMonthly2020)] + [BitAutoData(PlanType.EnterpriseMonthly)] + [BitAutoData(PlanType.EnterpriseAnnually2019)] + [BitAutoData(PlanType.EnterpriseAnnually2020)] + [BitAutoData(PlanType.EnterpriseAnnually)] + [BitAutoData(PlanType.TeamsMonthly2019)] + [BitAutoData(PlanType.TeamsMonthly2020)] + [BitAutoData(PlanType.TeamsMonthly)] + [BitAutoData(PlanType.TeamsAnnually2019)] + [BitAutoData(PlanType.TeamsAnnually2020)] + [BitAutoData(PlanType.TeamsAnnually)] + public void UpdateSubscription_WithNonSecretsManagerPlanType_DoesNotThrowException( + PlanType planType, + Organization organization) + { + // Arrange + organization.PlanType = planType; + + // Act + var ex = Record.Exception(() => new SecretsManagerSubscriptionUpdate(organization, false)); + + // Assert + Assert.Null(ex); } } diff --git a/test/Core.Test/Utilities/StaticStoreTests.cs b/test/Core.Test/Utilities/StaticStoreTests.cs index 4e85928cc7..9abd31c8f8 100644 --- a/test/Core.Test/Utilities/StaticStoreTests.cs +++ b/test/Core.Test/Utilities/StaticStoreTests.cs @@ -10,10 +10,10 @@ public class StaticStoreTests [Fact] public void StaticStore_Initialization_Success() { - var plans = StaticStore.Plans; + var plans = StaticStore.Plans.ToList(); Assert.NotNull(plans); Assert.NotEmpty(plans); - Assert.Equal(12, plans.Count()); + Assert.Equal(16, plans.Count); } [Theory] diff --git a/util/Migrator/DbScripts/2023-10-13_00_2019TeamsPlanFeatureUpgrade.sql b/util/Migrator/DbScripts/2023-10-13_00_2019TeamsPlanFeatureUpgrade.sql new file mode 100644 index 0000000000..683e7be531 --- /dev/null +++ b/util/Migrator/DbScripts/2023-10-13_00_2019TeamsPlanFeatureUpgrade.sql @@ -0,0 +1,21 @@ +BEGIN TRY + BEGIN TRANSACTION; + + UPDATE + [dbo].[Organization] + SET + [Use2fa] = 1, + [UseApi] = 1, + [UseDirectory] = 1, + [UseEvents] = 1, + [UseGroups] = 1, + [UsersGetPremium] = 1 + WHERE + [PlanType] IN (2, 3); -- Teams 2019 + + COMMIT TRANSACTION; +END TRY +BEGIN CATCH + ROLLBACK TRANSACTION; + THROW; +END CATCH diff --git a/util/Migrator/DbScripts/2023-10-13_01_2019EnterprisePlanFeatureUpgrade.sql b/util/Migrator/DbScripts/2023-10-13_01_2019EnterprisePlanFeatureUpgrade.sql new file mode 100644 index 0000000000..94e58e89fa --- /dev/null +++ b/util/Migrator/DbScripts/2023-10-13_01_2019EnterprisePlanFeatureUpgrade.sql @@ -0,0 +1,19 @@ +BEGIN TRY + BEGIN TRANSACTION; + + UPDATE + [dbo].[Organization] + SET + [UseSso] = 1, + [UseKeyConnector] = 1, + [UseScim] = 1, + [UseResetPassword] = 1 + WHERE + [PlanType] IN (4, 5) -- Enterprise 2019 + + COMMIT TRANSACTION; +END TRY +BEGIN CATCH + ROLLBACK TRANSACTION; + THROW; +END CATCH diff --git a/util/Migrator/DbScripts/2023-10-13_02_2019FamilyPlanFeatureUpgrade.sql b/util/Migrator/DbScripts/2023-10-13_02_2019FamilyPlanFeatureUpgrade.sql new file mode 100644 index 0000000000..357486acff --- /dev/null +++ b/util/Migrator/DbScripts/2023-10-13_02_2019FamilyPlanFeatureUpgrade.sql @@ -0,0 +1,16 @@ +BEGIN TRY + BEGIN TRANSACTION; + + UPDATE + [dbo].[Organization] + SET + [UsersGetPremium] = 1 + WHERE + [PlanType] = 1 -- Families 2019 Annual + + COMMIT TRANSACTION; +END TRY +BEGIN CATCH + ROLLBACK TRANSACTION; + THROW; +END CATCH