Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-25 12:45:18 +01:00
Code Issues Projects Releases Wiki Activity

Resolved PR comments, spacing and controller code-line reversion

Browse Source
This commit is contained in:
Chad Scharf 2020-04-01 14:55:14 -04:00
parent d014a597dd
commit 1d04803bd0
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Controllers/CiphersController.cs
View File

@ -94,12 +94,8 @@ namespace Bit.Api.Controllers
Dictionary<Guid, IGrouping<Guid, CollectionCipher>> collectionCiphersGroupDict = null;
if (hasOrgs)
{
var keyMatches = ciphers.Select(c => c.Id); // Soft deletes not filtered in tweener "Get" methods
var collectionCiphers = await _collectionCipherRepository.GetManyByUserIdAsync(userId);
collectionCiphersGroupDict = collectionCiphers
.Where(c => keyMatches.Contains(c.CipherId))
.GroupBy(c => c.CipherId)
.ToDictionary(s => s.Key);
collectionCiphersGroupDict = collectionCiphers.GroupBy(c => c.CipherId).ToDictionary(s => s.Key);
}
var responses = ciphers.Select(c => new CipherDetailsResponseModel(c, _globalSettings,

2
src/Sql/dbo/Stored Procedures/Cipher_SoftDelete.sql
View File

@ -1,5 +1,5 @@
CREATE PROCEDURE [dbo].[Cipher_SoftDelete]
@Ids AS [dbo].[GuidIdArray] READONLY,
@Ids AS [dbo].[GuidIdArray] READONLY,
@UserId AS UNIQUEIDENTIFIER
AS
BEGIN