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

* Remove OrganizationUser.AccessAll * Final database migrations
2024-11-21 12:05:42 +01:00 · 2024-09-24 16:26:35 +10:00 · 2024-09-24 16:26:35 +10:00 · f7bc5dfb2e
commit f7bc5dfb2e
parent 02fee8c1e9
23 changed files with 8918 additions and 127 deletions
--- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
@ -105,10 +105,7 @@ public class DatabaseContext : DbContext
        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();
--- a/Procedures/OrganizationUser_Create.sql
+++ b/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,
--- a/Procedures/OrganizationUser_CreateMany.sql
+++ b/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],
--- a/Procedures/OrganizationUser_CreateMany2.sql
+++ b/Procedures/OrganizationUser_CreateMany2.sql
@ -1,42 +0,0 @@
-CREATE PROCEDURE [dbo].[OrganizationUser_CreateMany2]
-    @OrganizationUsersInput [dbo].[OrganizationUserType2] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[OrganizationUser]
-        (
-        [Id],
-        [OrganizationId],
-        [UserId],
-        [Email],
-        [Key],
-        [Status],
-        [Type],
-        [AccessAll],
-        [ExternalId],
-        [CreationDate],
-        [RevisionDate],
-        [Permissions],
-        [ResetPasswordKey],
-        [AccessSecretsManager]
-        )
-    SELECT
-        OU.[Id],
-        OU.[OrganizationId],
-        OU.[UserId],
-        OU.[Email],
-        OU.[Key],
-        OU.[Status],
-        OU.[Type],
-        OU.[AccessAll],
-        OU.[ExternalId],
-        OU.[CreationDate],
-        OU.[RevisionDate],
-        OU.[Permissions],
-        OU.[ResetPasswordKey],
-        OU.[AccessSecretsManager]
-    FROM
-        @OrganizationUsersInput OU
-END
-GO
--- a/Procedures/OrganizationUser_CreateWithCollections.sql
+++ b/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
--- a/Procedures/OrganizationUser_Update.sql
+++ b/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,
--- a/Procedures/OrganizationUser_UpdateMany.sql
+++ b/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],
--- a/Procedures/OrganizationUser_UpdateMany2.sql
+++ b/Procedures/OrganizationUser_UpdateMany2.sql
@ -1,34 +0,0 @@
-CREATE PROCEDURE [dbo].[OrganizationUser_UpdateMany2]
-    @OrganizationUsersInput [dbo].[OrganizationUserType2] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        OU
-    SET
-        [OrganizationId] = OUI.[OrganizationId],
-        [UserId] = OUI.[UserId],
-        [Email] = OUI.[Email],
-        [Key] = OUI.[Key],
-        [Status] = OUI.[Status],
-        [Type] = OUI.[Type],
-        [AccessAll] = OUI.[AccessAll],
-        [ExternalId] = OUI.[ExternalId],
-        [CreationDate] = OUI.[CreationDate],
-        [RevisionDate] = OUI.[RevisionDate],
-        [Permissions] = OUI.[Permissions],
-        [ResetPasswordKey] = OUI.[ResetPasswordKey],
-        [AccessSecretsManager] = OUI.[AccessSecretsManager]
-    FROM
-        [dbo].[OrganizationUser] OU
-    INNER JOIN
-        @OrganizationUsersInput OUI ON OU.Id = OUI.Id
-
-    EXEC [dbo].[User_BumpManyAccountRevisionDates]
-    (
-        SELECT UserId
-        FROM @OrganizationUsersInput
-    )
-END
-GO
--- a/Procedures/OrganizationUser_UpdateWithCollections.sql
+++ b/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]
--- 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
--- a/Types/OrganizationUserType2.sql
+++ b/Types/OrganizationUserType2.sql
@ -1,16 +0,0 @@
-CREATE TYPE [dbo].[OrganizationUserType2] AS TABLE(
-    [Id] UNIQUEIDENTIFIER,
-    [OrganizationId] UNIQUEIDENTIFIER,
-    [UserId] UNIQUEIDENTIFIER,
-    [Email] NVARCHAR(256),
-    [Key] VARCHAR(MAX),
-    [Status] SMALLINT,
-    [Type] TINYINT,
-    [AccessAll] BIT,
-    [ExternalId] NVARCHAR(300),
-    [CreationDate] DATETIME2(7),
-    [RevisionDate] DATETIME2(7),
-    [Permissions] NVARCHAR(MAX),
-    [ResetPasswordKey] VARCHAR(MAX),
-    [AccessSecretsManager] BIT
-)
--- 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
--- a/util/Migrator/DbScripts/2024-09-24_01_DropOrganizationUserAccessAll_UpdateSprocs.sql
+++ b/util/Migrator/DbScripts/2024-09-24_01_DropOrganizationUserAccessAll_UpdateSprocs.sql
@ -0,0 +1,399 @@
+-- Finalise removal of OrganizationUser.AccessAll column
+-- Remove the column from sprocs
+
+-- Drop old sprocs and type
+IF OBJECT_ID('[dbo].[OrganizationUser_CreateMany2]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[OrganizationUser_CreateMany2]
+END
+GO
+
+IF OBJECT_ID('[dbo].[OrganizationUser_UpdateMany2]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[OrganizationUser_UpdateMany2]
+END
+GO
+
+IF TYPE_ID('[dbo].[OrganizationUserType2]') IS NOT NULL
+BEGIN
+    DROP TYPE [dbo].[OrganizationUserType2]
+END
+GO
+
+-- Update remaining sprocs
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_Create]
+    @Id UNIQUEIDENTIFIER OUTPUT,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @Email NVARCHAR(256),
+    @Key VARCHAR(MAX),
+    @Status SMALLINT,
+    @Type TINYINT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Permissions NVARCHAR(MAX),
+    @ResetPasswordKey VARCHAR(MAX),
+    @AccessSecretsManager BIT = 0
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    INSERT INTO [dbo].[OrganizationUser]
+    (
+        [Id],
+        [OrganizationId],
+        [UserId],
+        [Email],
+        [Key],
+        [Status],
+        [Type],
+        [ExternalId],
+        [CreationDate],
+        [RevisionDate],
+        [Permissions],
+        [ResetPasswordKey],
+        [AccessSecretsManager]
+    )
+    VALUES
+    (
+        @Id,
+        @OrganizationId,
+        @UserId,
+        @Email,
+        @Key,
+        @Status,
+        @Type,
+        @ExternalId,
+        @CreationDate,
+        @RevisionDate,
+        @Permissions,
+        @ResetPasswordKey,
+        @AccessSecretsManager
+    )
+END
+GO
+
+
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_CreateMany]
+    @jsonData NVARCHAR(MAX)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    INSERT INTO [dbo].[OrganizationUser]
+        (
+        [Id],
+        [OrganizationId],
+        [UserId],
+        [Email],
+        [Key],
+        [Status],
+        [Type],
+        [ExternalId],
+        [CreationDate],
+        [RevisionDate],
+        [Permissions],
+        [ResetPasswordKey],
+        [AccessSecretsManager]
+        )
+    SELECT
+        OUI.[Id],
+        OUI.[OrganizationId],
+        OUI.[UserId],
+        OUI.[Email],
+        OUI.[Key],
+        OUI.[Status],
+        OUI.[Type],
+        OUI.[ExternalId],
+        OUI.[CreationDate],
+        OUI.[RevisionDate],
+        OUI.[Permissions],
+        OUI.[ResetPasswordKey],
+        OUI.[AccessSecretsManager]
+    FROM
+        OPENJSON(@jsonData)
+        WITH (
+            [Id] UNIQUEIDENTIFIER '$.Id',
+            [OrganizationId] UNIQUEIDENTIFIER '$.OrganizationId',
+            [UserId] UNIQUEIDENTIFIER '$.UserId',
+            [Email] NVARCHAR(256) '$.Email',
+            [Key] VARCHAR(MAX) '$.Key',
+            [Status] SMALLINT '$.Status',
+            [Type] TINYINT '$.Type',
+            [ExternalId] NVARCHAR(300) '$.ExternalId',
+            [CreationDate] DATETIME2(7) '$.CreationDate',
+            [RevisionDate] DATETIME2(7) '$.RevisionDate',
+            [Permissions] NVARCHAR (MAX) '$.Permissions',
+            [ResetPasswordKey] VARCHAR (MAX) '$.ResetPasswordKey',
+            [AccessSecretsManager] BIT '$.AccessSecretsManager'
+        ) OUI
+END
+GO
+
+
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_CreateWithCollections]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @Email NVARCHAR(256),
+    @Key VARCHAR(MAX),
+    @Status SMALLINT,
+    @Type TINYINT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Permissions NVARCHAR(MAX),
+    @ResetPasswordKey VARCHAR(MAX),
+    @Collections AS [dbo].[CollectionAccessSelectionType] READONLY,
+    @AccessSecretsManager BIT = 0
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[OrganizationUser_Create] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
+
+    ;WITH [AvailableCollectionsCTE] AS(
+        SELECT
+            [Id]
+        FROM
+            [dbo].[Collection]
+        WHERE
+            [OrganizationId] = @OrganizationId
+    )
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    )
+    SELECT
+        [Id],
+        @Id,
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    FROM
+        @Collections
+    WHERE
+        [Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE])
+END
+GO
+
+
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_Update]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @Email NVARCHAR(256),
+    @Key VARCHAR(MAX),
+    @Status SMALLINT,
+    @Type TINYINT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Permissions NVARCHAR(MAX),
+    @ResetPasswordKey VARCHAR(MAX),
+    @AccessSecretsManager BIT = 0
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        [dbo].[OrganizationUser]
+    SET
+        [OrganizationId] = @OrganizationId,
+        [UserId] = @UserId,
+        [Email] = @Email,
+        [Key] = @Key,
+        [Status] = @Status,
+        [Type] = @Type,
+        [ExternalId] = @ExternalId,
+        [CreationDate] = @CreationDate,
+        [RevisionDate] = @RevisionDate,
+        [Permissions] = @Permissions,
+        [ResetPasswordKey] = @ResetPasswordKey,
+        [AccessSecretsManager] = @AccessSecretsManager
+    WHERE
+        [Id] = @Id
+
+    EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
+END
+GO
+
+
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_UpdateMany]
+    @jsonData NVARCHAR(MAX)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    -- Parse the JSON string
+    DECLARE @OrganizationUserInput AS TABLE (
+        [Id] UNIQUEIDENTIFIER,
+        [OrganizationId] UNIQUEIDENTIFIER,
+        [UserId] UNIQUEIDENTIFIER,
+        [Email] NVARCHAR(256),
+        [Key] VARCHAR(MAX),
+        [Status] SMALLINT,
+        [Type] TINYINT,
+        [ExternalId] NVARCHAR(300),
+        [CreationDate] DATETIME2(7),
+        [RevisionDate] DATETIME2(7),
+        [Permissions] NVARCHAR(MAX),
+        [ResetPasswordKey] VARCHAR(MAX),
+        [AccessSecretsManager] BIT
+    )
+
+    INSERT INTO @OrganizationUserInput
+    SELECT
+        [Id],
+        [OrganizationId],
+        [UserId],
+        [Email],
+        [Key],
+        [Status],
+        [Type],
+        [ExternalId],
+        [CreationDate],
+        [RevisionDate],
+        [Permissions],
+        [ResetPasswordKey],
+        [AccessSecretsManager]
+    FROM OPENJSON(@jsonData)
+    WITH (
+        [Id] UNIQUEIDENTIFIER '$.Id',
+        [OrganizationId] UNIQUEIDENTIFIER '$.OrganizationId',
+        [UserId] UNIQUEIDENTIFIER '$.UserId',
+        [Email] NVARCHAR(256) '$.Email',
+        [Key] VARCHAR(MAX) '$.Key',
+        [Status] SMALLINT '$.Status',
+        [Type] TINYINT '$.Type',
+        [ExternalId] NVARCHAR(300) '$.ExternalId',
+        [CreationDate] DATETIME2(7) '$.CreationDate',
+        [RevisionDate] DATETIME2(7) '$.RevisionDate',
+        [Permissions] NVARCHAR (MAX) '$.Permissions',
+        [ResetPasswordKey] VARCHAR (MAX) '$.ResetPasswordKey',
+        [AccessSecretsManager] BIT '$.AccessSecretsManager'
+    )
+
+    -- Perform the update
+    UPDATE
+        OU
+    SET
+        [OrganizationId] = OUI.[OrganizationId],
+        [UserId] = OUI.[UserId],
+        [Email] = OUI.[Email],
+        [Key] = OUI.[Key],
+        [Status] = OUI.[Status],
+        [Type] = OUI.[Type],
+        [ExternalId] = OUI.[ExternalId],
+        [CreationDate] = OUI.[CreationDate],
+        [RevisionDate] = OUI.[RevisionDate],
+        [Permissions] = OUI.[Permissions],
+        [ResetPasswordKey] = OUI.[ResetPasswordKey],
+        [AccessSecretsManager] = OUI.[AccessSecretsManager]
+    FROM
+        [dbo].[OrganizationUser] OU
+    INNER JOIN
+        @OrganizationUserInput OUI ON OU.Id = OUI.Id
+
+    -- Bump account revision dates
+    EXEC [dbo].[User_BumpManyAccountRevisionDates]
+    (
+        SELECT [UserId]
+        FROM @OrganizationUserInput
+    )
+END
+GO
+
+
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @Email NVARCHAR(256),
+    @Key VARCHAR(MAX),
+    @Status SMALLINT,
+    @Type TINYINT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Permissions NVARCHAR(MAX),
+    @ResetPasswordKey VARCHAR(MAX),
+    @Collections AS [dbo].[CollectionAccessSelectionType] READONLY,
+    @AccessSecretsManager BIT = 0
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
+    -- Update
+    UPDATE
+        [Target]
+    SET
+        [Target].[ReadOnly] = [Source].[ReadOnly],
+        [Target].[HidePasswords] = [Source].[HidePasswords],
+        [Target].[Manage] = [Source].[Manage]
+    FROM
+        [dbo].[CollectionUser] AS [Target]
+    INNER JOIN
+        @Collections AS [Source] ON [Source].[Id] = [Target].[CollectionId]
+    WHERE
+        [Target].[OrganizationUserId] = @Id
+        AND (
+            [Target].[ReadOnly] != [Source].[ReadOnly]
+            OR [Target].[HidePasswords] != [Source].[HidePasswords]
+            OR [Target].[Manage] != [Source].[Manage]
+        )
+
+    -- Insert
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    )
+    SELECT
+        [Source].[Id],
+        @Id,
+        [Source].[ReadOnly],
+        [Source].[HidePasswords],
+        [Source].[Manage]
+    FROM
+        @Collections AS [Source]
+    INNER JOIN
+        [dbo].[Collection] C ON C.[Id] = [Source].[Id] AND C.[OrganizationId] = @OrganizationId
+    WHERE
+        NOT EXISTS (
+            SELECT
+                1
+            FROM
+                [dbo].[CollectionUser]
+            WHERE
+                [CollectionId] = [Source].[Id]
+                AND [OrganizationUserId] = @Id
+        )
+
+    -- Delete
+    DELETE
+        CU
+    FROM
+        [dbo].[CollectionUser] CU
+    WHERE
+        CU.[OrganizationUserId] = @Id
+        AND NOT EXISTS (
+            SELECT
+                1
+            FROM
+                @Collections
+            WHERE
+                [Id] = CU.[CollectionId]
+        )
+END
+GO
+
--- a/util/Migrator/DbScripts/2024-09-24_02_DropOrganizationUserAccessAll_DropColumn.sql
+++ b/util/Migrator/DbScripts/2024-09-24_02_DropOrganizationUserAccessAll_DropColumn.sql
@ -0,0 +1,45 @@
+-- Finalise removal of OrganizationUser.AccessAll column
+-- Drop the column
+
+/****************************************************************
+ *
+ * WARNING: Index Rebuild on OrganizationUser Table!
+ * Ensure [IX_OrganizationUser_UserIdOrganizationIdStatus] impact is done after-hours
+ *      or scale DB instance up to handle increased load during update.
+ *
+ ***************************************************************/
+
+-- Create the new index (without the column) before we drop the old index
+PRINT N'Creating index IX_OrganizationUser_UserIdOrganizationIdStatusV2...';
+CREATE NONCLUSTERED INDEX [IX_OrganizationUser_UserIdOrganizationIdStatusV2]
+    ON [dbo].[OrganizationUser]([UserId] ASC, [OrganizationId] ASC, [Status] ASC);
+
+-- Drop the old index that refers to the column
+PRINT N'Dropping index IX_OrganizationUser_UserIdOrganizationIdStatus...';
+DROP INDEX IF EXISTS [IX_OrganizationUser_UserIdOrganizationIdStatus]
+    ON [dbo].[OrganizationUser];
+
+-- Drop default constraint
+IF OBJECT_ID('[dbo].[DF_OrganizationUser_AccessAll]', 'D') IS NOT NULL
+BEGIN
+    ALTER TABLE [dbo].[OrganizationUser]
+    DROP CONSTRAINT [DF_OrganizationUser_AccessAll];
+END
+GO
+
+-- Drop the column
+IF COL_LENGTH('[dbo].[OrganizationUser]', 'AccessAll') IS NOT NULL
+BEGIN
+    ALTER TABLE
+        [dbo].[OrganizationUser]
+    DROP COLUMN
+        [AccessAll]
+END
+GO
+
+-- Refresh views
+IF OBJECT_ID('[dbo].[OrganizationUserView]') IS NOT NULL
+    BEGIN
+        EXECUTE sp_refreshsqlmodule N'[dbo].[OrganizationUserView]';
+    END
+GO
--- a/util/MySqlMigrations/Migrations/20240924010535_DropOrganizationUserAccessAll.Designer.cs
+++ b/util/MySqlMigrations/Migrations/20240924010535_DropOrganizationUserAccessAll.Designer.cs
--- a/util/MySqlMigrations/Migrations/20240924010535_DropOrganizationUserAccessAll.cs
+++ b/util/MySqlMigrations/Migrations/20240924010535_DropOrganizationUserAccessAll.cs
@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.MySqlMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class DropOrganizationUserAccessAll : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(
+            name: "AccessAll",
+            table: "OrganizationUser");
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<bool>(
+            name: "AccessAll",
+            table: "OrganizationUser",
+            type: "tinyint(1)",
+            nullable: false,
+            defaultValue: false);
+    }
+}
--- a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
+++ b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
@ -1222,11 +1222,6 @@ namespace Bit.MySqlMigrations.Migrations
                    b.Property<Guid>("Id")
                        .HasColumnType("char(36)");

