Merge branch 'master' of https://github.com/bitwarden/server into feature/hide-passwords

# Conflicts:
#	src/Sql/dbo/Stored Procedures/CollectionUser_UpdateUsers.sql
#	src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateWithCollections.sql

appveyor.yml

@@ -86,7 +86,7 @@ build_script:
       $env:swaggerGen = "true"
       $env:ASPNETCORE_ENVIRONMENT = "Production"
       cd .\src\Api
-      dotnet swagger tofile --output ..\..\swagger.json --host api.bitwarden.com `
+      dotnet swagger tofile --output ..\..\swagger.json --host https://api.bitwarden.com `
         .\bin\Debug\netcoreapp3.1\Api.dll public
       cd ..\..
       $env:ASPNETCORE_ENVIRONMENT = ""

scripts/bitwarden.ps1

@@ -23,8 +23,8 @@ if ($output -eq "") {
 
 $scriptsDir = "${output}\scripts"
 $githubBaseUrl = "https://raw.githubusercontent.com/bitwarden/server/master"
-$coreVersion = "1.33.1"
+$coreVersion = "1.34.0"
-$webVersion = "2.13.2"
+$webVersion = "2.14.0"
 
 # Functions
 

scripts/bitwarden.sh

@@ -37,8 +37,8 @@ fi
 
 SCRIPTS_DIR="$OUTPUT/scripts"
 GITHUB_BASE_URL="https://raw.githubusercontent.com/bitwarden/server/master"
-COREVERSION="1.33.1"
+COREVERSION="1.34.0"
-WEBVERSION="2.13.2"
+WEBVERSION="2.14.0"
 
 # Functions
 

src/Api/Startup.cs

@@ -188,12 +188,10 @@ namespace Bit.Api
                 app.UseSwagger(config =>
                 {
                     config.RouteTemplate = "specs/{documentName}/swagger.json";
-                    var host = globalSettings.BaseServiceUri.Api.Replace("https://", string.Empty)
-                        .Replace("http://", string.Empty);
                     config.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
                         swaggerDoc.Servers = new List<OpenApiServer>
                         {
-                            new OpenApiServer { Url = $"{httpReq.Scheme}://{host}" }
+                            new OpenApiServer { Url = globalSettings.BaseServiceUri.Api }
                         });
                 });
                 app.UseSwaggerUI(config =>

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

@@ -14,40 +14,61 @@ BEGIN
             [Id] = @CollectionId
     )
 
-    ;WITH [AvailableUsersCTE] AS(
+    -- Update
-        SELECT
+    UPDATE
-            Id
+        [Target]
-        FROM
+    SET
-            [dbo].[OrganizationUser]
+        [Target].[ReadOnly] = [Source].[ReadOnly],
-        WHERE
+        [Target].[HidePasswords] = [Source].[HidePasswords]
-            OrganizationId = @OrgId
+    FROM
-    )
+        [dbo].[CollectionUser] [Target]
-    MERGE
+    INNER JOIN
-        [dbo].[CollectionUser] AS [Target]
+        @Users [Source] ON [Source].[Id] = [Target].[OrganizationUserId]
-    USING 
+    WHERE
-        @Users AS [Source]
-    ON
         [Target].[CollectionId] = @CollectionId
-        AND [Target].[OrganizationUserId] = [Source].[Id]
+        AND (
-    WHEN NOT MATCHED BY TARGET
+            [Target].[ReadOnly] != [Source].[ReadOnly]
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableUsersCTE]) THEN
+            OR [Target].[HidePasswords] != [Source].[HidePasswords]
-        INSERT VALUES
+        )
-        (
+
-            @CollectionId,
+    -- Insert
-            [Source].[Id],
+    INSERT INTO
-            [Source].[ReadOnly],
+        [dbo].[CollectionUser]
-            [Source].[HidePasswords]
+    SELECT
+        @CollectionId,
+        [Source].[Id],
+        [Source].[ReadOnly],
+        [Source].[HidePasswords]
+    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]
         )
