mirror of
https://github.com/bitwarden/server.git
synced 2025-05-10 06:02:24 -05:00
remove old tests, fix imports
This commit is contained in:
Brandon
parent
99e405a4aa
commit
0a2e8e57c8
@ -708,7 +708,7 @@ public class InviteOrganizationUserCommandTests
|
|||||||
|
|
||||||
var request = new InviteOrganizationUsersRequest(
|
var request = new InviteOrganizationUsersRequest(
|
||||||
invites: [
|
invites: [
|
||||||
new OrganizationUserInvite(
|
new OrganizationUserInviteCommandModel(
|
||||||
email: user.Email,
|
email: user.Email,
|
||||||
assignedCollections: [],
|
assignedCollections: [],
|
||||||
groups: [],
|
groups: [],
|
||||||
@ -767,7 +767,7 @@ public class InviteOrganizationUserCommandTests
|
|||||||
// Assert
|
// Assert
|
||||||
Assert.IsType<Success<ScimInviteOrganizationUsersResponse>>(result);
|
Assert.IsType<Success<ScimInviteOrganizationUsersResponse>>(result);
|
||||||
|
|
||||||
sutProvider.GetDependency<IMailService>().Received(1)
|
await sutProvider.GetDependency<IMailService>().Received(1)
|
||||||
.SendOrganizationAutoscaledEmailAsync(organization, 1,
|
.SendOrganizationAutoscaledEmailAsync(organization, 1,
|
||||||
Arg.Is<IEnumerable<string>>(emails => emails.Any(email => email == "provider@email.com")));
|
Arg.Is<IEnumerable<string>>(emails => emails.Any(email => email == "provider@email.com")));
|
||||||
}
|
}
|
||||||
@ -795,7 +795,7 @@ public class InviteOrganizationUserCommandTests
|
|||||||
var request = new InviteOrganizationUsersRequest(
|
var request = new InviteOrganizationUsersRequest(
|
||||||
invites:
|
invites:
|
||||||
[
|
[
|
||||||
new OrganizationUserInvite(
|
new OrganizationUserInviteCommandModel(
|
||||||
email: user.Email,
|
email: user.Email,
|
||||||
assignedCollections: [],
|
assignedCollections: [],
|
||||||
groups: [],
|
groups: [],
|
||||||
@ -866,7 +866,7 @@ public class InviteOrganizationUserCommandTests
|
|||||||
var request = new InviteOrganizationUsersRequest(
|
var request = new InviteOrganizationUsersRequest(
|
||||||
invites:
|
invites:
|
||||||
[
|
[
|
||||||
new OrganizationUserInvite(
|
new OrganizationUserInviteCommandModel(
|
||||||
email: user.Email,
|
email: user.Email,
|
||||||
assignedCollections: [],
|
assignedCollections: [],
|
||||||
groups: [],
|
groups: [],
|
||||||
|
|||||||
@ -14,7 +14,6 @@ using Bit.Core.Enums;
|
|||||||
using Bit.Core.Exceptions;
|
using Bit.Core.Exceptions;
|
||||||
using Bit.Core.Models.Business;
|
using Bit.Core.Models.Business;
|
||||||
using Bit.Core.Models.Data;
|
using Bit.Core.Models.Data;
|
||||||
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
|
|
||||||
using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
|
using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
|
||||||
using Bit.Core.Platform.Push;
|
using Bit.Core.Platform.Push;
|
||||||
using Bit.Core.Repositories;
|
using Bit.Core.Repositories;
|
||||||
@ -45,137 +44,6 @@ public class OrganizationServiceTests
|
|||||||
{
|
{
|
||||||
private readonly IDataProtectorTokenFactory<OrgUserInviteTokenable> _orgUserInviteTokenDataFactory = new FakeDataProtectorTokenFactory<OrgUserInviteTokenable>();
|
private readonly IDataProtectorTokenFactory<OrgUserInviteTokenable> _orgUserInviteTokenDataFactory = new FakeDataProtectorTokenFactory<OrgUserInviteTokenable>();
|
||||||
|
|
||||||
[Theory, PaidOrganizationCustomize, BitAutoData]
|
|
||||||
public async Task OrgImportCreateNewUsers(SutProvider<OrganizationService> sutProvider, Organization org, List<OrganizationUserUserDetails> existingUsers, List<ImportedOrganizationUser> newUsers)
|
|
||||||
{
|
|
||||||
// Setup FakeDataProtectorTokenFactory for creating new tokens - this must come first in order to avoid resetting mocks
|
|
||||||
sutProvider.SetDependency(_orgUserInviteTokenDataFactory, "orgUserInviteTokenDataFactory");
|
|
||||||
sutProvider.Create();
|
|
||||||
|
|
||||||
org.UseDirectory = true;
|
|
||||||
org.Seats = 10;
|
|
||||||
newUsers.Add(new ImportedOrganizationUser
|
|
||||||
{
|
|
||||||
Email = existingUsers.First().Email,
|
|
||||||
ExternalId = existingUsers.First().ExternalId
|
|
||||||
});
|
|
||||||
var expectedNewUsersCount = newUsers.Count - 1;
|
|
||||||
|
|
||||||
existingUsers.First().Type = OrganizationUserType.Owner;
|
|
||||||
|
|
||||||
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(org.Id).Returns(org);
|
|
||||||
|
|
||||||
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
|
|
||||||
SetupOrgUserRepositoryCreateManyAsyncMock(organizationUserRepository);
|
|
||||||
|
|
||||||
organizationUserRepository.GetManyDetailsByOrganizationAsync(org.Id)
|
|
||||||
.Returns(existingUsers);
|
|
||||||
organizationUserRepository.GetCountByOrganizationIdAsync(org.Id)
|
|
||||||
.Returns(existingUsers.Count);
|
|
||||||
sutProvider.GetDependency<IHasConfirmedOwnersExceptQuery>()
|
|
||||||
.HasConfirmedOwnersExceptAsync(org.Id, Arg.Any<IEnumerable<Guid>>())
|
|
||||||
.Returns(true);
|
|
||||||
sutProvider.GetDependency<ICurrentContext>().ManageUsers(org.Id).Returns(true);
|
|
||||||
|
|
||||||
|
|
||||||
await sutProvider.Sut.ImportAsync(org.Id, null, newUsers, null, false, EventSystemUser.PublicApi);
|
|
||||||
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs()
|
|
||||||
.UpsertAsync(default);
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1)
|
|
||||||
.UpsertManyAsync(Arg.Is<IEnumerable<OrganizationUser>>(users => !users.Any()));
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs()
|
|
||||||
.CreateAsync(default);
|
|
||||||
|
|
||||||
// Create new users
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1)
|
|
||||||
.CreateManyAsync(Arg.Is<IEnumerable<OrganizationUser>>(users => users.Count() == expectedNewUsersCount));
|
|
||||||
|
|
||||||
await sutProvider.GetDependency<ISendOrganizationInvitesCommand>().Received(1)
|
|
||||||
.SendInvitesAsync(
|
|
||||||
Arg.Is<SendInvitesRequest>(
|
|
||||||
info => info.Users.Length == expectedNewUsersCount &&
|
|
||||||
info.Organization == org));
|
|
||||||
|
|
||||||
// Send events
|
|
||||||
await sutProvider.GetDependency<IEventService>().Received(1)
|
|
||||||
.LogOrganizationUserEventsAsync(Arg.Is<IEnumerable<(OrganizationUser, EventType, EventSystemUser, DateTime?)>>(events =>
|
|
||||||
events.Count() == expectedNewUsersCount));
|
|
||||||
await sutProvider.GetDependency<IReferenceEventService>().Received(1)
|
|
||||||
.RaiseEventAsync(Arg.Is<ReferenceEvent>(referenceEvent =>
|
|
||||||
referenceEvent.Type == ReferenceEventType.InvitedUsers && referenceEvent.Id == org.Id &&
|
|
||||||
referenceEvent.Users == expectedNewUsersCount));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory, PaidOrganizationCustomize, BitAutoData]
|
|
||||||
public async Task OrgImportCreateNewUsersAndMarryExistingUser(SutProvider<OrganizationService> sutProvider, Organization org, List<OrganizationUserUserDetails> existingUsers,
|
|
||||||
List<ImportedOrganizationUser> newUsers)
|
|
||||||
{
|
|
||||||
// Setup FakeDataProtectorTokenFactory for creating new tokens - this must come first in order to avoid resetting mocks
|
|
||||||
sutProvider.SetDependency(_orgUserInviteTokenDataFactory, "orgUserInviteTokenDataFactory");
|
|
||||||
sutProvider.Create();
|
|
||||||
|
|
||||||
org.UseDirectory = true;
|
|
||||||
org.Seats = newUsers.Count + existingUsers.Count + 1;
|
|
||||||
var reInvitedUser = existingUsers.First();
|
|
||||||
reInvitedUser.ExternalId = null;
|
|
||||||
newUsers.Add(new ImportedOrganizationUser
|
|
||||||
{
|
|
||||||
Email = reInvitedUser.Email,
|
|
||||||
ExternalId = reInvitedUser.Email,
|
|
||||||
});
|
|
||||||
var expectedNewUsersCount = newUsers.Count - 1;
|
|
||||||
|
|
||||||
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(org.Id).Returns(org);
|
|
||||||
sutProvider.GetDependency<IOrganizationUserRepository>().GetManyDetailsByOrganizationAsync(org.Id)
|
|
||||||
.Returns(existingUsers);
|
|
||||||
sutProvider.GetDependency<IOrganizationUserRepository>().GetCountByOrganizationIdAsync(org.Id)
|
|
||||||
.Returns(existingUsers.Count);
|
|
||||||
sutProvider.GetDependency<IOrganizationUserRepository>().GetByIdAsync(reInvitedUser.Id)
|
|
||||||
.Returns(new OrganizationUser { Id = reInvitedUser.Id });
|
|
||||||
|
|
||||||
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
|
|
||||||
|
|
||||||
sutProvider.GetDependency<IHasConfirmedOwnersExceptQuery>()
|
|
||||||
.HasConfirmedOwnersExceptAsync(org.Id, Arg.Any<IEnumerable<Guid>>())
|
|
||||||
.Returns(true);
|
|
||||||
|
|
||||||
SetupOrgUserRepositoryCreateManyAsyncMock(organizationUserRepository);
|
|
||||||
|
|
||||||
var currentContext = sutProvider.GetDependency<ICurrentContext>();
|
|
||||||
currentContext.ManageUsers(org.Id).Returns(true);
|
|
||||||
|
|
||||||
await sutProvider.Sut.ImportAsync(org.Id, null, newUsers, null, false, EventSystemUser.PublicApi);
|
|
||||||
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs()
|
|
||||||
.UpsertAsync(default);
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs()
|
|
||||||
.CreateAsync(default);
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs()
|
|
||||||
.CreateAsync(default, default);
|
|
||||||
|
|
||||||
// Upserted existing user
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1)
|
|
||||||
.UpsertManyAsync(Arg.Is<IEnumerable<OrganizationUser>>(users => users.Count() == 1));
|
|
||||||
|
|
||||||
// Created and invited new users
|
|
||||||
await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1)
|
|
||||||
.CreateManyAsync(Arg.Is<IEnumerable<OrganizationUser>>(users => users.Count() == expectedNewUsersCount));
|
|
||||||
|
|
||||||
await sutProvider.GetDependency<ISendOrganizationInvitesCommand>().Received(1)
|
|
||||||
.SendInvitesAsync(Arg.Is<SendInvitesRequest>(request =>
|
|
||||||
request.Users.Length == expectedNewUsersCount &&
|
|
||||||
request.Organization == org));
|
|
||||||
|
|
||||||
// Sent events
|
|
||||||
await sutProvider.GetDependency<IEventService>().Received(1)
|
|
||||||
.LogOrganizationUserEventsAsync(Arg.Is<IEnumerable<(OrganizationUser, EventType, EventSystemUser, DateTime?)>>(events =>
|
|
||||||
events.Count(e => e.Item2 == EventType.OrganizationUser_Invited) == expectedNewUsersCount));
|
|
||||||
await sutProvider.GetDependency<IReferenceEventService>().Received(1)
|
|
||||||
.RaiseEventAsync(Arg.Is<ReferenceEvent>(referenceEvent =>
|
|
||||||
referenceEvent.Type == ReferenceEventType.InvitedUsers && referenceEvent.Id == org.Id &&
|
|
||||||
referenceEvent.Users == expectedNewUsersCount));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory, BitAutoData]
|
[Theory, BitAutoData]
|
||||||
public async Task SignupClientAsync_Succeeds(
|
public async Task SignupClientAsync_Succeeds(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user