bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-11 13:03:27 +00:00
Code Issues Releases Wiki Activity

[AC-1488] Changed SM Signup and Upgrade paths to set SmServiceAccounts to include the plan BaseServiceAccount (#3086)

Browse Source
This commit is contained in:
Rui Tomé
2023-07-11 14:34:09 +01:00
committed by GitHub
parent 3a6b17bf19
commit 3ea14a2205
5 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,7 +268,7 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand
organization.PrivateKey = upgrade.PrivateKey;
organization.UsePasswordManager = true;
organization.SmSeats = (short)(newSecretsManagerPlan.BaseSeats + upgrade.AdditionalSmSeats.GetValueOrDefault());
organization.SmServiceAccounts = upgrade.AdditionalServiceAccounts.GetValueOrDefault();
organization.SmServiceAccounts = newSecretsManagerPlan.BaseServiceAccount + upgrade.AdditionalServiceAccounts.GetValueOrDefault();
organization.UseSecretsManager = upgrade.UseSecretsManager;
await _organizationService.ReplaceAndUpdateCacheAsync(organization);

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

@@ -447,7 +447,7 @@ public class OrganizationService : IOrganizationService
Status = OrganizationStatusType.Created,
UsePasswordManager = true,
SmSeats = (short)(secretsManagerPlan.BaseSeats + signup.AdditionalSmSeats.GetValueOrDefault()),
SmServiceAccounts = signup.AdditionalServiceAccounts.GetValueOrDefault(),
SmServiceAccounts = secretsManagerPlan.BaseServiceAccount + signup.AdditionalServiceAccounts.GetValueOrDefault(),
UseSecretsManager = signup.UseSecretsManager
};