-    WHEN MATCHED AND (
-        [Target].[ReadOnly] != [Source].[ReadOnly]
-        OR [Target].[HidePasswords] != [Source].[HidePasswords]
-    ) THEN
-        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
-                   [Target].[HidePasswords] = [Source].[HidePasswords]
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[CollectionId] = @CollectionId THEN
-        DELETE
-    ;
 
     EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrgId
 END

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

@@ -14,33 +14,42 @@ BEGIN
             [Id] = @OrganizationUserId
     )
 
-    ;WITH [AvailableGroupsCTE] AS(
+    -- Insert
-        SELECT
+    INSERT INTO
-            [Id]
+        [dbo].[GroupUser]
-        FROM
+    SELECT
-            [dbo].[Group]
+        [Source].[Id],
-        WHERE
+        @OrganizationUserId
-            [OrganizationId] = @OrgId
+    FROM
-    )
+        @GroupIds [Source]
-    MERGE
+    INNER JOIN
-        [dbo].[GroupUser] AS [Target]
+        [dbo].[Group] G ON G.[Id] = [Source].[Id] AND G.[OrganizationId] = @OrgId
-    USING 
+    WHERE
-        @GroupIds AS [Source]
+        NOT EXISTS (
-    ON
+            SELECT
-        [Target].[GroupId] = [Source].[Id]
+                1
-        AND [Target].[OrganizationUserId] = @OrganizationUserId
+            FROM
-    WHEN NOT MATCHED BY TARGET
+                [dbo].[GroupUser]
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN
+            WHERE
-        INSERT VALUES
+                [OrganizationUserId] = @OrganizationUserId
-        (
+                AND [GroupId] = [Source].[Id]
-            [Source].[Id],
+        )
-            @OrganizationUserId
+    
+    -- Delete
+    DELETE
+        GU
+    FROM
+        [dbo].[GroupUser] GU
+    WHERE
+        GU.[OrganizationUserId] = @OrganizationUserId
+        AND NOT EXISTS (
+            SELECT
+                1
+            FROM
+                @GroupIds
+            WHERE
+                [Id] = GU.[GroupId]
         )
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[OrganizationUserId] = @OrganizationUserId
-    AND [Target].[GroupId] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN
-        DELETE
-    ;
 
     EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @OrganizationUserId
 END

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

@@ -14,33 +14,42 @@ BEGIN
             [Id] = @GroupId
     )
 
-    ;WITH [AvailableUsersCTE] AS(
+    -- Insert
-        SELECT
+    INSERT INTO
-            [Id]
+        [dbo].[GroupUser]
-        FROM
+    SELECT
-            [dbo].[OrganizationUser]
+        @GroupId,
-        WHERE
+        [Source].[Id]
-            [OrganizationId] = @OrgId
+    FROM
-    )
-    MERGE
-        [dbo].[GroupUser] AS [Target]
-    USING 
         @OrganizationUserIds AS [Source]
-    ON
+    INNER JOIN
-        [Target].[GroupId] = @GroupId
+        [dbo].[OrganizationUser] OU ON [Source].[Id] = OU.[Id] AND OU.[OrganizationId] = @OrgId
-        AND [Target].[OrganizationUserId] = [Source].[Id]
+    WHERE
-    WHEN NOT MATCHED BY TARGET
+        NOT EXISTS (
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableUsersCTE]) THEN
+            SELECT
-        INSERT VALUES
+                1
-        (
+            FROM
-            @GroupId,
+                [dbo].[GroupUser]
-            [Source].[Id]
+            WHERE
+                [GroupId] = @GroupId
+                AND [OrganizationUserId] = [Source].[Id]
+        )
+    
+    -- Delete
+    DELETE
+        GU
+    FROM
+        [dbo].[GroupUser] GU
+    WHERE
+        GU.[GroupId] = @GroupId
+        AND NOT EXISTS (
+            SELECT
+                1
+            FROM
+                @OrganizationUserIds
+            WHERE
+                [Id] = GU.[OrganizationUserId]
         )
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[GroupId] = @GroupId
-    AND [Target].[OrganizationUserId] IN (SELECT [Id] FROM [AvailableUsersCTE]) THEN
-        DELETE
-    ;
 
     EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
 END

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

