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

[PM-11622] use organization domains (#5560)

Browse Source 
* DBO changes

* Add migration scripts

* wip

* wip

* wip

* add EF migrations

* run dotnet format

* cleanup

* revert business logic

* wip

* add update statement to mssql migration script

* fix user service tests

* increment license, add UseOrganizationDomains

* add migration helpers to seed initial value from UseSso

* clean up

* cleanup

* fix mssql migrations

* fix license version and test

* fix file names

* fix license json

* add missing property to license test

* rename file

* fix migrations

* fix migration

* add WHERE to helper scripts

* separate schema/data migrations

* restore comment

* Merge conflict

* fix migrations

* add new property to migration

* wip

* fix file names

* fix file name
This commit is contained in:
Brandon Treston
2025-05-15 10:42:51 -04:00
committed by GitHub
parent 9e2562fc8d
commit 81bff5e5cf
53 changed files with 10139 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/Core.Test/Models/Business/OrganizationLicenseFileFixtures.cs
View File

@ -35,7 +35,7 @@ public static class OrganizationLicenseFileFixtures
if (!LicenseVersions.ContainsKey(licenseVersion))
{
throw new Exception(
$"Cannot find serialized license version {licenseVersion}. You must add this to OrganizationLicenseFileFixtures when adding a new license version.");
$"Cannot find serialized license version {licenseVersion}. You must add this to OrganizationLicenseFileFixtures when adding a new license version.");
}
var json = LicenseVersions.GetValueOrDefault(licenseVersion).Replace("'", "\"");
@ -76,6 +76,7 @@ public static class OrganizationLicenseFileFixtures
MaxCollections = 2,
UsePolicies = true,
UseSso = true,
UseOrganizationDomains = true,
UseKeyConnector = true,
UseScim = true,
UseGroups = true,

3
test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs
View File

@ -86,7 +86,8 @@ public class UpdateOrganizationLicenseCommandTests
"Id", "MaxStorageGb", "Issued", "Refresh", "Version", "Trial", "LicenseType",
"Hash", "Signature", "SignatureBytes", "InstallationId", "Expires",
"ExpirationWithoutGracePeriod", "Token", "LimitCollectionCreationDeletion",
"LimitCollectionCreation", "LimitCollectionDeletion", "AllowAdminAccessToAllCollectionItems") &&
"LimitCollectionCreation", "LimitCollectionDeletion", "AllowAdminAccessToAllCollectionItems",
"UseOrganizationDomains", "UseAdminSponsoredFamilies") &&
// Same property but different name, use explicit mapping
org.ExpirationDate == license.Expires));
}