[AC-1683] Fix DB migrations for new Manage permission (#3307)

* [AC-1683] Update migration script and introduce V2 procedures and types

* [AC-1683] Update repository calls to use new V2 procedures / types

* [AC-1684] Update bulk add collection migration script to use new V2 type

* [AC-1683] Undo Manage changes to more original procedures

* [AC-1683] Restore whitespace changes

* [AC-1683] Clarify comments regarding explicit column lists

* [AC-1683] Update migration script dates

* [AC-1683] Split the migration script for readability

* [AC-1683] Re-name SelectReadOnlyArray_V2 to CollectionAccessSelectionType

src/Infrastructure.Dapper/AdminConsole/Repositories/GroupRepository.cs

@@ -142,7 +142,7 @@ public class GroupRepository : Repository<Group, Guid>, IGroupRepository
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.ExecuteAsync(
-                $"[{Schema}].[Group_CreateWithCollections]",
+                $"[{Schema}].[Group_CreateWithCollections_V2]",
                 objWithCollections,
                 commandType: CommandType.StoredProcedure);
         }
@@ -156,7 +156,7 @@ public class GroupRepository : Repository<Group, Guid>, IGroupRepository
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.ExecuteAsync(
-                $"[{Schema}].[Group_UpdateWithCollections]",
+                $"[{Schema}].[Group_UpdateWithCollections_V2]",
                 objWithCollections,
                 commandType: CommandType.StoredProcedure);
         }

src/Infrastructure.Dapper/DapperHelpers.cs

@@ -32,7 +32,7 @@ public static class DapperHelpers
     public static DataTable ToArrayTVP(this IEnumerable<CollectionAccessSelection> values)
     {
         var table = new DataTable();
-        table.SetTypeName("[dbo].[SelectionReadOnlyArray]");
+        table.SetTypeName("[dbo].[CollectionAccessSelectionType]");
 
         var idColumn = new DataColumn("Id", typeof(Guid));
         table.Columns.Add(idColumn);

src/Infrastructure.Dapper/Repositories/CollectionRepository.cs

@@ -221,7 +221,7 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.ExecuteAsync(
-                $"[{Schema}].[Collection_CreateWithGroupsAndUsers]",
+                $"[{Schema}].[Collection_CreateWithGroupsAndUsers_V2]",
                 objWithGroupsAndUsers,
                 commandType: CommandType.StoredProcedure);
         }
@@ -237,7 +237,7 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.ExecuteAsync(
-                $"[{Schema}].[Collection_UpdateWithGroupsAndUsers]",
+                $"[{Schema}].[Collection_UpdateWithGroupsAndUsers_V2]",
                 objWithGroupsAndUsers,
                 commandType: CommandType.StoredProcedure);
         }
@@ -294,7 +294,7 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.ExecuteAsync(
-                $"[{Schema}].[CollectionUser_UpdateUsers]",
+                $"[{Schema}].[CollectionUser_UpdateUsers_V2]",
                 new { CollectionId = id, Users = users.ToArrayTVP() },
                 commandType: CommandType.StoredProcedure);
         }

src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs

@@ -326,7 +326,7 @@ public class OrganizationUserRepository : Repository<OrganizationUser, Guid>, IO
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.ExecuteAsync(
-                $"[{Schema}].[OrganizationUser_CreateWithCollections]",
+                $"[{Schema}].[OrganizationUser_CreateWithCollections_V2]",
                 objWithCollections,
                 commandType: CommandType.StoredProcedure);
         }
@@ -343,7 +343,7 @@ public class OrganizationUserRepository : Repository<OrganizationUser, Guid>, IO
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.ExecuteAsync(
-                $"[{Schema}].[OrganizationUser_UpdateWithCollections]",
+                $"[{Schema}].[OrganizationUser_UpdateWithCollections_V2]",
                 objWithCollections,
                 commandType: CommandType.StoredProcedure);
         }

src/Sql/dbo/Stored Procedures/CollectionUser_UpdateUsers.sql

@@ -19,8 +19,7 @@ BEGIN
         [Target]
     SET
         [Target].[ReadOnly] = [Source].[ReadOnly],
