Generate sqllite migration

bitwarden · Sep 3, 2024 · eca4cfc · eca4cfc
1 parent edf0454
commit eca4cfc
Show file tree

Hide file tree

Showing 5 changed files with 2,718 additions and 4 deletions.
diff --git a/src/Core/AdminConsole/Entities/Organization.cs b/src/Core/AdminConsole/Entities/Organization.cs
@@ -301,7 +301,7 @@ public void UpdateFromLicense(OrganizationLicense license)
         SmSeats = license.SmSeats;
         SmServiceAccounts = license.SmServiceAccounts;
         // license.LimitCollectionCreationDeletion is deprecated, but is
-        // ingested here to support older license version.
+        // ingested here to support older license versions.
         LimitCollectionCreation = (license.LimitCollectionCreation || license.LimitCollectionCreationDeletion);
         AllowAdminAccessToAllCollectionItems = license.AllowAdminAccessToAllCollectionItems;
     }

diff --git a/...e.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs b/...e.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs
@@ -80,9 +80,14 @@ await sutProvider.GetDependency<IOrganizationService>()
                 .ReplaceAndUpdateCacheAsync(Arg.Is<Organization>(
                     org => AssertPropertyEqual(license, org,
                         "Id", "MaxStorageGb", "Issued", "Refresh", "Version", "Trial", "LicenseType",
-                        "Hash", "Signature", "SignatureBytes", "InstallationId", "Expires", "ExpirationWithoutGracePeriod") &&
+                        "Hash", "Signature", "SignatureBytes", "InstallationId", "Expires", "ExpirationWithoutGracePeriod",
+                        "LimitCollectionCreationDeletion") &&
                          // Same property but different name, use explicit mapping
-                         org.ExpirationDate == license.Expires));
+                         org.ExpirationDate == license.Expires &&
+                         // LimitCollectionCreation was renamed from
+                         // LimitCollectionCreationDeletion in V16
+                         org.LimitCollectionCreation == (license.LimitCollectionCreation || license.LimitCollectionCreationDeletion)
+                         ));
         }
         finally
         {