Deleted date on Cipher table, related sprocs and repositories updated

src/Sql/dbo/Functions/CipherDetails.sql

@@ -24,6 +24,7 @@ SELECT
             OR C.[Folders] IS NULL
         THEN NULL
         ELSE TRY_CONVERT(UNIQUEIDENTIFIER, JSON_VALUE(C.[Folders], CONCAT('$."', @UserId, '"')))
-    END [FolderId]
+    END [FolderId],
+    C.[DeletedDate]
 FROM
     [dbo].[Cipher] C

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

@@ -1,5 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserId]
-    @UserId UNIQUEIDENTIFIER
+    @UserId UNIQUEIDENTIFIER,
+    @Deleted BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -8,4 +9,7 @@ BEGIN
         *
     FROM
         [dbo].[UserCipherDetails](@UserId)
+    WHERE
+        (@Deleted = 1 AND [DeletedDate] IS NOT NULL)
+        OR (@Deleted = 0 AND [DeletedDate] IS NULL)
 END

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

@@ -1,5 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
-    @UserId UNIQUEIDENTIFIER
+    @UserId UNIQUEIDENTIFIER,
+    @Deleted BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -12,4 +13,9 @@ BEGIN
         [dbo].[CipherDetails](@UserId)
     WHERE
         [UserId] = @UserId
+        AND
+        (
+            (@Deleted = 1 AND [DeletedDate] IS NOT NULL)
+            OR (@Deleted = 0 AND [DeletedDate] IS NULL)
+        )
 END

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

@@ -1,5 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherOrganizationDetails_ReadById]
-    @Id UNIQUEIDENTIFIER
+    @Id UNIQUEIDENTIFIER,
+    @Deleted BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -16,4 +17,9 @@ BEGIN
         [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
     WHERE
         C.[Id] = @Id
+        AND
+        (
+            (@Deleted = 1 AND [DeletedDate] IS NOT NULL)
+            OR (@Deleted = 0 AND [DeletedDate] IS NULL)
+        )
 END

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

@@ -1,6 +1,7 @@
 CREATE PROCEDURE [dbo].[Cipher_Delete]
     @Ids AS [dbo].[GuidIdArray] READONLY,
-    @UserId AS UNIQUEIDENTIFIER
+    @UserId AS UNIQUEIDENTIFIER,
+    @Permanent AS BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -26,11 +27,23 @@ BEGIN
         AND [Id] IN (SELECT * FROM @Ids)
 
     -- Delete ciphers
-    DELETE
-    FROM
-        [dbo].[Cipher]
-    WHERE
-        [Id] IN (SELECT [Id] FROM #Temp)
+    IF @Permanent = 1
+    BEGIN
+        DELETE
+        FROM
+            [dbo].[Cipher]
+        WHERE
+            [Id] IN (SELECT [Id] FROM #Temp)
+    END
+    ELSE
+    BEGIN
+        UPDATE
+            [dbo].[Cipher]
+        SET
+            [DeletedDate] = SYSUTCDATETIME()
+        WHERE
+            [Id] IN (SELECT [Id] FROM #Temp)
+    END
 
     -- Cleanup orgs
     DECLARE @OrgId UNIQUEIDENTIFIER
@@ -46,7 +59,11 @@ BEGIN
     OPEN [OrgCursor]
     FETCH NEXT FROM [OrgCursor] INTO @OrgId
     WHILE @@FETCH_STATUS = 0 BEGIN
-        EXEC [dbo].[Organization_UpdateStorage] @OrgId
+        -- Storage cleanup for groups only matters if we're permanently deleting
+        IF @Permanent = 1
+        BEGIN
+            EXEC [dbo].[Organization_UpdateStorage] @OrgId
+        END
         EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
         FETCH NEXT FROM [OrgCursor] INTO @OrgId
     END
@@ -54,18 +71,22 @@ BEGIN
     DEALLOCATE [OrgCursor]
 
     -- Cleanup user
-    DECLARE @UserCiphersWithStorageCount INT
-    SELECT
-        @UserCiphersWithStorageCount = COUNT(1)
-    FROM
-        #Temp
-    WHERE
-        [UserId] IS NOT NULL
-        AND [Attachments] = 1
-
-    IF @UserCiphersWithStorageCount > 0
+    IF @Permanent = 1
     BEGIN
-        EXEC [dbo].[User_UpdateStorage] @UserId
+        -- Storage cleanup for users only matters if we're permanently deleting
+        DECLARE @UserCiphersWithStorageCount INT
+        SELECT
+            @UserCiphersWithStorageCount = COUNT(1)
+        FROM
+            #Temp
+        WHERE
+            [UserId] IS NOT NULL
+            AND [Attachments] = 1
+
+        IF @UserCiphersWithStorageCount > 0
+        BEGIN
+            EXEC [dbo].[User_UpdateStorage] @UserId
+        END
     END
     EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
 

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

@@ -1,5 +1,6 @@
 CREATE PROCEDURE [dbo].[Cipher_DeleteById]
-    @Id UNIQUEIDENTIFIER
+    @Id UNIQUEIDENTIFIER,
+    @Permanent AS BIT = 0
 WITH RECOMPILE
 AS
 BEGIN
@@ -17,16 +18,28 @@ BEGIN
         [dbo].[Cipher]
     WHERE
         [Id] = @Id
-
-    DELETE
-    FROM
-        [dbo].[Cipher]
-    WHERE
-        [Id] = @Id
+        
+    IF @Permanent = 1
+    BEGIN
+        DELETE
+        FROM
+            [dbo].[Cipher]
+        WHERE
+            [Id] = @Id
+    END
+    ELSE
+    BEGIN
+        UPDATE
+            [dbo].[Cipher]
+        SET
+            [DeletedDate] = SYSUTCDATETIME()
+        WHERE
+            [Id] = @Id
+    END
 
     IF @OrganizationId IS NOT NULL
     BEGIN
-        IF @Attachments = 1
+        IF @Attachments = 1 AND @Permanent = 1
         BEGIN
             EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
         END
@@ -34,7 +47,7 @@ BEGIN
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN
-        IF @Attachments = 1
+        IF @Attachments = 1 AND @Permanent = 1
         BEGIN
             EXEC [dbo].[User_UpdateStorage] @UserId
         END

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

@@ -1,5 +1,6 @@
 CREATE PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
-    @OrganizationId UNIQUEIDENTIFIER
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Deleted BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -11,4 +12,9 @@ BEGIN
     WHERE
         [UserId] IS NULL
         AND [OrganizationId] = @OrganizationId
+        AND
+        (
+            (@Deleted = 1 AND [DeletedDate] IS NOT NULL)
+            OR (@Deleted = 0 AND [DeletedDate] IS NULL)
+        )
 END

src/Sql/dbo/Tables/Cipher.sql

@@ -9,6 +9,7 @@
     [Attachments]    NVARCHAR (MAX)   NULL,
     [CreationDate]   DATETIME2 (7)    NOT NULL,
     [RevisionDate]   DATETIME2 (7)    NOT NULL,
+    [DeletedDate]    DATETIME2 (7)    NULL,
     CONSTRAINT [PK_Cipher] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_Cipher_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]),
     CONSTRAINT [FK_Cipher_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])