mirror of
https://github.com/bitwarden/server.git
synced 2025-04-09 23:28:12 -05:00
apis for purging user vault
This commit is contained in:
parent
3e04377e67
commit
a042fd10f1
@ -353,6 +353,13 @@ namespace Bit.Api.Controllers
|
|||||||
string.IsNullOrWhiteSpace(model.FolderId) ? (Guid?)null : new Guid(model.FolderId), userId);
|
string.IsNullOrWhiteSpace(model.FolderId) ? (Guid?)null : new Guid(model.FolderId), userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost("purge")]
|
||||||
|
public async Task PostPurge()
|
||||||
|
{
|
||||||
|
var userId = _userService.GetProperUserId(User).Value;
|
||||||
|
await _cipherRepository.DeleteByUserIdAsync(userId);
|
||||||
|
}
|
||||||
|
|
||||||
[HttpPost("{id}/attachment")]
|
[HttpPost("{id}/attachment")]
|
||||||
[DisableFormValueModelBinding]
|
[DisableFormValueModelBinding]
|
||||||
public async Task<CipherResponseModel> PostAttachment(string id)
|
public async Task<CipherResponseModel> PostAttachment(string id)
|
||||||
|
@ -25,6 +25,7 @@ namespace Bit.Core.Repositories
|
|||||||
Task DeleteAttachmentAsync(Guid cipherId, string attachmentId);
|
Task DeleteAttachmentAsync(Guid cipherId, string attachmentId);
|
||||||
Task DeleteAsync(IEnumerable<Guid> ids, Guid userId);
|
Task DeleteAsync(IEnumerable<Guid> ids, Guid userId);
|
||||||
Task MoveAsync(IEnumerable<Guid> ids, Guid? folderId, Guid userId);
|
Task MoveAsync(IEnumerable<Guid> ids, Guid? folderId, Guid userId);
|
||||||
|
Task DeleteByUserIdAsync(Guid userId);
|
||||||
Task UpdateUserKeysAndCiphersAsync(User user, IEnumerable<Cipher> ciphers, IEnumerable<Folder> folders);
|
Task UpdateUserKeysAndCiphersAsync(User user, IEnumerable<Cipher> ciphers, IEnumerable<Folder> folders);
|
||||||
Task CreateAsync(IEnumerable<Cipher> ciphers, IEnumerable<Folder> folders);
|
Task CreateAsync(IEnumerable<Cipher> ciphers, IEnumerable<Folder> folders);
|
||||||
Task CreateAsync(IEnumerable<Cipher> ciphers, IEnumerable<Collection> collections,
|
Task CreateAsync(IEnumerable<Cipher> ciphers, IEnumerable<Collection> collections,
|
||||||
|
@ -235,6 +235,17 @@ namespace Bit.Core.Repositories.SqlServer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task DeleteByUserIdAsync(Guid userId)
|
||||||
|
{
|
||||||
|
using(var connection = new SqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
var results = await connection.ExecuteAsync(
|
||||||
|
$"[{Schema}].[Cipher_DeleteByUserId]",
|
||||||
|
new { UserId = userId },
|
||||||
|
commandType: CommandType.StoredProcedure);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public Task UpdateUserKeysAndCiphersAsync(User user, IEnumerable<Cipher> ciphers, IEnumerable<Folder> folders)
|
public Task UpdateUserKeysAndCiphersAsync(User user, IEnumerable<Cipher> ciphers, IEnumerable<Folder> folders)
|
||||||
{
|
{
|
||||||
using(var connection = new SqlConnection(ConnectionString))
|
using(var connection = new SqlConnection(ConnectionString))
|
||||||
|
@ -213,5 +213,6 @@
|
|||||||
<Build Include="dbo\Stored Procedures\Organization_ReadByEnabled.sql" />
|
<Build Include="dbo\Stored Procedures\Organization_ReadByEnabled.sql" />
|
||||||
<Build Include="dbo\Stored Procedures\User_ReadByPremium.sql" />
|
<Build Include="dbo\Stored Procedures\User_ReadByPremium.sql" />
|
||||||
<Build Include="dbo\Stored Procedures\CipherDetails_ReadById.sql" />
|
<Build Include="dbo\Stored Procedures\CipherDetails_ReadById.sql" />
|
||||||
|
<Build Include="dbo\Stored Procedures\Cipher_DeleteByUserId.sql" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
28
src/Sql/dbo/Stored Procedures/Cipher_DeleteByUserId.sql
Normal file
28
src/Sql/dbo/Stored Procedures/Cipher_DeleteByUserId.sql
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
CREATE PROCEDURE [dbo].[Cipher_DeleteByUserId]
|
||||||
|
@UserId AS UNIQUEIDENTIFIER
|
||||||
|
AS
|
||||||
|
BEGIN
|
||||||
|
SET NOCOUNT ON
|
||||||
|
|
||||||
|
DECLARE @BatchSize INT = 100
|
||||||
|
|
||||||
|
-- Delete ciphers
|
||||||
|
WHILE @BatchSize > 0
|
||||||
|
BEGIN
|
||||||
|
BEGIN TRANSACTION Cipher_DeleteByUserId_Ciphers
|
||||||
|
|
||||||
|
DELETE TOP(@BatchSize)
|
||||||
|
FROM
|
||||||
|
[dbo].[Cipher]
|
||||||
|
WHERE
|
||||||
|
[UserId] = @UserId
|
||||||
|
|
||||||
|
SET @BatchSize = @@ROWCOUNT
|
||||||
|
|
||||||
|
COMMIT TRANSACTION Cipher_DeleteByUserId_Ciphers
|
||||||
|
END
|
||||||
|
|
||||||
|
-- Cleanup user
|
||||||
|
EXEC [dbo].[User_UpdateStorage] @UserId
|
||||||
|
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||||
|
END
|
@ -294,3 +294,39 @@ BEGIN
|
|||||||
[Id] = @Id
|
[Id] = @Id
|
||||||
END
|
END
|
||||||
GO
|
GO
|
||||||
|
|
||||||
|
IF OBJECT_ID('[dbo].[Cipher_DeleteByUserId]') IS NOT NULL
|
||||||
|
BEGIN
|
||||||
|
DROP PROCEDURE [dbo].[Cipher_DeleteByUserId]
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
|
||||||
|
CREATE PROCEDURE [dbo].[Cipher_DeleteByUserId]
|
||||||
|
@UserId AS UNIQUEIDENTIFIER
|
||||||
|
AS
|
||||||
|
BEGIN
|
||||||
|
SET NOCOUNT ON
|
||||||
|
|
||||||
|
DECLARE @BatchSize INT = 100
|
||||||
|
|
||||||
|
-- Delete ciphers
|
||||||
|
WHILE @BatchSize > 0
|
||||||
|
BEGIN
|
||||||
|
BEGIN TRANSACTION Cipher_DeleteByUserId_Ciphers
|
||||||
|
|
||||||
|
DELETE TOP(@BatchSize)
|
||||||
|
FROM
|
||||||
|
[dbo].[Cipher]
|
||||||
|
WHERE
|
||||||
|
[UserId] = @UserId
|
||||||
|
|
||||||
|
SET @BatchSize = @@ROWCOUNT
|
||||||
|
|
||||||
|
COMMIT TRANSACTION Cipher_DeleteByUserId_Ciphers
|
||||||
|
END
|
||||||
|
|
||||||
|
-- Cleanup user
|
||||||
|
EXEC [dbo].[User_UpdateStorage] @UserId
|
||||||
|
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
Loading…
x
Reference in New Issue
Block a user