-        [Target].[HidePasswords] = [Source].[HidePasswords],
-        [Target].[Manage] = [Source].[Manage]
+        [Target].[HidePasswords] = [Source].[HidePasswords]
     FROM
         [dbo].[CollectionUser] [Target]
     INNER JOIN
@@ -30,18 +29,21 @@ BEGIN
         AND (
             [Target].[ReadOnly] != [Source].[ReadOnly]
             OR [Target].[HidePasswords] != [Source].[HidePasswords]
-            OR [Target].[Manage] != [Source].[Manage]
         )
 
-    -- Insert
-    INSERT INTO
-        [dbo].[CollectionUser]
+    -- Insert (with column list because a value for Manage is not being provided)
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly],
+        [HidePasswords]
+    )
     SELECT
         @CollectionId,
         [Source].[Id],
         [Source].[ReadOnly],
-        [Source].[HidePasswords],
-        [Source].[Manage]
+        [Source].[HidePasswords]
     FROM
         @Users [Source]
     INNER JOIN
@@ -56,7 +58,7 @@ BEGIN
                 [CollectionId] = @CollectionId
                 AND [OrganizationUserId] = [Source].[Id]
         )
-    
+
     -- Delete
     DELETE
         CU

src/Sql/dbo/Stored Procedures/CollectionUser_UpdateUsers_V2.sql

@@ -0,0 +1,83 @@
+CREATE PROCEDURE [dbo].[CollectionUser_UpdateUsers_V2]
+    @CollectionId UNIQUEIDENTIFIER,
+    @Users AS [dbo].[CollectionAccessSelectionType] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @OrgId UNIQUEIDENTIFIER = (
+        SELECT TOP 1
+            [OrganizationId]
+        FROM
+            [dbo].[Collection]
+        WHERE
+            [Id] = @CollectionId
+    )
+
+    -- Update
+    UPDATE
+        [Target]
+    SET
+        [Target].[ReadOnly] = [Source].[ReadOnly],
+        [Target].[HidePasswords] = [Source].[HidePasswords],
+        [Target].[Manage] = [Source].[Manage]
+    FROM
+        [dbo].[CollectionUser] [Target]
+    INNER JOIN
+        @Users [Source] ON [Source].[Id] = [Target].[OrganizationUserId]
+    WHERE
+        [Target].[CollectionId] = @CollectionId
+        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
+        @CollectionId,
+        [Source].[Id],
+        [Source].[ReadOnly],
+        [Source].[HidePasswords],
+        [Source].[Manage]
+    FROM
+        @Users [Source]
+    INNER JOIN
+        [dbo].[OrganizationUser] OU ON [Source].[Id] = OU.[Id] AND OU.[OrganizationId] = @OrgId
+    WHERE
+        NOT EXISTS (
+            SELECT
+                1
+            FROM
+                [dbo].[CollectionUser]
+            WHERE
+                [CollectionId] = @CollectionId
+                AND [OrganizationUserId] = [Source].[Id]
+        )
+
+    -- Delete
+    DELETE
+        CU
+    FROM
+        [dbo].[CollectionUser] CU
+    WHERE
+        CU.[CollectionId] = @CollectionId
+        AND NOT EXISTS (
+            SELECT
+                1
+            FROM
+                @Users
+            WHERE
+                [Id] = CU.[OrganizationUserId]
+        )
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrgId
+END

src/Sql/dbo/Stored Procedures/Collection_CreateOrUpdateAccessForMany.sql

@@ -1,8 +1,8 @@
 CREATE PROCEDURE [dbo].[Collection_CreateOrUpdateAccessForMany]
 	@OrganizationId UNIQUEIDENTIFIER,
 	@CollectionIds AS [dbo].[GuidIdArray] READONLY,
-    @Groups AS [dbo].[SelectionReadOnlyArray] READONLY,
-    @Users AS [dbo].[SelectionReadOnlyArray] READONLY
+    @Groups AS [dbo].[CollectionAccessSelectionType] READONLY,
+    @Users AS [dbo].[CollectionAccessSelectionType] READONLY
 AS
 BEGIN
 	SET NOCOUNT ON
@@ -41,7 +41,15 @@ BEGIN
 		[Target].[HidePasswords] = [Source].[HidePasswords],
 		[Target].[Manage] = [Source].[Manage]
 	WHEN NOT MATCHED BY TARGET