@@ -17,38 +17,59 @@ BEGIN
 
     EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
 
-    ;WITH [AvailableCollectionsCTE] AS(
+    -- Update
-        SELECT
+    UPDATE
-            Id
+        [Target]
-        FROM
+    SET
-            [dbo].[Collection]
+        [Target].[ReadOnly] = [Source].[ReadOnly],
-        WHERE
+        [Target].[HidePasswords] = [Source].[HidePasswords]
-            OrganizationId = @OrganizationId
+    FROM
-    )
-    MERGE
         [dbo].[CollectionUser] AS [Target]
-    USING 
+    INNER JOIN
-        @Collections AS [Source]
+        @Collections AS [Source] ON [Source].[Id] = [Target].[CollectionId]
-    ON
+    WHERE
-        [Target].[CollectionId] = [Source].[Id]
+        [Target].[OrganizationUserId] = @Id
-        AND [Target].[OrganizationUserId] = @Id
+        AND (
-    WHEN NOT MATCHED BY TARGET
+            [Target].[ReadOnly] != [Source].[ReadOnly]
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
+            OR [Target].[HidePasswords] != [Source].[HidePasswords]
-        INSERT VALUES
+        )
-        (
+
-            [Source].[Id],
+    -- Insert
-            @Id,
+    INSERT INTO
-            [Source].[ReadOnly],
+        [dbo].[CollectionUser]
-            [Source].[HidePasswords]
+    SELECT
+        [Source].[Id],
+        @Id,
+        [Source].[ReadOnly],
+        [Source].[HidePasswords]
+    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]
         )
-    WHEN MATCHED AND (
-        [Target].[ReadOnly] != [Source].[ReadOnly]
-        OR [Target].[HidePasswords] != [Source].[HidePasswords]
-    ) THEN
-        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
-                   [Target].[HidePasswords] = [Source].[HidePasswords]
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[OrganizationUserId] = @Id THEN
-        DELETE
-    ;
 END

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

@@ -11,7 +11,7 @@ BEGIN
         U.[AccountRevisionDate] = GETUTCDATE()
     FROM
         [dbo].[User] U
-    LEFT JOIN
+    INNER JOIN
         [dbo].[OrganizationUser] OU ON OU.[UserId] = U.[Id]
     LEFT JOIN
         [dbo].[CollectionCipher] CC ON CC.[CipherId] = @CipherId
@@ -24,16 +24,12 @@ BEGIN
     LEFT JOIN
         [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId] AND CG.[CollectionId] = CC.[CollectionId]
     WHERE
-        OU.[Status] = 2 -- 2 = Confirmed
+        OU.[OrganizationId] = @OrganizationId
+        AND OU.[Status] = 2 -- 2 = Confirmed
         AND (
             CU.[CollectionId] IS NOT NULL
             OR CG.[CollectionId] IS NOT NULL
-            OR (
+            OR OU.[AccessAll] = 1
-                OU.[OrganizationId] = @OrganizationId
+            OR G.[AccessAll] = 1
-                AND (
-                    OU.[AccessAll] = 1
-                    OR G.[AccessAll] = 1
-                )
-            )
         )
 END

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

@@ -11,7 +11,7 @@ BEGIN
         U.[AccountRevisionDate] = GETUTCDATE()
     FROM
         [dbo].[User] U
-    LEFT JOIN
+    INNER JOIN
         [dbo].[OrganizationUser] OU ON OU.[UserId] = U.[Id]
     LEFT JOIN
         [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id] AND CU.[CollectionId] = @CollectionId
@@ -22,16 +22,12 @@ BEGIN
     LEFT JOIN
         [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId] AND CG.[CollectionId] = @CollectionId
     WHERE
-        OU.[Status] = 2 -- 2 = Confirmed
+        OU.[OrganizationId] = @OrganizationId
+        AND OU.[Status] = 2 -- 2 = Confirmed
         AND (
             CU.[CollectionId] IS NOT NULL
             OR CG.[CollectionId] IS NOT NULL
-            OR (
+            OR OU.[AccessAll] = 1
-                OU.[OrganizationId] = @OrganizationId
+            OR G.[AccessAll] = 1
-                AND (
-                    OU.[AccessAll] = 1
-                    OR G.[AccessAll] = 1
-                )
-            )
         )
 END

