Browse Source

Update UseMyItems to use dedicated plan feature (#7101)

pull/7190/head
Thomas Rittson 1 month ago committed by GitHub
parent
commit
b35976bc0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs
  2. 2
      bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderBillingService.cs
  3. 1
      src/Admin/AdminConsole/Models/OrganizationEditModel.cs
  4. 2
      src/Admin/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml
  5. 2
      src/Core/AdminConsole/OrganizationFeatures/Organizations/CloudOrganizationSignUpCommand.cs
  6. 2
      src/Core/AdminConsole/OrganizationFeatures/Organizations/ProviderClientOrganizationSignUpCommand.cs
  7. 2
      src/Core/Billing/Premium/Commands/UpgradePremiumToOrganizationCommand.cs
  8. 2
      src/Core/Billing/Subscriptions/Commands/RestartSubscriptionCommand.cs
  9. 2
      src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs

2
bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs

@ -65,7 +65,7 @@ public class BusinessUnitConverter( @@ -65,7 +65,7 @@ public class BusinessUnitConverter(
organization.MaxCollections = updatedPlan.PasswordManager.MaxCollections;
organization.MaxStorageGb = updatedPlan.PasswordManager.BaseStorageGb;
organization.UsePolicies = updatedPlan.HasPolicies;
organization.UseMyItems = updatedPlan.HasPolicies; // TODO: use the plan property when added (PM-32366)
organization.UseMyItems = updatedPlan.HasMyItems;
organization.UseSso = updatedPlan.HasSso;
organization.UseOrganizationDomains = updatedPlan.HasOrganizationDomains;
organization.UseGroups = updatedPlan.HasGroups;

2
bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderBillingService.cs

@ -91,7 +91,7 @@ public class ProviderBillingService( @@ -91,7 +91,7 @@ public class ProviderBillingService(
organization.MaxCollections = plan.PasswordManager.MaxCollections;
organization.MaxStorageGb = plan.PasswordManager.BaseStorageGb;
organization.UsePolicies = plan.HasPolicies;
organization.UseMyItems = plan.HasPolicies; // TODO: use the plan property when added (PM-32366)
organization.UseMyItems = plan.HasMyItems;
organization.UseSso = plan.HasSso;
organization.UseOrganizationDomains = plan.HasOrganizationDomains;
organization.UseGroups = plan.HasGroups;

1
src/Admin/AdminConsole/Models/OrganizationEditModel.cs

@ -239,6 +239,7 @@ public class OrganizationEditModel : OrganizationViewModel, IValidatableObject @@ -239,6 +239,7 @@ public class OrganizationEditModel : OrganizationViewModel, IValidatableObject
HasResetPassword = p.HasResetPassword,
UsersGetPremium = p.UsersGetPremium,
HasCustomPermissions = p.HasCustomPermissions,
HasMyItems = p.HasMyItems,
UpgradeSortOrder = p.UpgradeSortOrder,
DisplaySortOrder = p.DisplaySortOrder,
LegacyYear = p.LegacyYear,

2
src/Admin/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml

@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
// Password Manager features
document.getElementById('@(nameof(Model.UseTotp))').checked = plan.hasTotp;
document.getElementById('@(nameof(Model.UsersGetPremium))').checked = plan.usersGetPremium;
document.getElementById('@(nameof(Model.UseMyItems))').checked = plan.hasPolicies; // TODO: use the plan property when added (PM-32366)
document.getElementById('@(nameof(Model.UseMyItems))').checked = plan.hasMyItems;
document.getElementById('@(nameof(Model.MaxStorageGb))').value =
document.getElementById('@(nameof(Model.MaxStorageGb))').value ||

2
src/Core/AdminConsole/OrganizationFeatures/Organizations/CloudOrganizationSignUpCommand.cs

@ -79,7 +79,7 @@ public class CloudOrganizationSignUpCommand( @@ -79,7 +79,7 @@ public class CloudOrganizationSignUpCommand(
MaxCollections = plan.PasswordManager.MaxCollections,
MaxStorageGb = (short)(plan.PasswordManager.BaseStorageGb + signup.AdditionalStorageGb),
UsePolicies = plan.HasPolicies,
UseMyItems = plan.HasPolicies, // TODO: use the plan property when added (PM-32366)
UseMyItems = plan.HasMyItems,
UseSso = plan.HasSso,
UseGroups = plan.HasGroups,
UseEvents = plan.HasEvents,

2
src/Core/AdminConsole/OrganizationFeatures/Organizations/ProviderClientOrganizationSignUpCommand.cs

@ -75,7 +75,7 @@ public class ProviderClientOrganizationSignUpCommand : IProviderClientOrganizati @@ -75,7 +75,7 @@ public class ProviderClientOrganizationSignUpCommand : IProviderClientOrganizati
MaxCollections = plan.PasswordManager.MaxCollections,
MaxStorageGb = plan.PasswordManager.BaseStorageGb,
UsePolicies = plan.HasPolicies,
UseMyItems = plan.HasPolicies, // TODO: use the plan property when added (PM-32366)
UseMyItems = plan.HasMyItems,
UseSso = plan.HasSso,
UseOrganizationDomains = plan.HasOrganizationDomains,
UseGroups = plan.HasGroups,

2
src/Core/Billing/Premium/Commands/UpgradePremiumToOrganizationCommand.cs

@ -165,7 +165,7 @@ public class UpgradePremiumToOrganizationCommand( @@ -165,7 +165,7 @@ public class UpgradePremiumToOrganizationCommand(
MaxCollections = targetPlan.PasswordManager.MaxCollections,
MaxStorageGb = targetPlan.PasswordManager.BaseStorageGb,
UsePolicies = targetPlan.HasPolicies,
UseMyItems = targetPlan.HasPolicies, // TODO: use the plan property when added (PM-32366)
UseMyItems = targetPlan.HasMyItems,
UseSso = targetPlan.HasSso,
UseGroups = targetPlan.HasGroups,
UseEvents = targetPlan.HasEvents,

2
src/Core/Billing/Subscriptions/Commands/RestartSubscriptionCommand.cs

@ -82,7 +82,7 @@ public class RestartSubscriptionCommand( @@ -82,7 +82,7 @@ public class RestartSubscriptionCommand(
organization.Plan = newPlan.Name;
organization.SelfHost = newPlan.HasSelfHost;
organization.UsePolicies = newPlan.HasPolicies;
organization.UseMyItems = newPlan.HasPolicies; // TODO: use the plan property when added (PM-32366)
organization.UseMyItems = newPlan.HasMyItems;
organization.UseGroups = newPlan.HasGroups;
organization.UseDirectory = newPlan.HasDirectory;
organization.UseEvents = newPlan.HasEvents;

2
src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs

@ -295,7 +295,7 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand @@ -295,7 +295,7 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand
organization.UseApi = newPlan.HasApi;
organization.SelfHost = newPlan.HasSelfHost;
organization.UsePolicies = newPlan.HasPolicies;
organization.UseMyItems = newPlan.HasPolicies; // TODO: use the plan property when added (PM-32366)
organization.UseMyItems = newPlan.HasMyItems;
organization.MaxStorageGb = (short)(newPlan.PasswordManager.BaseStorageGb + upgrade.AdditionalStorageGb);
organization.UseSso = newPlan.HasSso;
organization.UseOrganizationDomains = newPlan.HasOrganizationDomains;

Loading…
Cancel
Save