From be8bd57a94df1ed28053caf859a4f7c3a32ab816 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 12 May 2025 15:13:04 -0400 Subject: [PATCH] fix CommandResult useage --- .../OrganizationUsers/ImportOrganizationUserCommand.cs | 3 ++- .../InviteUsers/InviteOrganizationUsersCommand.cs | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs index e1bb2f21bc..baf13c7198 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs @@ -4,6 +4,7 @@ using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models; using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Utilities.Commands; using Bit.Core.Billing.Pricing; using Bit.Core.Context; using Bit.Core.Entities; @@ -223,7 +224,7 @@ public class ImportOrganizationUserCommand : IImportOrganizationUserCommand } break; case Failure failure: - throw new BadRequestException(failure.ErrorMessage); + throw new BadRequestException(failure.Error.Message); default: throw new InvalidOperationException($"Unhandled commandResult type: {commandResult.GetType().Name}"); } diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs index 2d899e6121..66c422f78b 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs @@ -84,9 +84,11 @@ public class InviteOrganizationUsersCommand(IEventService eventService, { case Failure failure: return new Failure( - failure.Errors.Select(error => new Error(error.Message, - new InviteOrganizationUsersResponse(error.ErroredValue.InvitedUsers, organizationId) - ))); + new Error( + failure.Error.Message, + new InviteOrganizationUsersResponse(failure.Error.ErroredValue.InvitedUsers, organizationId) + ) + ); case Success success when success.Value.InvitedUsers.Any():