Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-07 19:37:51 +01:00
Code Issues Projects Releases Wiki Activity

[PM-10873] Updated errors thrown when creating organization on selfhost to be more specific (#5007)

Browse Source 
* Updated errors thrown when creating organization on selfhost to be more specific

* Added additional validation to ensure that the license type is accurate

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
This commit is contained in:
Conner Turnbull 2024-12-16 08:04:05 -05:00 committed by GitHub
parent a8091bf585
commit 9321515eca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
View File

@ -519,17 +519,29 @@ public class OrganizationService : IOrganizationService
OrganizationLicense license, User owner, string ownerKey, string collectionName, string publicKey, OrganizationLicense license, User owner, string ownerKey, string collectionName, string publicKey,
string privateKey) string privateKey)
{ {
if (license.LicenseType != LicenseType.Organization)
{
throw new BadRequestException("Premium licenses cannot be applied to an organization. " +
"Upload this license from your personal account settings page.");
}
var claimsPrincipal = _licensingService.GetClaimsPrincipalFromLicense(license); var claimsPrincipal = _licensingService.GetClaimsPrincipalFromLicense(license);
var canUse = license.CanUse(_globalSettings, _licensingService, claimsPrincipal, out var exception); var canUse = license.CanUse(_globalSettings, _licensingService, claimsPrincipal, out var exception);
if (!canUse) if (!canUse)
{ {
throw new BadRequestException(exception); throw new BadRequestException(exception);
} }
if (license.PlanType != PlanType.Custom && var plan = StaticStore.Plans.FirstOrDefault(p => p.Type == license.PlanType);
StaticStore.Plans.FirstOrDefault(p => p.Type == license.PlanType && !p.Disabled) == null) if (plan is null)
{ {
throw new BadRequestException("Plan not found."); throw new BadRequestException($"Server must be updated to support {license.Plan}.");
}
if (license.PlanType != PlanType.Custom && plan.Disabled)
{
throw new BadRequestException($"Plan {plan.Name} is disabled.");
} }
var enabledOrgs = await _organizationRepository.GetManyByEnabledAsync(); var enabledOrgs = await _organizationRepository.GetManyByEnabledAsync();