-		THEN INSERT VALUES
+		THEN INSERT
+	    (
+	        [CollectionId],
+	        [GroupId],
+	        [ReadOnly],
+	        [HidePasswords],
+	        [Manage]
+        )
+	    VALUES
 		(
 			[Source].[CollectionId],
 			[Source].[GroupId],
@@ -84,7 +92,15 @@ BEGIN
 		[Target].[HidePasswords] = [Source].[HidePasswords],
 		[Target].[Manage] = [Source].[Manage]
 	WHEN NOT MATCHED BY TARGET
-		THEN INSERT VALUES
+	    THEN INSERT
+	    (
+	        [CollectionId],
+	        [OrganizationUserId],
+	        [ReadOnly],
+	        [HidePasswords],
+	        [Manage]
+        )
+	    VALUES
 		(
 			[Source].[CollectionId],
 			[Source].[OrganizationUserId],

src/Sql/dbo/Stored Procedures/Collection_CreateWithGroupsAndUsers.sql

@@ -27,15 +27,13 @@ BEGIN
         [CollectionId],
         [GroupId],
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     )
     SELECT
         @Id,
         [Id],
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     FROM
         @Groups
     WHERE
@@ -55,19 +53,17 @@ BEGIN
         [CollectionId],
         [OrganizationUserId],
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     )
     SELECT
         @Id,
         [Id],
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     FROM
         @Users
     WHERE
         [Id] IN (SELECT [Id] FROM [AvailableUsersCTE])
 
     EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-END
+END

src/Sql/dbo/Stored Procedures/Collection_CreateWithGroupsAndUsers_V2.sql

@@ -0,0 +1,73 @@
+CREATE PROCEDURE [dbo].[Collection_CreateWithGroupsAndUsers_V2]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name VARCHAR(MAX),
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Groups AS [dbo].[CollectionAccessSelectionType] READONLY,
+    @Users AS [dbo].[CollectionAccessSelectionType] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[Collection_Create] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate
+
+    -- Groups
+    ;WITH [AvailableGroupsCTE] AS(
+        SELECT
+            [Id]
+        FROM
+            [dbo].[Group]
+        WHERE
+            [OrganizationId] = @OrganizationId
+    )
+    INSERT INTO [dbo].[CollectionGroup]
+    (
+        [CollectionId],
+        [GroupId],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    )
+    SELECT
+        @Id,
+        [Id],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    FROM
+        @Groups
+    WHERE
+        [Id] IN (SELECT [Id] FROM [AvailableGroupsCTE])
+
+    -- Users
+    ;WITH [AvailableUsersCTE] AS(
+        SELECT
+            [Id]
+        FROM
+            [dbo].[OrganizationUser]
+        WHERE
+            [OrganizationId] = @OrganizationId
+    )
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    )
+    SELECT
+        @Id,
+        [Id],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    FROM
+        @Users
+    WHERE
+        [Id] IN (SELECT [Id] FROM [AvailableUsersCTE])
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+END

src/Sql/dbo/Stored Procedures/Collection_UpdateWithGroupsAndUsers.sql

@@ -24,29 +24,33 @@ BEGIN
     )
     MERGE
         [dbo].[CollectionGroup] AS [Target]
-    USING 
+    USING
         @Groups AS [Source]
     ON
         [Target].[CollectionId] = @Id
         AND [Target].[GroupId] = [Source].[Id]
     WHEN NOT MATCHED BY TARGET
     AND [Source].[Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN
-        INSERT VALUES
+        INSERT -- With column list because a value for Manage is not being provided
+        (
+	        [CollectionId],
+	        [GroupId],
+	        [ReadOnly],
+	        [HidePasswords]
+    	)
+        VALUES
         (
             @Id,
             [Source].[Id],
             [Source].[ReadOnly],
-            [Source].[HidePasswords],
-            [Source].[Manage]
+            [Source].[HidePasswords]
         )
     WHEN MATCHED AND (
         [Target].[ReadOnly] != [Source].[ReadOnly]
         OR [Target].[HidePasswords] != [Source].[HidePasswords]
-        OR [Target].[Manage] != [Source].[Manage]
     ) THEN
         UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
-                   [Target].[HidePasswords] = [Source].[HidePasswords],
-                   [Target].[Manage] = [Source].[Manage]
+                   [Target].[HidePasswords] = [Source].[HidePasswords]
     WHEN NOT MATCHED BY SOURCE
     AND [Target].[CollectionId] = @Id THEN
         DELETE
@@ -63,29 +67,33 @@ BEGIN
     )
     MERGE
         [dbo].[CollectionUser] AS [Target]
