WIP

util/Migrator/DbScripts/2025-03-14_00_AddUseAdminInitiatedSponsorship.sql

@@ -1,8 +1,6 @@
-/* Introduce new column 'UseAdminSponsoredFamilies' not nullable with default of 0  */
 ALTER TABLE [dbo].[Organization] ADD [UseAdminSponsoredFamilies] bit NOT NULL CONSTRAINT [DF_Organization_UseAdminSponsoredFamilies] default (0)
     GO
 
-/* Add UseAdminSponsoredFamilies as a column to Organization_create */
 CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @Identifier NVARCHAR(50),
@@ -56,21 +54,18 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
     @MaxAutoscaleSmSeats INT= null,
     @MaxAutoscaleSmServiceAccounts INT = null,
     @SecretsManagerBeta BIT = 0,
-        @LimitCollectionCreationDeletion BIT = NULL, -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
     @LimitCollectionCreation BIT = NULL,
     @LimitCollectionDeletion BIT = NULL,
     @AllowAdminAccessToAllCollectionItems BIT = 0,
     @UseRiskInsights BIT = 0,
-        @UseAdminSponsoredFamilies BIT = 0
+    @UseAdminSponsoredFamilies BIT = 0,
-    AS
+    @LimitItemDeletion BIT = 0
+AS
 BEGIN
     SET NOCOUNT ON
 
-        SET @LimitCollectionCreation = COALESCE(@LimitCollectionCreation, @LimitCollectionCreationDeletion, 0);
+    INSERT INTO [dbo].[Organization]
-        SET @LimitCollectionDeletion = COALESCE(@LimitCollectionDeletion, @LimitCollectionCreationDeletion, 0);
+    (
-
-INSERT INTO [dbo].[Organization]
-(
         [Id],
         [Identifier],
         [Name],
@@ -123,14 +118,14 @@ INSERT INTO [dbo].[Organization]
         [MaxAutoscaleSmSeats],
         [MaxAutoscaleSmServiceAccounts],
         [SecretsManagerBeta],
-    [LimitCollectionCreationDeletion], -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
         [LimitCollectionCreation],
         [LimitCollectionDeletion],
         [AllowAdminAccessToAllCollectionItems],
         [UseRiskInsights],
-    [UseAdminSponsoredFamilies]
+        [UseAdminSponsoredFamilies],
-)
+        [LimitItemDeletion]
-VALUES
+    )
+    VALUES
     (
         @Id,
         @Identifier,
@@ -184,19 +179,18 @@ VALUES
         @MaxAutoscaleSmSeats,
         @MaxAutoscaleSmServiceAccounts,
         @SecretsManagerBeta,
-    COALESCE(@LimitCollectionCreation, @LimitCollectionDeletion, 0), -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863)
         @LimitCollectionCreation,
         @LimitCollectionDeletion,
         @AllowAdminAccessToAllCollectionItems,
         @UseRiskInsights,
-    @UseAdminSponsoredFamilies
+        @UseAdminSponsoredFamilies,
+        @LimitItemDeletion
     )
 END
 GO
 
-    /* Add UseRiskInsights to Organization_readAbilities */
+CREATE OR ALTER PROCEDURE [dbo].[Organization_ReadAbilities]
-    CREATE OR ALTER PROCEDURE [dbo].[Organization_ReadAbilities]
+AS
-    AS
 BEGIN
     SET NOCOUNT ON
 
@@ -218,19 +212,18 @@ END AS [Using2fa],
         [UseResetPassword],
         [UsePolicies],
         [Enabled],
-            [LimitCollectionCreationDeletion], -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
         [LimitCollectionCreation],
         [LimitCollectionDeletion],
         [AllowAdminAccessToAllCollectionItems],
         [UseRiskInsights],
-            [UseAdminSponsoredFamilies]
+        [UseAdminSponsoredFamilies],
+        [LimitItemDeletion]
     FROM
         [dbo].[Organization]
 END
 GO
 
-    /* Add UseRiskInsights to Organization_Update */
+CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
-    CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
     @Id UNIQUEIDENTIFIER,
     @Identifier NVARCHAR(50),
     @Name NVARCHAR(50),
@@ -283,19 +276,16 @@ GO
     @MaxAutoscaleSmSeats INT = null,
     @MaxAutoscaleSmServiceAccounts INT = null,
     @SecretsManagerBeta BIT = 0,
-        @LimitCollectionCreationDeletion BIT = null, -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
     @LimitCollectionCreation BIT = null,
     @LimitCollectionDeletion BIT = null,
     @AllowAdminAccessToAllCollectionItems BIT = 0,
     @UseRiskInsights BIT = 0,
-        @UseAdminSponsoredFamilies BIT = 0
+    @UseAdminSponsoredFamilies BIT = 0,
-    AS
+    @LimitItemDeletion BIT = 0
+AS
 BEGIN
     SET NOCOUNT ON
 
