[PM-10365] Drop OrganizationUser AccessAll (bitwarden#4701)

* Remove OrganizationUser.AccessAll * Final database migrations
grepdemos · Sep 24, 2024 · f7bc5df · f7bc5df
1 parent 02fee8c
commit f7bc5df
Show file tree

Hide file tree

Showing 23 changed files with 8,918 additions and 127 deletions.
diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
@@ -105,10 +105,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         var eOrganizationDomain = builder.Entity<OrganizationDomain>();
         var aWebAuthnCredential = builder.Entity<WebAuthnCredential>();
 
-        // Shadow property configurations
-        builder.Entity<OrganizationUser>()
-            .Property<bool>("AccessAll")
-            .HasDefaultValue(false);
+        // Shadow property configurations go here
 
         eCipher.Property(c => c.Id).ValueGeneratedNever();
         eCollection.Property(c => c.Id).ValueGeneratedNever();

diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_Create.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_Create.sql
@@ -6,7 +6,6 @@
     @Key VARCHAR(MAX),
     @Status SMALLINT,
     @Type TINYINT,
-    @AccessAll BIT = 0,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7),
@@ -26,7 +25,6 @@ BEGIN
         [Key],
         [Status],
         [Type],
-        [AccessAll],
         [ExternalId],
         [CreationDate],
         [RevisionDate],
@@ -43,7 +41,6 @@ BEGIN
         @Key,
         @Status,
         @Type,
-        @AccessAll,
         @ExternalId,
         @CreationDate,
         @RevisionDate,

diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany.sql
@@ -13,7 +13,6 @@ BEGIN
         [Key],
         [Status],
         [Type],
-        [AccessAll],
         [ExternalId],
         [CreationDate],
         [RevisionDate],
@@ -29,7 +28,6 @@ BEGIN
         OUI.[Key],
         OUI.[Status],
         OUI.[Type],
-        0,  -- AccessAll will be removed shortly
         OUI.[ExternalId],
         OUI.[CreationDate],
         OUI.[RevisionDate],

diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany2.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateMany2.sql
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateWithCollections.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_CreateWithCollections.sql
@@ -6,7 +6,6 @@ CREATE PROCEDURE [dbo].[OrganizationUser_CreateWithCollections]
     @Key VARCHAR(MAX),
     @Status SMALLINT,
     @Type TINYINT,
-    @AccessAll BIT = 0,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7),
@@ -18,7 +17,7 @@ AS
 BEGIN
     SET NOCOUNT ON
 
-    EXEC [dbo].[OrganizationUser_Create] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
+    EXEC [dbo].[OrganizationUser_Create] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
 
     ;WITH [AvailableCollectionsCTE] AS(
         SELECT

diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_Update.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_Update.sql
@@ -6,7 +6,6 @@
     @Key VARCHAR(MAX),
     @Status SMALLINT,
     @Type TINYINT,
-    @AccessAll BIT = 0,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7),
@@ -26,7 +25,6 @@ BEGIN
         [Key] = @Key,
         [Status] = @Status,
         [Type] = @Type,
-        [AccessAll] = @AccessAll,
         [ExternalId] = @ExternalId,
         [CreationDate] = @CreationDate,
         [RevisionDate] = @RevisionDate,

diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany.sql
@@ -63,7 +63,6 @@ BEGIN
         [Key] = OUI.[Key],
         [Status] = OUI.[Status],
         [Type] = OUI.[Type],
-        [AccessAll] = 0, -- AccessAll will be removed shortly
         [ExternalId] = OUI.[ExternalId],
         [CreationDate] = OUI.[CreationDate],
         [RevisionDate] = OUI.[RevisionDate],

diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany2.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateMany2.sql
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateWithCollections.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateWithCollections.sql
@@ -6,7 +6,6 @@
     @Key VARCHAR(MAX),
     @Status SMALLINT,
     @Type TINYINT,
-    @AccessAll BIT = 0,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7),
@@ -18,7 +17,7 @@ AS
 BEGIN
     SET NOCOUNT ON
 
-    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
+    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
     -- Update
     UPDATE
         [Target]

diff --git a/src/Sql/dbo/Tables/OrganizationUser.sql b/src/Sql/dbo/Tables/OrganizationUser.sql
@@ -7,7 +7,6 @@
     [ResetPasswordKey]              VARCHAR (MAX)       NULL,
     [Status]                        SMALLINT            NOT NULL,
     [Type]                          TINYINT             NOT NULL,
-    [AccessAll]                     BIT                 NOT NULL,
     [ExternalId]                    NVARCHAR (300)      NULL,
     [CreationDate]                  DATETIME2 (7)       NOT NULL,
     [RevisionDate]                  DATETIME2 (7)       NOT NULL,
@@ -20,9 +19,8 @@
 
 
 GO
-CREATE NONCLUSTERED INDEX [IX_OrganizationUser_UserIdOrganizationIdStatus]
-    ON [dbo].[OrganizationUser]([UserId] ASC, [OrganizationId] ASC, [Status] ASC)
-    INCLUDE ([AccessAll]);
+CREATE NONCLUSTERED INDEX [IX_OrganizationUser_UserIdOrganizationIdStatusV2]
+    ON [dbo].[OrganizationUser]([UserId] ASC, [OrganizationId] ASC, [Status] ASC);
 
 
 GO

diff --git a/src/Sql/dbo/User Defined Types/OrganizationUserType2.sql b/src/Sql/dbo/User Defined Types/OrganizationUserType2.sql
diff --git a/util/Migrator/DbScripts/2024-09-24_00_DropOrganizationUserAccessAll_DefaultColumnValue.sql b/util/Migrator/DbScripts/2024-09-24_00_DropOrganizationUserAccessAll_DefaultColumnValue.sql
@@ -0,0 +1,11 @@
+-- Finalise removal of OrganizationUser.AccessAll column
+-- Add default column value
+-- Sprocs already have default value for rollback purposes, this just supports dropping the column itself
+
+IF OBJECT_ID('[dbo].[DF_OrganizationUser_AccessAll]', 'D') IS NULL
+  AND COL_LENGTH('[dbo].[OrganizationUser]', 'AccessAll') IS NOT NULL
+BEGIN
+    ALTER TABLE [dbo].[OrganizationUser]
+    ADD CONSTRAINT [DF_OrganizationUser_AccessAll] DEFAULT (0) FOR [AccessAll];
+END
+GO