nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00
Code Activity

[PM-17775] (#5699)

Browse Source 
* Changes to allow admin to send F4E sponsorship

* Fix the failing unit tests

* Fix the failing test

Signed-off-by: Cy Okeke <cokeke@bitwarden.com>

* Merge Changes with pm-17777

Signed-off-by: Cy Okeke <cokeke@bitwarden.com>

* Add changes for autoscale

Signed-off-by: Cy Okeke <cokeke@bitwarden.com>

* Return the right error response

Signed-off-by: Cy Okeke <cokeke@bitwarden.com>

* Resolve the failing unit test

Signed-off-by: Cy Okeke <cokeke@bitwarden.com>

---------

Signed-off-by: Cy Okeke <cokeke@bitwarden.com>
This commit is contained in:
cyprain-okeke
2025-05-01 16:35:51 +01:00
committed by GitHub
parent 8ecd9c5fb3
commit dc5db5673f
4 changed files with 161 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
test/Api.Test/Billing/Controllers/OrganizationSponsorshipsControllerTests.cs
View File

@ -6,6 +6,7 @@ using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.Models.Data;
using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
using Bit.Core.Repositories;
using Bit.Core.Services;
@ -13,6 +14,7 @@ using Bit.Core.Utilities;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using NSubstitute;
using NSubstitute.ReturnsExtensions;
using Xunit;
namespace Bit.Api.Test.Billing.Controllers;
@ -146,4 +148,80 @@ public class OrganizationSponsorshipsControllerTests
.DidNotReceiveWithAnyArgs()
.RemoveSponsorshipAsync(default);
}
[Theory]
[BitAutoData]
public async Task GetSponsoredOrganizations_OrganizationNotFound_ThrowsNotFound(
Guid sponsoringOrgId,
SutProvider<OrganizationSponsorshipsController> sutProvider)
{
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(sponsoringOrgId).ReturnsNull();
await Assert.ThrowsAsync<NotFoundException>(() =>
sutProvider.Sut.GetSponsoredOrganizations(sponsoringOrgId));
await sutProvider.GetDependency<IOrganizationSponsorshipRepository>()
.DidNotReceiveWithAnyArgs()
.GetManyBySponsoringOrganizationAsync(default);
}
[Theory]
[BitAutoData]
public async Task GetSponsoredOrganizations_NotOrganizationOwner_ThrowsNotFound(
Organization sponsoringOrg,
SutProvider<OrganizationSponsorshipsController> sutProvider)
{
// Arrange
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(sponsoringOrg.Id).Returns(sponsoringOrg);
sutProvider.GetDependency<ICurrentContext>().OrganizationOwner(sponsoringOrg.Id).Returns(false);
sutProvider.GetDependency<ICurrentContext>().OrganizationAdmin(sponsoringOrg.Id).Returns(false);
// Create a CurrentContextOrganization with ManageUsers set to false
var currentContextOrg = new CurrentContextOrganization
{
Id = sponsoringOrg.Id,
Permissions = new Permissions { ManageUsers = false }
};
sutProvider.GetDependency<ICurrentContext>().Organizations.Returns(new List<CurrentContextOrganization> { currentContextOrg });
// Act & Assert
await Assert.ThrowsAsync<UnauthorizedAccessException>(() =>
sutProvider.Sut.GetSponsoredOrganizations(sponsoringOrg.Id));
await sutProvider.GetDependency<IOrganizationSponsorshipRepository>()
.DidNotReceiveWithAnyArgs()
.GetManyBySponsoringOrganizationAsync(default);
}
[Theory]
[BitAutoData]
public async Task GetSponsoredOrganizations_Success_ReturnsSponsorships(
Organization sponsoringOrg,
List<OrganizationSponsorship> sponsorships,
SutProvider<OrganizationSponsorshipsController> sutProvider)
{
// Arrange
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(sponsoringOrg.Id).Returns(sponsoringOrg);
sutProvider.GetDependency<ICurrentContext>().OrganizationOwner(sponsoringOrg.Id).Returns(true);
sutProvider.GetDependency<ICurrentContext>().OrganizationAdmin(sponsoringOrg.Id).Returns(false);
// Create a CurrentContextOrganization from the sponsoringOrg
var currentContextOrg = new CurrentContextOrganization
{
Id = sponsoringOrg.Id,
Permissions = new Permissions { ManageUsers = true }
};
sutProvider.GetDependency<ICurrentContext>().Organizations.Returns(new List<CurrentContextOrganization> { currentContextOrg });
sutProvider.GetDependency<IOrganizationSponsorshipRepository>()
.GetManyBySponsoringOrganizationAsync(sponsoringOrg.Id).Returns(sponsorships);
// Act
var result = await sutProvider.Sut.GetSponsoredOrganizations(sponsoringOrg.Id);
// Assert
Assert.Equal(sponsorships.Count, result.Data.Count());
await sutProvider.GetDependency<IOrganizationSponsorshipRepository>().Received(1)
.GetManyBySponsoringOrganizationAsync(sponsoringOrg.Id);
}
}