-                    b.Property<bool>("AccessAll")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("tinyint(1)")
-                        .HasDefaultValue(false);
-
                    b.Property<bool>("AccessSecretsManager")
                        .HasColumnType("tinyint(1)");

--- a/util/PostgresMigrations/Migrations/20240924010547_DropOrganizationUserAccessAll.Designer.cs
+++ b/util/PostgresMigrations/Migrations/20240924010547_DropOrganizationUserAccessAll.Designer.cs
--- a/util/PostgresMigrations/Migrations/20240924010547_DropOrganizationUserAccessAll.cs
+++ b/util/PostgresMigrations/Migrations/20240924010547_DropOrganizationUserAccessAll.cs
@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.PostgresMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class DropOrganizationUserAccessAll : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(
+            name: "AccessAll",
+            table: "OrganizationUser");
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<bool>(
+            name: "AccessAll",
+            table: "OrganizationUser",
+            type: "boolean",
+            nullable: false,
+            defaultValue: false);
+    }
+}
--- a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
+++ b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
@ -1227,11 +1227,6 @@ namespace Bit.PostgresMigrations.Migrations
                    b.Property<Guid>("Id")
                        .HasColumnType("uuid");

-                    b.Property<bool>("AccessAll")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(false);
-
                    b.Property<bool>("AccessSecretsManager")
                        .HasColumnType("boolean");

--- a/util/SqliteMigrations/Migrations/20240924010540_DropOrganizationUserAccessAll.Designer.cs
+++ b/util/SqliteMigrations/Migrations/20240924010540_DropOrganizationUserAccessAll.Designer.cs
--- a/util/SqliteMigrations/Migrations/20240924010540_DropOrganizationUserAccessAll.cs
+++ b/util/SqliteMigrations/Migrations/20240924010540_DropOrganizationUserAccessAll.cs
@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.SqliteMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class DropOrganizationUserAccessAll : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(
+            name: "AccessAll",
+            table: "OrganizationUser");
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<bool>(
+            name: "AccessAll",
+            table: "OrganizationUser",
+            type: "INTEGER",
+            nullable: false,
+            defaultValue: false);
+    }
+}
--- a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
+++ b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
@ -1211,11 +1211,6 @@ namespace Bit.SqliteMigrations.Migrations
                    b.Property<Guid>("Id")
                        .HasColumnType("TEXT");

-                    b.Property<bool>("AccessAll")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER")
-                        .HasDefaultValue(false);
-
                    b.Property<bool>("AccessSecretsManager")
                        .HasColumnType("INTEGER");