nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-28 06:36:15 -05:00
Code

wip

Browse Source
This commit is contained in:
Brandon 2025-05-14 15:14:27 -04:00
parent 04383a82a1
commit 2cac1c82d0
No known key found for this signature in database
GPG Key ID: A0E0EF0B207BA40D
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs
View File

@ -234,7 +234,7 @@ public class ImportOrganizationUserCommand : IImportOrganizationUserCommand
{ {
var plan = await _pricingClient.GetPlanOrThrow(organization.PlanType); var plan = await _pricingClient.GetPlanOrThrow(organization.PlanType);
var inviteOrganization = new InviteOrganization(organization, plan); var inviteOrganization = new InviteOrganization(organization, plan);
var request = new InviteOrganizationUsersRequest(invites.ToArray(), inviteOrganization, Guid.Empty, DateTimeOffset.UtcNow); var request = new InviteOrganizationUsersRequest(invites.ToArray(), inviteOrganization, organization.Id, DateTimeOffset.UtcNow);
return await _inviteOrganizationUsersCommand.InviteImportedOrganizationUsersAsync(request, organization.Id); return await _inviteOrganizationUsersCommand.InviteImportedOrganizationUsersAsync(request, organization.Id);
} }

4
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs
View File

@ -49,7 +49,7 @@ public class ImportOrganizationUserCommandTests
invites.Add(new OrganizationUserInviteCommandModel(u.Email + "@test.com", u.ExternalId)); invites.Add(new OrganizationUserInviteCommandModel(u.Email + "@test.com", u.ExternalId));
} }
var inviteCommandModel = new InviteOrganizationUsersRequest(invites.ToArray(), new InviteOrganization(org, null), Guid.Empty, DateTimeOffset.UtcNow); var inviteCommandModel = new InviteOrganizationUsersRequest(invites.ToArray(), new InviteOrganization(org, null), org.Id, DateTimeOffset.UtcNow);
newUsers.Add(new ImportedOrganizationUser newUsers.Add(new ImportedOrganizationUser
{ {
@ -74,7 +74,7 @@ public class ImportOrganizationUserCommandTests
await sutProvider.GetDependency<IInviteOrganizationUsersCommand>().Received(1) await sutProvider.GetDependency<IInviteOrganizationUsersCommand>().Received(1)
.InviteImportedOrganizationUsersAsync(Arg.Is<InviteOrganizationUsersRequest>( .InviteImportedOrganizationUsersAsync(Arg.Is<InviteOrganizationUsersRequest>(
// These are the invites that should get populated from the CommandResult response above // These are the invites that should get populated from the CommandResult response above
request => request.Invites.Count() == 0 request => request.Invites.Count() == expectedNewUsersCount
), org.Id); ), org.Id);
await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs() await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs()
.UpsertAsync(default); .UpsertAsync(default);