From 722dedf10d0d8601bf2c49e17f5b3f838a546402 Mon Sep 17 00:00:00 2001 From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:22:45 -0400 Subject: [PATCH] Added all missing plan fields to GetPlansHelper (#4597) --- .../Models/OrganizationEditModel.cs | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/Admin/AdminConsole/Models/OrganizationEditModel.cs b/src/Admin/AdminConsole/Models/OrganizationEditModel.cs index 40b319cdc1..04079138d4 100644 --- a/src/Admin/AdminConsole/Models/OrganizationEditModel.cs +++ b/src/Admin/AdminConsole/Models/OrganizationEditModel.cs @@ -187,16 +187,32 @@ public class OrganizationEditModel : OrganizationViewModel var plan = new { Type = p.Type, - Has2fa = p.Has2fa, - HasApi = p.HasApi, - HasGroups = p.HasGroups, + ProductTier = p.ProductTier, + Name = p.Name, + IsAnnual = p.IsAnnual, + NameLocalizationKey = p.NameLocalizationKey, + DescriptionLocalizationKey = p.DescriptionLocalizationKey, + CanBeUsedByBusiness = p.CanBeUsedByBusiness, + TrialPeriodDays = p.TrialPeriodDays, + HasSelfHost = p.HasSelfHost, HasPolicies = p.HasPolicies, - HasSso = p.HasSso, - HasScim = p.HasScim, + HasGroups = p.HasGroups, HasDirectory = p.HasDirectory, HasEvents = p.HasEvents, + HasTotp = p.HasTotp, + Has2fa = p.Has2fa, + HasApi = p.HasApi, + HasSso = p.HasSso, + HasKeyConnector = p.HasKeyConnector, + HasScim = p.HasScim, HasResetPassword = p.HasResetPassword, + UsersGetPremium = p.UsersGetPremium, HasCustomPermissions = p.HasCustomPermissions, + UpgradeSortOrder = p.UpgradeSortOrder, + DisplaySortOrder = p.DisplaySortOrder, + LegacyYear = p.LegacyYear, + Disabled = p.Disabled, + SupportsSecretsManager = p.SupportsSecretsManager, PasswordManager = new {