nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 16:42:50 -05:00
Code Activity

renaming collection linq predicates

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-27 09:39:21 -04:00
parent 755da8c38f
commit 77aec3977c
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core/Models/Api/Request/CollectionUserRequestModel.cs
View File

@ -12,11 +12,11 @@ namespace Bit.Core.Models.Api
public IEnumerable<CollectionUser> ToCollectionUsers()
{
return Collections.Select(s => new CollectionUser
return Collections.Select(c => new CollectionUser
{
OrganizationUserId = new Guid(UserId),
CollectionId = new Guid(s.CollectionId),
ReadOnly = s.ReadOnly
CollectionId = new Guid(c.CollectionId),
ReadOnly = c.ReadOnly
});
}

6
src/Core/Models/Api/Response/CipherResponseModel.cs
View File

@ -79,7 +79,7 @@ namespace Bit.Core.Models.Api
{
if(collectionCiphers.ContainsKey(cipher.Id))
{
CollectionIds = collectionCiphers[cipher.Id].Select(s => s.CollectionId);
CollectionIds = collectionCiphers[cipher.Id].Select(c => c.CollectionId);
}
else
{
@ -91,7 +91,7 @@ namespace Bit.Core.Models.Api
string obj = "cipherDetails")
: base(cipher, obj)
{
CollectionIds = collectionCiphers.Select(s => s.CollectionId);
CollectionIds = collectionCiphers.Select(c => c.CollectionId);
}
public IEnumerable<Guid> CollectionIds { get; set; }
@ -105,7 +105,7 @@ namespace Bit.Core.Models.Api
{
if(collectionCiphers.ContainsKey(cipher.Id))
{
CollectionIds = collectionCiphers[cipher.Id].Select(s => s.CollectionId);
CollectionIds = collectionCiphers[cipher.Id].Select(c => c.CollectionId);
}
else
{

2
src/Core/Models/Api/Response/OrganizationUserResponseModel.cs
View File

@ -41,7 +41,7 @@ namespace Bit.Core.Models.Api
: base(organizationUser, "organizationUserDetails")
{
Collections = new ListResponseModel<OrganizationUserCollectionResponseModel>(
collections.Select(s => new OrganizationUserCollectionResponseModel(s)));
collections.Select(c => new OrganizationUserCollectionResponseModel(c)));
}
public ListResponseModel<OrganizationUserCollectionResponseModel> Collections { get; set; }

8
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -900,10 +900,10 @@ namespace Bit.Core.Services
var currentUserCollections = newUser ? null : await _collectionUserRepository.GetManyByOrganizationUserIdAsync(user.Id);
// Let's make sure all these belong to this user and organization.
var filteredCollections = collections.Where(s => orgCollections.Any(os => os.Id == s.CollectionId));
var filteredCollections = collections.Where(c => orgCollections.Any(os => os.Id == c.CollectionId));
foreach(var collection in filteredCollections)
{
var existingCollectionUser = currentUserCollections?.FirstOrDefault(cs => cs.CollectionId == collection.CollectionId);
var existingCollectionUser = currentUserCollections?.FirstOrDefault(cu => cu.CollectionId == collection.CollectionId);
if(existingCollectionUser != null)
{
collection.Id = existingCollectionUser.Id;
@ -916,8 +916,8 @@ namespace Bit.Core.Services
if(!newUser)
{
var collectionsToDelete = currentUserCollections.Where(cs =>
!filteredCollections.Any(s => s.CollectionId == cs.CollectionId));
var collectionsToDelete = currentUserCollections.Where(cu =>
!filteredCollections.Any(c => c.CollectionId == cu.CollectionId));
foreach(var collection in collectionsToDelete)
{
await _collectionUserRepository.DeleteAsync(collection);