nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-17 07:30:59 -05:00
Code Activity

Merge branch 'master' into feature/flexible-collections

Browse Source
This commit is contained in:
Thomas Rittson
2023-10-13 15:51:44 +10:00
committed by GitHub
parent fed325204d f228dcd668
commit 6bc38ac3d1
34 changed files with 2408 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -410,6 +410,11 @@ public class OrganizationService : IOrganizationService
var secretsManagerPlan = StaticStore.SecretManagerPlans.FirstOrDefault(p => p.Type == signup.Plan);
if (signup.UseSecretsManager)
{
if (provider)
{
throw new BadRequestException(
"Organizations with a Managed Service Provider do not support Secrets Manager.");
}
ValidateSecretsManagerPlan(secretsManagerPlan, signup);
}