-        SET @LimitCollectionCreation = COALESCE(@LimitCollectionCreation, @LimitCollectionCreationDeletion, 0);
-        SET @LimitCollectionDeletion = COALESCE(@LimitCollectionDeletion, @LimitCollectionCreationDeletion, 0);
-
 UPDATE
     [dbo].[Organization]
 SET
@@ -350,12 +340,11 @@ SET
     [MaxAutoscaleSmSeats] = @MaxAutoscaleSmSeats,
     [MaxAutoscaleSmServiceAccounts] = @MaxAutoscaleSmServiceAccounts,
     [SecretsManagerBeta] = @SecretsManagerBeta,
-    [LimitCollectionCreationDeletion] = COALESCE(@LimitCollectionCreation, @LimitCollectionDeletion, 0),
     [LimitCollectionCreation] = @LimitCollectionCreation,
     [LimitCollectionDeletion] = @LimitCollectionDeletion,
     [AllowAdminAccessToAllCollectionItems] = @AllowAdminAccessToAllCollectionItems,
     [UseRiskInsights] = @UseRiskInsights,
-    [UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies
+    [LimitItemDeletion] = @LimitItemDeletion
 WHERE
     [Id] = @Id
 END

util/Migrator/DbScripts/2025-03-14_01_AddUseAdminInitiatedSponsorship_RefreshView.sql

@@ -1,6 +1,5 @@
-/* Alter view to include UseAdminSponsoredFamilies */
 CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-    AS
+AS
 SELECT
     OU.[UserId],
     OU.[OrganizationId],
@@ -47,12 +46,12 @@ SELECT
     O.[UsePasswordManager],
     O.[SmSeats],
     O.[SmServiceAccounts],
-    O.[LimitCollectionCreationDeletion], -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
     O.[LimitCollectionCreation],
     O.[LimitCollectionDeletion],
     O.[AllowAdminAccessToAllCollectionItems],
     O.[UseRiskInsights],
-    O.[UseAdminSponsoredFamilies]
+    O.[UseAdminSponsoredFamilies],
+    O.[LimitItemDeletion]
 FROM
     [dbo].[OrganizationUser] OU
     LEFT JOIN
@@ -67,11 +66,10 @@ FROM
     [dbo].[SsoConfig] SS ON SS.[OrganizationId] = OU.[OrganizationId]
     LEFT JOIN
     [dbo].[OrganizationSponsorship] OS ON OS.[SponsoringOrganizationUserID] = OU.[Id]
-    GO
+GO
 
-/* Alter this view to include UseAdminSponsoredFamilies column to the query */
 CREATE OR ALTER VIEW [dbo].[ProviderUserProviderOrganizationDetailsView]
-    AS
+AS
 SELECT
     PU.[UserId],
     PO.[OrganizationId],
@@ -104,12 +102,13 @@ SELECT
     PU.[Id] ProviderUserId,
     P.[Name] ProviderName,
     O.[PlanType],
-    O.[LimitCollectionCreationDeletion], -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
     O.[LimitCollectionCreation],
     O.[LimitCollectionDeletion],
     O.[AllowAdminAccessToAllCollectionItems],
     O.[UseRiskInsights],
-    O.[UseAdminSponsoredFamilies]
+    O.[UseAdminSponsoredFamilies],
+    P.[Type] ProviderType,
+    O.[LimitItemDeletion]
 FROM
     [dbo].[ProviderUser] PU
     INNER JOIN
@@ -118,25 +117,25 @@ FROM
     [dbo].[Organization] O ON O.[Id] = PO.[OrganizationId]
     INNER JOIN
     [dbo].[Provider] P ON P.[Id] = PU.[ProviderId]
-    GO
+GO
 
 
-    --Manually refresh [dbo].[OrganizationUserOrganizationDetailsView]
+--Manually refresh [dbo].[OrganizationUserOrganizationDetailsView]
-    IF OBJECT_ID('[dbo].[OrganizationUserOrganizationDetailsView]') IS NOT NULL
+IF OBJECT_ID('[dbo].[OrganizationUserOrganizationDetailsView]') IS NOT NULL
 BEGIN
 EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationUserOrganizationDetailsView]';
 END
 GO
 
-    --Manually refresh [dbo].[ProviderUserProviderOrganizationDetailsView]
+--Manually refresh [dbo].[ProviderUserProviderOrganizationDetailsView]
-    IF OBJECT_ID('[dbo].[ProviderUserProviderOrganizationDetailsView]') IS NOT NULL
+IF OBJECT_ID('[dbo].[ProviderUserProviderOrganizationDetailsView]') IS NOT NULL
 BEGIN
 EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderUserProviderOrganizationDetailsView]';
 END
 GO
 
-    --Manually refresh [dbo].[OrganizationView]
+--Manually refresh [dbo].[OrganizationView]
-    IF OBJECT_ID('[dbo].[OrganizationView]') IS NOT NULL
+IF OBJECT_ID('[dbo].[OrganizationView]') IS NOT NULL
 BEGIN
 EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationView]';
 END