-    USING 
+    USING
         @Users AS [Source]
     ON
         [Target].[CollectionId] = @Id
         AND [Target].[OrganizationUserId] = [Source].[Id]
     WHEN NOT MATCHED BY TARGET
     AND [Source].[Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN
-        INSERT VALUES
+        INSERT -- With column list because a value for Manage is not being provided
+        (
+	        [CollectionId],
+	        [OrganizationUserId],
+	        [ReadOnly],
+	        [HidePasswords]
+    	)
+        VALUES
         (
             @Id,
             [Source].[Id],
             [Source].[ReadOnly],
-            [Source].[HidePasswords],
-            [Source].[Manage]
+            [Source].[HidePasswords]
         )
     WHEN MATCHED AND (
         [Target].[ReadOnly] != [Source].[ReadOnly]
         OR [Target].[HidePasswords] != [Source].[HidePasswords]
-        OR [Target].[Manage] != [Source].[Manage]
     ) THEN
         UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
-                   [Target].[HidePasswords] = [Source].[HidePasswords],
-                   [Target].[Manage] = [Source].[Manage]
+                   [Target].[HidePasswords] = [Source].[HidePasswords]
     WHEN NOT MATCHED BY SOURCE
     AND [Target].[CollectionId] = @Id THEN
         DELETE

src/Sql/dbo/Stored Procedures/Collection_UpdateWithGroupsAndUsers_V2.sql

@@ -0,0 +1,111 @@
+CREATE PROCEDURE [dbo].[Collection_UpdateWithGroupsAndUsers_V2]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name VARCHAR(MAX),
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Groups AS [dbo].[CollectionAccessSelectionType] READONLY,
+    @Users AS [dbo].[CollectionAccessSelectionType] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[Collection_Update] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate
+
+    -- Groups
+    ;WITH [AvailableGroupsCTE] AS(
+        SELECT
+            Id
+        FROM
+            [dbo].[Group]
+        WHERE
+            OrganizationId = @OrganizationId
+    )
+    MERGE
+        [dbo].[CollectionGroup] AS [Target]
+    USING
+        @Groups AS [Source]
+    ON
+        [Target].[CollectionId] = @Id
+        AND [Target].[GroupId] = [Source].[Id]
+    WHEN NOT MATCHED BY TARGET
+    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN
+        INSERT -- Add explicit column list
+        (
+	        [CollectionId],
+	        [GroupId],
+	        [ReadOnly],
+	        [HidePasswords],
+            [Manage]
+    	)
+        VALUES
+        (
+            @Id,
+            [Source].[Id],
+            [Source].[ReadOnly],
+            [Source].[HidePasswords],
+            [Source].[Manage]
+        )
+    WHEN MATCHED AND (
+        [Target].[ReadOnly] != [Source].[ReadOnly]
+        OR [Target].[HidePasswords] != [Source].[HidePasswords]
+        OR [Target].[Manage] != [Source].[Manage]
+    ) THEN
+        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
+                   [Target].[HidePasswords] = [Source].[HidePasswords],
+                   [Target].[Manage] = [Source].[Manage]
+    WHEN NOT MATCHED BY SOURCE
+    AND [Target].[CollectionId] = @Id THEN
+        DELETE
+    ;
+
+    -- Users
+    ;WITH [AvailableGroupsCTE] AS(
+        SELECT
+            Id
+        FROM
+            [dbo].[OrganizationUser]
+        WHERE
+            OrganizationId = @OrganizationId
+    )
+    MERGE
+        [dbo].[CollectionUser] AS [Target]
+    USING
+        @Users AS [Source]
+    ON
+        [Target].[CollectionId] = @Id
+        AND [Target].[OrganizationUserId] = [Source].[Id]
+    WHEN NOT MATCHED BY TARGET
+    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN
+        INSERT
+        (
+	        [CollectionId],
+	        [OrganizationUserId],
+	        [ReadOnly],
+	        [HidePasswords],
+            [Manage]
+    	)
+        VALUES
+        (
+            @Id,
+            [Source].[Id],
+            [Source].[ReadOnly],
+            [Source].[HidePasswords],
+            [Source].[Manage]
+        )
+    WHEN MATCHED AND (
+        [Target].[ReadOnly] != [Source].[ReadOnly]
+        OR [Target].[HidePasswords] != [Source].[HidePasswords]
+        OR [Target].[Manage] != [Source].[Manage]
+    ) THEN
+        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
+                   [Target].[HidePasswords] = [Source].[HidePasswords],
+                   [Target].[Manage] = [Source].[Manage]
+    WHEN NOT MATCHED BY SOURCE
+    AND [Target].[CollectionId] = @Id THEN
+        DELETE
+    ;
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
+END

src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql

@@ -26,19 +26,17 @@ BEGIN
         [CollectionId],
         [GroupId],
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     )
     SELECT
         [Id],
         @Id,
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     FROM
         @Collections
     WHERE
         [Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE])
 
     EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-END
