mirror of
https://github.com/bitwarden/server.git
synced 2026-01-31 14:13:18 +08:00
[PM-30448] - remove edit requirement for cipher archiving (#6830)
* remove edit requirement for cipher archiving * update cipher_archive/unarchive sql * update cipher_archive/unarchive sql * fix sql * update sql * update sql
This commit is contained in:
@@ -0,0 +1,89 @@
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Cipher_Unarchive]
|
||||
@Ids AS [dbo].[GuidIdArray] READONLY,
|
||||
@UserId AS UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
CREATE TABLE #Temp
|
||||
(
|
||||
[Id] UNIQUEIDENTIFIER NOT NULL,
|
||||
[UserId] UNIQUEIDENTIFIER NULL
|
||||
)
|
||||
|
||||
INSERT INTO #Temp
|
||||
SELECT
|
||||
ucd.[Id],
|
||||
ucd.[UserId]
|
||||
FROM
|
||||
[dbo].[UserCipherDetails](@UserId) ucd
|
||||
INNER JOIN @Ids ids ON ids.Id = ucd.[Id]
|
||||
WHERE
|
||||
ucd.[ArchivedDate] IS NOT NULL
|
||||
|
||||
DECLARE @UtcNow DATETIME2(7) = SYSUTCDATETIME();
|
||||
UPDATE
|
||||
[dbo].[Cipher]
|
||||
SET
|
||||
[Archives] = JSON_MODIFY(
|
||||
COALESCE([Archives], N'{}'),
|
||||
CONCAT('$."', @UserId, '"'),
|
||||
NULL
|
||||
),
|
||||
[RevisionDate] = @UtcNow
|
||||
FROM [dbo].[Cipher] AS c
|
||||
INNER JOIN #Temp AS t
|
||||
ON t.[Id] = c.[Id];
|
||||
|
||||
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||
|
||||
DROP TABLE #Temp
|
||||
|
||||
SELECT @UtcNow
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Cipher_Archive]
|
||||
@Ids AS [dbo].[GuidIdArray] READONLY,
|
||||
@UserId AS UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
CREATE TABLE #Temp
|
||||
(
|
||||
[Id] UNIQUEIDENTIFIER NOT NULL,
|
||||
[UserId] UNIQUEIDENTIFIER NULL
|
||||
)
|
||||
|
||||
INSERT INTO #Temp
|
||||
SELECT
|
||||
ucd.[Id],
|
||||
ucd.[UserId]
|
||||
FROM
|
||||
[dbo].[UserCipherDetails](@UserId) ucd
|
||||
INNER JOIN @Ids ids ON ids.Id = ucd.[Id]
|
||||
WHERE
|
||||
ucd.[ArchivedDate] IS NULL
|
||||
|
||||
DECLARE @UtcNow DATETIME2(7) = SYSUTCDATETIME();
|
||||
UPDATE
|
||||
[dbo].[Cipher]
|
||||
SET
|
||||
[Archives] = JSON_MODIFY(
|
||||
COALESCE([Archives], N'{}'),
|
||||
CONCAT('$."', @UserId, '"'),
|
||||
CONVERT(NVARCHAR(30), @UtcNow, 127)
|
||||
),
|
||||
[RevisionDate] = @UtcNow
|
||||
FROM [dbo].[Cipher] AS c
|
||||
INNER JOIN #Temp AS t
|
||||
ON t.[Id] = c.[Id];
|
||||
|
||||
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||
|
||||
DROP TABLE #Temp
|
||||
|
||||
SELECT @UtcNow
|
||||
END
|
||||
GO
|
||||
Reference in New Issue
Block a user