nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-21 04:55:08 -05:00
Code

WIP

Browse Source
This commit is contained in:
Jonas Hendrickx 2025-03-14 13:27:46 +01:00
parent ef207e5ec6
commit f752050d2b
2 changed files with 276 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
util/Migrator/DbScripts/2025-03-14_00_AddUseAdminInitiatedSponsorship.sql
View File

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

11
util/Migrator/DbScripts/2025-03-14_01_AddUseAdminInitiatedSponsorship_RefreshView.sql
View File

@ -1,4 +1,3 @@
/* Alter view to include UseAdminSponsoredFamilies */
CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView] CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView]
AS AS
SELECT SELECT
@ -47,12 +46,12 @@ SELECT
O.[UsePasswordManager], O.[UsePasswordManager],
O.[SmSeats], O.[SmSeats],
O.[SmServiceAccounts], O.[SmServiceAccounts],
O.[LimitCollectionCreationDeletion], -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
O.[LimitCollectionCreation], O.[LimitCollectionCreation],
O.[LimitCollectionDeletion], O.[LimitCollectionDeletion],
O.[AllowAdminAccessToAllCollectionItems], O.[AllowAdminAccessToAllCollectionItems],
O.[UseRiskInsights], O.[UseRiskInsights],
O.[UseAdminSponsoredFamilies] O.[UseAdminSponsoredFamilies],
O.[LimitItemDeletion]
FROM FROM
[dbo].[OrganizationUser] OU [dbo].[OrganizationUser] OU
LEFT JOIN LEFT JOIN
@ -69,7 +68,6 @@ FROM
[dbo].[OrganizationSponsorship] OS ON OS.[SponsoringOrganizationUserID] = OU.[Id] [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] CREATE OR ALTER VIEW [dbo].[ProviderUserProviderOrganizationDetailsView]
AS AS
SELECT SELECT
@ -104,12 +102,13 @@ SELECT
PU.[Id] ProviderUserId, PU.[Id] ProviderUserId,
P.[Name] ProviderName, P.[Name] ProviderName,
O.[PlanType], O.[PlanType],
O.[LimitCollectionCreationDeletion], -- Deprecated https://bitwarden.atlassian.net/browse/PM-10863
O.[LimitCollectionCreation], O.[LimitCollectionCreation],
O.[LimitCollectionDeletion], O.[LimitCollectionDeletion],
O.[AllowAdminAccessToAllCollectionItems], O.[AllowAdminAccessToAllCollectionItems],
O.[UseRiskInsights], O.[UseRiskInsights],
O.[UseAdminSponsoredFamilies] O.[UseAdminSponsoredFamilies],
P.[Type] ProviderType,
O.[LimitItemDeletion]
FROM FROM
[dbo].[ProviderUser] PU [dbo].[ProviderUser] PU
INNER JOIN INNER JOIN