nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 08:32:50 -05:00
Code Activity

Use userId to find org users

Browse Source
This commit is contained in:
Matt Gibson
2021-11-09 10:40:31 -05:00
committed by Justin Baur
parent 1516b9dd8e
commit 8480379e32
5 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/Api.Test/Controllers/OrganizationSponsorshipsControllerTests.cs
View File

@ -58,45 +58,21 @@ namespace Bit.Api.Test.Controllers
[Theory]
[BitMemberAutoData(nameof(NonConfirmedOrganizationUsersStatuses))]
public async Task CreateSponsorship_BadSponsoringUserStatus_ThrowsBadRequest(
OrganizationUserStatusType statusType, Guid userId, Organization org, OrganizationUser orgUser,
OrganizationUserStatusType statusType, Organization org, OrganizationUser orgUser,
OrganizationSponsorshipRequestModel model, SutProvider<OrganizationSponsorshipsController> sutProvider)
{
org.PlanType = PlanType.EnterpriseAnnually;
orgUser.Status = statusType;
orgUser.UserId = userId;
model.OrganizationUserId = orgUser.Id;
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(org.Id).Returns(org);
sutProvider.GetDependency<ICurrentContext>().UserId.Returns(userId);
sutProvider.GetDependency<IOrganizationUserRepository>().GetByIdAsync(orgUser.Id).Returns(orgUser);
sutProvider.GetDependency<ICurrentContext>().UserId.Returns(orgUser.UserId);
sutProvider.GetDependency<IOrganizationUserRepository>().GetByOrganizationAsync(org.Id, orgUser.UserId.Value)
.Returns(orgUser);
var exception = await Assert.ThrowsAsync<BadRequestException>(() =>
sutProvider.Sut.CreateSponsorship(org.Id.ToString(), model));
Assert.Contains("Only confirm users can sponsor other organizations.", exception.Message);
await sutProvider.GetDependency<IOrganizationSponsorshipService>()
.DidNotReceiveWithAnyArgs()
.OfferSponsorshipAsync(default, default, default, default, default);
}
[Theory]
[BitAutoData("c56c7ab4-a174-412a-a822-abe53ea71d50")]
public async Task CreateSponsorship_CreateSponsorshipAsDifferentUser_ThrowsBadRequest(Guid userId,
Organization org, OrganizationUser orgUser, OrganizationSponsorshipRequestModel model,
SutProvider<OrganizationSponsorshipsController> sutProvider)
{
org.PlanType = PlanType.EnterpriseAnnually;
orgUser.Status = OrganizationUserStatusType.Confirmed;
model.OrganizationUserId = orgUser.Id;
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(org.Id).Returns(org);
sutProvider.GetDependency<ICurrentContext>().UserId.Returns(userId);
sutProvider.GetDependency<IOrganizationUserRepository>().GetByIdAsync(orgUser.Id).Returns(orgUser);
var exception = await Assert.ThrowsAsync<BadRequestException>(() =>
sutProvider.Sut.CreateSponsorship(org.Id.ToString(), model));
Assert.Contains("Can only create organization sponsorships for yourself.", exception.Message);
Assert.Contains("Only confirmed users can sponsor other organizations.", exception.Message);
await sutProvider.GetDependency<IOrganizationSponsorshipService>()
.DidNotReceiveWithAnyArgs()
.OfferSponsorshipAsync(default, default, default, default, default);
@ -110,11 +86,11 @@ namespace Bit.Api.Test.Controllers
{
org.PlanType = PlanType.EnterpriseAnnually;
orgUser.Status = OrganizationUserStatusType.Confirmed;
model.OrganizationUserId = orgUser.Id;
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(org.Id).Returns(org);
sutProvider.GetDependency<ICurrentContext>().UserId.Returns(orgUser.UserId);
sutProvider.GetDependency<IOrganizationUserRepository>().GetByIdAsync(orgUser.Id).Returns(orgUser);
sutProvider.GetDependency<IOrganizationUserRepository>().GetByOrganizationAsync(org.Id, orgUser.UserId.Value)
.Returns(orgUser);
sutProvider.GetDependency<IOrganizationSponsorshipRepository>()
.GetBySponsoringOrganizationUserIdAsync(orgUser.Id).Returns(sponsorship);

1
test/Core.Test/Services/OrganizationSponsorshipServiceTests.cs
View File

@ -45,6 +45,7 @@ namespace Bit.Core.Test.Services
SponsoringOrganizationUserId = sponsoringOrgUser.Id,
FriendlyName = friendlyName,
OfferedToEmail = sponsoredEmail,
PlanSponsorshipType = PlanSponsorshipType.FamiliesForEnterprise,
CloudSponsor = true,
};