nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-22 12:04:27 -05:00
Code

Resolve the pr comments

Browse Source 
Signed-off-by: Cy Okeke <cokeke@bitwarden.com>
This commit is contained in:
Cy Okeke 2025-05-21 09:18:18 +01:00
parent 86923fe1b8
commit d6e1b1b792
No known key found for this signature in database
GPG Key ID: 88B341B55C84B45C
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Admin/AdminConsole/Controllers/OrganizationsController.cs
View File

@ -255,15 +255,16 @@ public class OrganizationsController : Controller
Seats = organization.Seats
};
if (organization.PlanType != PlanType.Free && model.PlanType == PlanType.Free && model.Seats > 2)
var plan = await _pricingClient.GetPlanOrThrow(model.PlanType.Value);
if (organization.PlanType != PlanType.Free && model.PlanType == PlanType.Free && model.Seats > plan.PasswordManager.MaxSeats)
{
TempData["Error"] = "Organizations with more than 2 seats cannot be downgraded to the Free plan";
TempData["Error"] = $"Organizations with more than {plan.PasswordManager.MaxSeats} seats cannot be downgraded to the Free plan";
return RedirectToAction("Edit", new { id });
}
if (organization.PlanType != PlanType.Free && model.PlanType == PlanType.Free && model.MaxCollections > 2)
if (organization.PlanType != PlanType.Free && model.PlanType == PlanType.Free && model.MaxCollections > plan.PasswordManager.MaxCollections)
{
TempData["Error"] = $"Organizations with more than 2 collections cannot be downgraded to the Free plan. Your organization currently has {organization.MaxCollections} collections.";
TempData["Error"] = $"Organizations with more than {plan.PasswordManager.MaxCollections} collections cannot be downgraded to the Free plan. Your organization currently has {organization.MaxCollections} collections.";
return RedirectToAction("Edit", new { id });
}
@ -276,8 +277,6 @@ public class OrganizationsController : Controller
UpdateOrganization(organization, model);
var plan = await _pricingClient.GetPlanOrThrow(organization.PlanType);
if (organization.UseSecretsManager && !plan.SupportsSecretsManager)
{
TempData["Error"] = "Plan does not support Secrets Manager";