mirror of
https://github.com/bitwarden/server
synced 2025-12-22 03:03:33 +00:00
update cipher archive/unarchive and cipher deatils query
This commit is contained in:
@@ -25,7 +25,10 @@ public class Cipher : ITableObject<Guid>, ICloneable
|
|||||||
public DateTime? DeletedDate { get; set; }
|
public DateTime? DeletedDate { get; set; }
|
||||||
public Enums.CipherRepromptType? Reprompt { get; set; }
|
public Enums.CipherRepromptType? Reprompt { get; set; }
|
||||||
public string Key { get; set; }
|
public string Key { get; set; }
|
||||||
|
// Deprecated. Left for backwards compatibility with old archive handling.
|
||||||
|
// Remove after all clients migrate to the Archives JSON column.
|
||||||
public DateTime? ArchivedDate { get; set; }
|
public DateTime? ArchivedDate { get; set; }
|
||||||
|
public string Archives { get; set; }
|
||||||
|
|
||||||
public void SetNewId()
|
public void SetNewId()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -34,7 +34,9 @@ public class CipherDetailsQuery : IQuery<CipherDetails>
|
|||||||
FolderId = (_ignoreFolders || !_userId.HasValue || c.Folders == null || !c.Folders.ToLowerInvariant().Contains(_userId.Value.ToString())) ?
|
FolderId = (_ignoreFolders || !_userId.HasValue || c.Folders == null || !c.Folders.ToLowerInvariant().Contains(_userId.Value.ToString())) ?
|
||||||
null :
|
null :
|
||||||
CoreHelpers.LoadClassFromJsonData<Dictionary<Guid, Guid>>(c.Folders)[_userId.Value],
|
CoreHelpers.LoadClassFromJsonData<Dictionary<Guid, Guid>>(c.Folders)[_userId.Value],
|
||||||
ArchivedDate = c.ArchivedDate,
|
ArchivedDate = !_userId.HasValue || c.Archives == null || !c.Archives.ToLowerInvariant().Contains(_userId.Value.ToString()) ?
|
||||||
|
null :
|
||||||
|
CoreHelpers.LoadClassFromJsonData<Dictionary<Guid, DateTime>>(c.Archives)[_userId.Value],
|
||||||
};
|
};
|
||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,11 @@ BEGIN
|
|||||||
UPDATE
|
UPDATE
|
||||||
[dbo].[Cipher]
|
[dbo].[Cipher]
|
||||||
SET
|
SET
|
||||||
[ArchivedDate] = @UtcNow,
|
[ArchivedDate] = JSON_MODIFY(
|
||||||
|
COALESCE([Archives], N'{}'),
|
||||||
|
'$."' + CONVERT(NVARCHAR(36), @UserId) + '"',
|
||||||
|
@UtcNow
|
||||||
|
),
|
||||||
[RevisionDate] = @UtcNow
|
[RevisionDate] = @UtcNow
|
||||||
WHERE
|
WHERE
|
||||||
[Id] IN (SELECT [Id] FROM #Temp)
|
[Id] IN (SELECT [Id] FROM #Temp)
|
||||||
|
|||||||
@@ -26,7 +26,11 @@ BEGIN
|
|||||||
UPDATE
|
UPDATE
|
||||||
[dbo].[Cipher]
|
[dbo].[Cipher]
|
||||||
SET
|
SET
|
||||||
[ArchivedDate] = NULL,
|
[Archives] = JSON_MODIFY(
|
||||||
|
COALESCE([Archives], N'{}'),
|
||||||
|
'$."' + CONVERT(NVARCHAR(36), @UserId) + '"',
|
||||||
|
NULL
|
||||||
|
),
|
||||||
[RevisionDate] = @UtcNow
|
[RevisionDate] = @UtcNow
|
||||||
WHERE
|
WHERE
|
||||||
[Id] IN (SELECT [Id] FROM #Temp)
|
[Id] IN (SELECT [Id] FROM #Temp)
|
||||||
|
|||||||
@@ -160,3 +160,105 @@ FROM
|
|||||||
WHERE
|
WHERE
|
||||||
C.[UserId] = @UserId;
|
C.[UserId] = @UserId;
|
||||||
GO
|
GO
|
||||||
|
|
||||||
|
IF OBJECT_ID('[dbo].[Cipher_Archive]') IS NOT NULL
|
||||||
|
BEGIN
|
||||||
|
DROP PROCEDURE [dbo].[Cipher_Archive];
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
|
||||||
|
CREATE 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
|
||||||
|
[Id],
|
||||||
|
[UserId]
|
||||||
|
FROM
|
||||||
|
[dbo].[UserCipherDetails](@UserId)
|
||||||
|
WHERE
|
||||||
|
[Edit] = 1
|
||||||
|
AND [ArchivedDate] IS NULL
|
||||||
|
AND [Id] IN (SELECT * FROM @Ids)
|
||||||
|
|
||||||
|
DECLARE @UtcNow DATETIME2(7) = SYSUTCDATETIME();
|
||||||
|
UPDATE
|
||||||
|
[dbo].[Cipher]
|
||||||
|
SET
|
||||||
|
[ArchivedDate] = JSON_MODIFY(
|
||||||
|
COALESCE([Archives], N'{}'),
|
||||||
|
'$."' + CONVERT(NVARCHAR(36), @UserId) + '"',
|
||||||
|
@UtcNow
|
||||||
|
),
|
||||||
|
[RevisionDate] = @UtcNow
|
||||||
|
WHERE
|
||||||
|
[Id] IN (SELECT [Id] FROM #Temp)
|
||||||
|
|
||||||
|
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||||
|
|
||||||
|
DROP TABLE #Temp
|
||||||
|
|
||||||
|
SELECT @UtcNow
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
|
||||||
|
IF OBJECT_ID('[dbo].[Cipher_Unarchive]') IS NOT NULL
|
||||||
|
BEGIN
|
||||||
|
DROP PROCEDURE [dbo].[Cipher_Unarchive];
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
|
||||||
|
CREATE 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
|
||||||
|
[Id],
|
||||||
|
[UserId]
|
||||||
|
FROM
|
||||||
|
[dbo].[UserCipherDetails](@UserId)
|
||||||
|
WHERE
|
||||||
|
[Edit] = 1
|
||||||
|
AND [ArchivedDate] IS NOT NULL
|
||||||
|
AND [Id] IN (SELECT * FROM @Ids)
|
||||||
|
|
||||||
|
DECLARE @UtcNow DATETIME2(7) = SYSUTCDATETIME();
|
||||||
|
UPDATE
|
||||||
|
[dbo].[Cipher]
|
||||||
|
SET
|
||||||
|
[Archives] = JSON_MODIFY(
|
||||||
|
COALESCE([Archives], N'{}'),
|
||||||
|
'$."' + CONVERT(NVARCHAR(36), @UserId) + '"',
|
||||||
|
NULL
|
||||||
|
),
|
||||||
|
[RevisionDate] = @UtcNow
|
||||||
|
WHERE
|
||||||
|
[Id] IN (SELECT [Id] FROM #Temp)
|
||||||
|
|
||||||
|
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||||
|
|
||||||
|
DROP TABLE #Temp
|
||||||
|
|
||||||
|
SELECT @UtcNow
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
|||||||
Reference in New Issue
Block a user