bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-05 18:13:31 +00:00
Code Issues Releases Wiki Activity

Updating SM to Sm, and adding more view refreshes

Browse Source
This commit is contained in:
cd-bitwarden
2025-11-05 21:50:36 -05:00
parent 7db2a840e6
commit 2bca8b1f07
28 changed files with 90 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/Core.Test/AdminConsole/Entities/OrganizationTests.cs
View File

@@ -98,21 +98,21 @@ public class OrganizationTests
}
[Fact]
public void UseDisableSMAdsForUsers_DefaultValue_IsFalse()
public void UseDisableSmAdsForUsers_DefaultValue_IsFalse()
{
var organization = new Organization();
Assert.False(organization.UseDisableSMAdsForUsers);
Assert.False(organization.UseDisableSmAdsForUsers);
}
[Fact]
public void UseDisableSMAdsForUsers_CanBeSetToTrue()
public void UseDisableSmAdsForUsers_CanBeSetToTrue()
{
var organization = new Organization
{
UseDisableSMAdsForUsers = true
UseDisableSmAdsForUsers = true
};
Assert.True(organization.UseDisableSMAdsForUsers);
Assert.True(organization.UseDisableSmAdsForUsers);
}
}

32
test/Core.Test/Billing/Models/Business/OrganizationLicenseTests.cs
View File

@@ -214,7 +214,7 @@ If you believe you need to change the version for a valid reason, please discuss
AllowAdminAccessToAllCollectionItems = true,
UseOrganizationDomains = true,
UseAdminSponsoredFamilies = false,
UseDisableSMAdsForUsers = false
UseDisableSmAdsForUsers = false
};
}
@@ -260,4 +260,34 @@ If you believe you need to change the version for a valid reason, please discuss
.Returns([0x00, 0x01, 0x02, 0x03]); // Dummy signature for hash testing
return mockService;
}
/// <summary>
/// Verifies that UseDisableSmAdsForUsers claim is properly generated in the license Token
/// and that VerifyData correctly validates the claim.
/// </summary>
[Theory]
[BitAutoData(true)]
[BitAutoData(false)]
public void OrganizationLicense_UseDisableSmAdsForUsers_ClaimGenerationAndValidation(bool useDisableSmAdsForUsers, ClaimsPrincipal claimsPrincipal)
{
// Arrange
var organization = CreateDeterministicOrganization();
organization.UseDisableSmAdsForUsers = useDisableSmAdsForUsers;
var subscriptionInfo = CreateDeterministicSubscriptionInfo();
var installationId = new Guid("78900000-0000-0000-0000-000000000123");
var mockLicensingService = CreateMockLicensingService();
var license = new OrganizationLicense(organization, subscriptionInfo, installationId, mockLicensingService);
license.Expires = DateTime.MaxValue; // Prevent expiration during test
var globalSettings = Substitute.For<IGlobalSettings>();
globalSettings.Installation.Returns(new GlobalSettings.InstallationSettings
{
Id = installationId
});
// Act & Assert - Verify VerifyData passes with the UseDisableSmAdsForUsers value
Assert.True(license.VerifyData(organization, claimsPrincipal, globalSettings));
}
}