util/Migrator/DbScripts/2020-05-02_00_SprocPerfTweaks.sql

@@ -0,0 +1,368 @@
+/**
+ * Performance updates to various sprocs
+ */
+
+IF OBJECT_ID('[dbo].[CollectionUser_UpdateUsers]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[CollectionUser_UpdateUsers];
+END
+GO
+
+CREATE PROCEDURE [dbo].[CollectionUser_UpdateUsers]
+    @CollectionId UNIQUEIDENTIFIER,
+    @Users AS [dbo].[SelectionReadOnlyArray] 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]
+    FROM
+        [dbo].[CollectionUser] [Target]
+    INNER JOIN
+        @Users [Source] ON [Source].[Id] = [Target].[OrganizationUserId]
+    WHERE
+        [Target].[CollectionId] = @CollectionId
+        AND [Target].[ReadOnly] != [Source].[ReadOnly]
+
+    -- Insert
+    INSERT INTO
+        [dbo].[CollectionUser]
+    SELECT
+        @CollectionId,
+        [Source].[Id],
+        [Source].[ReadOnly]
+    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
+GO
+
+IF OBJECT_ID('[dbo].[GroupUser_UpdateGroups]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[GroupUser_UpdateGroups];
+END
+GO
+
+CREATE PROCEDURE [dbo].[GroupUser_UpdateGroups]
+    @OrganizationUserId UNIQUEIDENTIFIER,
+    @GroupIds AS [dbo].[GuidIdArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @OrgId UNIQUEIDENTIFIER = (
+        SELECT TOP 1
+            [OrganizationId]
+        FROM
+            [dbo].[OrganizationUser]
+        WHERE
+            [Id] = @OrganizationUserId
+    )
+
+    -- Insert
+    INSERT INTO
+        [dbo].[GroupUser]
+    SELECT
+        [Source].[Id],
+        @OrganizationUserId
+    FROM
+        @GroupIds [Source]
+    INNER JOIN
+        [dbo].[Group] G ON G.[Id] = [Source].[Id] AND G.[OrganizationId] = @OrgId
+    WHERE
+        NOT EXISTS (
+            SELECT
+                1
+            FROM
+                [dbo].[GroupUser]
+            WHERE
+                [OrganizationUserId] = @OrganizationUserId
+                AND [GroupId] = [Source].[Id]
+        )
+    
+    -- Delete
+    DELETE
+        GU
+    FROM
+        [dbo].[GroupUser] GU
+    WHERE
+        GU.[OrganizationUserId] = @OrganizationUserId
+        AND NOT EXISTS (
+            SELECT
+                1
+            FROM
+                @GroupIds
+            WHERE
+                [Id] = GU.[GroupId]
+        )
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @OrganizationUserId
+END
+GO
+
+IF OBJECT_ID('[dbo].[GroupUser_UpdateUsers]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[GroupUser_UpdateUsers];
+END
+GO
+
+CREATE PROCEDURE [dbo].[GroupUser_UpdateUsers]
+    @GroupId UNIQUEIDENTIFIER,
+    @OrganizationUserIds AS [dbo].[GuidIdArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @OrgId UNIQUEIDENTIFIER = (
+        SELECT TOP 1
+            [OrganizationId]
+        FROM
+            [dbo].[Group]
+        WHERE
+            [Id] = @GroupId
+    )
+
+    -- Insert
+    INSERT INTO
+        [dbo].[GroupUser]
+    SELECT
+        @GroupId,
+        [Source].[Id]
+    FROM
+        @OrganizationUserIds AS [Source]
+    INNER JOIN
+        [dbo].[OrganizationUser] OU ON [Source].[Id] = OU.[Id] AND OU.[OrganizationId] = @OrgId
+    WHERE
+        NOT EXISTS (
+            SELECT
+                1
+            FROM
+                [dbo].[GroupUser]
+            WHERE
+                [GroupId] = @GroupId
+                AND [OrganizationUserId] = [Source].[Id]
+        )
+    
+    -- Delete
+    DELETE
+        GU
+    FROM
+        [dbo].[GroupUser] GU
+    WHERE
+        GU.[GroupId] = @GroupId
+        AND NOT EXISTS (
+            SELECT
+                1
+            FROM
+                @OrganizationUserIds
+            WHERE
+                [Id] = GU.[OrganizationUserId]
+        )
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
+END
+GO
+
+IF OBJECT_ID('[dbo].[OrganizationUser_UpdateWithCollections]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections];
+END
+GO
+
+CREATE PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @Email NVARCHAR(50),
+    @Key VARCHAR(MAX),
+    @Status TINYINT,
+    @Type TINYINT,
+    @AccessAll BIT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Collections AS [dbo].[SelectionReadOnlyArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
+
+    -- Update
+    UPDATE
+        [Target]
+    SET
+        [Target].[ReadOnly] = [Source].[ReadOnly]
+    FROM
+        [dbo].[CollectionUser] AS [Target]
+    INNER JOIN
+        @Collections AS [Source] ON [Source].[Id] = [Target].[CollectionId]
+    WHERE
+        [Target].[OrganizationUserId] = @Id
+        AND [Target].[ReadOnly] != [Source].[ReadOnly]
+
+    -- Insert
+    INSERT INTO
+        [dbo].[CollectionUser]
+    SELECT
+        [Source].[Id],
+        @Id,
+        [Source].[ReadOnly]
+    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
+
+IF OBJECT_ID('[dbo].[User_BumpAccountRevisionDateByCipherId]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[User_BumpAccountRevisionDateByCipherId];
+END
+GO
+
+CREATE PROCEDURE [dbo].[User_BumpAccountRevisionDateByCipherId]
+    @CipherId UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        U
+    SET
+        U.[AccountRevisionDate] = GETUTCDATE()
+    FROM
+        [dbo].[User] U
+    INNER JOIN
+        [dbo].[OrganizationUser] OU ON OU.[UserId] = U.[Id]
+    LEFT JOIN
+        [dbo].[CollectionCipher] CC ON CC.[CipherId] = @CipherId
+    LEFT JOIN
+        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id] AND CU.[CollectionId] = CC.[CollectionId]
+    LEFT JOIN
+        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
+    LEFT JOIN
+        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
+    LEFT JOIN
+        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId] AND CG.[CollectionId] = CC.[CollectionId]
+    WHERE
+        OU.[OrganizationId] = @OrganizationId
+        AND OU.[Status] = 2 -- 2 = Confirmed
+        AND (
+            CU.[CollectionId] IS NOT NULL
+            OR CG.[CollectionId] IS NOT NULL
+            OR OU.[AccessAll] = 1
+            OR G.[AccessAll] = 1
+        )
+END
+GO
+
+IF OBJECT_ID('[dbo].[User_BumpAccountRevisionDateByCollectionId]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[User_BumpAccountRevisionDateByCollectionId];
+END
+GO
+
+CREATE PROCEDURE [dbo].[User_BumpAccountRevisionDateByCollectionId]
+    @CollectionId UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        U
+    SET
+        U.[AccountRevisionDate] = GETUTCDATE()
+    FROM
+        [dbo].[User] U
+    INNER JOIN
+        [dbo].[OrganizationUser] OU ON OU.[UserId] = U.[Id]
+    LEFT JOIN
+        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id] AND CU.[CollectionId] = @CollectionId
+    LEFT JOIN
+        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
+    LEFT JOIN
+        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
+    LEFT JOIN
+        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId] AND CG.[CollectionId] = @CollectionId
+    WHERE
+        OU.[OrganizationId] = @OrganizationId
+        AND OU.[Status] = 2 -- 2 = Confirmed
+        AND (
+            CU.[CollectionId] IS NOT NULL
+            OR CG.[CollectionId] IS NOT NULL
+            OR OU.[AccessAll] = 1
+            OR G.[AccessAll] = 1
+        )
+END
+GO