+END

src/Sql/dbo/Stored Procedures/Group_CreateWithCollections_V2.sql

@@ -0,0 +1,44 @@
+CREATE PROCEDURE [dbo].[Group_CreateWithCollections_V2]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name NVARCHAR(100),
+    @AccessAll BIT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Collections AS [dbo].[CollectionAccessSelectionType] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[Group_Create] @Id, @OrganizationId, @Name, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
+
+    ;WITH [AvailableCollectionsCTE] AS(
+        SELECT
+            [Id]
+        FROM
+            [dbo].[Collection]
+        WHERE
+            [OrganizationId] = @OrganizationId
+    )
+    INSERT INTO [dbo].[CollectionGroup]
+    (
+        [CollectionId],
+        [GroupId],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    )
+    SELECT
+        [Id],
+        @Id,
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    FROM
+        @Collections
+    WHERE
+        [Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE])
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+END

src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql

@@ -23,29 +23,33 @@ BEGIN
     )
     MERGE
         [dbo].[CollectionGroup] AS [Target]
-    USING 
+    USING
         @Collections AS [Source]
     ON
         [Target].[CollectionId] = [Source].[Id]
         AND [Target].[GroupId] = @Id
     WHEN NOT MATCHED BY TARGET
     AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
-        INSERT VALUES
+        INSERT -- With column list because a value for Manage is not being provided
+        (
+        	[CollectionId],
+        	[GroupId],
+        	[ReadOnly],
+        	[HidePasswords]
+    	)
+        VALUES
         (
             [Source].[Id],
             @Id,
             [Source].[ReadOnly],
-            [Source].[HidePasswords],
-            [Source].[Manage]
+            [Source].[HidePasswords]
         )
     WHEN MATCHED AND (
         [Target].[ReadOnly] != [Source].[ReadOnly]
         OR [Target].[HidePasswords] != [Source].[HidePasswords]
-        OR [Target].[Manage] != [Source].[Manage]
     ) THEN
         UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
-                   [Target].[HidePasswords] = [Source].[HidePasswords],
-                   [Target].[Manage] = [Source].[Manage]
+                   [Target].[HidePasswords] = [Source].[HidePasswords]
     WHEN NOT MATCHED BY SOURCE
     AND [Target].[GroupId] = @Id THEN
         DELETE

src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections_V2.sql

