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

Made Revert and Adjust Sm methods consistent. Corrected string comparer. Added comment for revert sm.

Browse Source
This commit is contained in:
jrmccannon 2025-03-28 09:57:12 -05:00
parent 32104a1fe3
commit 750985fafe
No known key found for this signature in database
GPG Key ID: CF03F3DB01CE96A6
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/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs
View File

@ -45,7 +45,6 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
public const string NoUsersToInvite = "No users to invite."; public const string NoUsersToInvite = "No users to invite.";
public const string InvalidResultType = "Invalid result type."; public const string InvalidResultType = "Invalid result type.";
public async Task<CommandResult<ScimInviteOrganizationUsersResponse>> InviteScimOrganizationUserAsync(InviteOrganizationUsersRequest request) public async Task<CommandResult<ScimInviteOrganizationUsersResponse>> InviteScimOrganizationUserAsync(InviteOrganizationUsersRequest request)
{ {
var result = await InviteOrganizationUsersAsync(request); var result = await InviteOrganizationUsersAsync(request);
@ -126,6 +125,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
await organizationUserRepository.DeleteManyAsync(organizationUserToInviteEntities.Select(x => x.OrganizationUser.Id)); await organizationUserRepository.DeleteManyAsync(organizationUserToInviteEntities.Select(x => x.OrganizationUser.Id));
// Do this first so that SmSeats never exceed PM seats (due to current billing requirements)
await RevertSecretsManagerChangesAsync(validatedRequest, organization, validatedRequest.Value.InviteOrganization.SmSeats); await RevertSecretsManagerChangesAsync(validatedRequest, organization, validatedRequest.Value.InviteOrganization.SmSeats);
await RevertPasswordManagerChangesAsync(validatedRequest, organization); await RevertPasswordManagerChangesAsync(validatedRequest, organization);
@ -140,7 +140,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
{ {
var existingEmails = new HashSet<string>(await organizationUserRepository.SelectKnownEmailsAsync( var existingEmails = new HashSet<string>(await organizationUserRepository.SelectKnownEmailsAsync(
request.InviteOrganization.OrganizationId, request.Invites.Select(i => i.Email), false), request.InviteOrganization.OrganizationId, request.Invites.Select(i => i.Email), false),
StringComparer.InvariantCultureIgnoreCase); StringComparer.OrdinalIgnoreCase);
return request.Invites return request.Invites
.Where(invite => !existingEmails.Contains(invite.Email)) .Where(invite => !existingEmails.Contains(invite.Email))
@ -166,7 +166,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
private async Task RevertSecretsManagerChangesAsync(Valid<InviteUserOrganizationValidationRequest> validatedResult, Organization organization, int? initialSmSeats) private async Task RevertSecretsManagerChangesAsync(Valid<InviteUserOrganizationValidationRequest> validatedResult, Organization organization, int? initialSmSeats)
{ {
if (validatedResult.Value.InviteOrganization.UseSecretsManager && validatedResult.Value.SecretsManagerSubscriptionUpdate.SmSeatsChanged) if (validatedResult.Value.SecretsManagerSubscriptionUpdate?.SmSeatsChanged is true)
{ {
var smSubscriptionUpdateRevert = new SecretsManagerSubscriptionUpdate( var smSubscriptionUpdateRevert = new SecretsManagerSubscriptionUpdate(
organization: organization, organization: organization,
@ -239,12 +239,11 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
private async Task AdjustSecretsManagerSeatsAsync(Valid<InviteUserOrganizationValidationRequest> validatedResult) private async Task AdjustSecretsManagerSeatsAsync(Valid<InviteUserOrganizationValidationRequest> validatedResult)
{ {
if (validatedResult.Value.SecretsManagerSubscriptionUpdate?.SmSeatsChanged is not true) if (validatedResult.Value.SecretsManagerSubscriptionUpdate?.SmSeatsChanged is true)
{ {
return; await updateSecretsManagerSubscriptionCommand.UpdateSubscriptionAsync(validatedResult.Value.SecretsManagerSubscriptionUpdate);
} }
await updateSecretsManagerSubscriptionCommand.UpdateSubscriptionAsync(validatedResult.Value.SecretsManagerSubscriptionUpdate);
} }
private async Task AdjustPasswordManagerSeatsAsync(Valid<InviteUserOrganizationValidationRequest> validatedResult, Organization organization) private async Task AdjustPasswordManagerSeatsAsync(Valid<InviteUserOrganizationValidationRequest> validatedResult, Organization organization)