@@ -0,0 +1,63 @@
+CREATE PROCEDURE [dbo].[Group_UpdateWithCollections_V2]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name NVARCHAR(100),
+    @AccessAll BIT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Collections AS [dbo].[CollectionAccessSelectionType] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[Group_Update] @Id, @OrganizationId, @Name, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
+
+    ;WITH [AvailableCollectionsCTE] AS(
+        SELECT
+            Id
+        FROM
+            [dbo].[Collection]
+        WHERE
+            OrganizationId = @OrganizationId
+    )
+    MERGE
+        [dbo].[CollectionGroup] AS [Target]
+    USING
+        @Collections AS [Source]
+    ON
+        [Target].[CollectionId] = [Source].[Id]
+        AND [Target].[GroupId] = @Id
+    WHEN NOT MATCHED BY TARGET
+    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
+        INSERT
+        (
+        	[CollectionId],
+        	[GroupId],
+        	[ReadOnly],
+        	[HidePasswords],
+            [Manage]
+    	)
+        VALUES
+        (
+            [Source].[Id],
+            @Id,
+            [Source].[ReadOnly],
+            [Source].[HidePasswords],
+            [Source].[Manage]
+        )
+    WHEN MATCHED AND (
+        [Target].[ReadOnly] != [Source].[ReadOnly]
+        OR [Target].[HidePasswords] != [Source].[HidePasswords]
+        OR [Target].[Manage] != [Source].[Manage]
+    ) THEN
+        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
+                   [Target].[HidePasswords] = [Source].[HidePasswords],
+                   [Target].[Manage] = [Source].[Manage]
+    WHEN NOT MATCHED BY SOURCE
+    AND [Target].[GroupId] = @Id THEN
+        DELETE
+    ;
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+END

src/Sql/dbo/Stored Procedures/OrganizationUser_CreateWithCollections.sql

@@ -33,15 +33,13 @@ BEGIN
         [CollectionId],
         [OrganizationUserId],
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     )
     SELECT
         [Id],
         @Id,
         [ReadOnly],
-        [HidePasswords],
-        [Manage]
+        [HidePasswords]
     FROM
         @Collections
     WHERE

src/Sql/dbo/Stored Procedures/OrganizationUser_CreateWithCollections_V2.sql

@@ -0,0 +1,49 @@
+CREATE PROCEDURE [dbo].[OrganizationUser_CreateWithCollections_V2]
+    @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),
+    @Collections AS [dbo].[CollectionAccessSelectionType] READONLY,
+    @AccessSecretsManager BIT = 0
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[OrganizationUser_Create] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @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

src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateWithCollections.sql

@@ -24,8 +24,7 @@ BEGIN
         [Target]
     SET
         [Target].[ReadOnly] = [Source].[ReadOnly],
-        [Target].[HidePasswords] = [Source].[HidePasswords],
-        [Target].[Manage] = [Source].[Manage]
+        [Target].[HidePasswords] = [Source].[HidePasswords]
     FROM
         [dbo].[CollectionUser] AS [Target]
     INNER JOIN
@@ -35,18 +34,21 @@ BEGIN
         AND (
             [Target].[ReadOnly] != [Source].[ReadOnly]
             OR [Target].[HidePasswords] != [Source].[HidePasswords]
-            OR [Target].[Manage] != [Source].[Manage]
         )
 
-    -- Insert
-    INSERT INTO
-        [dbo].[CollectionUser]
+    -- Insert (with column list because a value for Manage is not being provided)
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly],
+        [HidePasswords]
+    )
     SELECT
         [Source].[Id],
         @Id,
         [Source].[ReadOnly],
-        [Source].[HidePasswords],
-        [Source].[Manage]
+        [Source].[HidePasswords]
     FROM
         @Collections AS [Source]
     INNER JOIN

src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateWithCollections_V2.sql

@@ -0,0 +1,86 @@
+CREATE PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections_V2]
+    @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),
+    @Collections AS [dbo].[CollectionAccessSelectionType] READONLY,
+    @AccessSecretsManager BIT = 0
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @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

src/Sql/dbo/User Defined Types/CollectionAccessSelection.sql

@@ -0,0 +1,6 @@
+CREATE TYPE [dbo].[CollectionAccessSelectionType] AS TABLE (
+    [Id]            UNIQUEIDENTIFIER NOT NULL,
+    [ReadOnly]      BIT              NOT NULL,
+    [HidePasswords] BIT              NOT NULL,
+    [Manage]        BIT              NOT NULL);
+

src/Sql/dbo/User Defined Types/SelectionReadOnlyArray.sql

@@ -1,6 +1,5 @@
 CREATE TYPE [dbo].[SelectionReadOnlyArray] AS TABLE (
     [Id]            UNIQUEIDENTIFIER NOT NULL,
     [ReadOnly]      BIT              NOT NULL,
-    [HidePasswords] BIT              NOT NULL,
-    [Manage]        BIT              NOT NULL);
+    [HidePasswords] BIT              NOT NULL);