Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-25 03:21:46 +01:00
Code Issues Projects Releases Wiki Activity

include collections in sync

Browse Source
This commit is contained in:
Kyle Spearrin 2017-11-22 09:53:14 -05:00
parent 7bbf1623c7
commit a956b826cd
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Api/Controllers/SyncController.cs
View File

@ -8,6 +8,9 @@ using Bit.Core.Repositories;
using Bit.Core;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using System.Linq;
using Bit.Core.Models.Table;
using System.Collections.Generic;
namespace Bit.Api.Controllers
{
@ -18,6 +21,8 @@ namespace Bit.Api.Controllers
private readonly IUserService _userService;
private readonly IFolderRepository _folderRepository;
private readonly ICipherRepository _cipherRepository;
private readonly ICollectionRepository _collectionRepository;
private readonly ICollectionCipherRepository _collectionCipherRepository;
private readonly IOrganizationUserRepository _organizationUserRepository;
private readonly GlobalSettings _globalSettings;
@ -25,12 +30,16 @@ namespace Bit.Api.Controllers
IUserService userService,
IFolderRepository folderRepository,
ICipherRepository cipherRepository,
ICollectionRepository collectionRepository,
ICollectionCipherRepository collectionCipherRepository,
IOrganizationUserRepository organizationUserRepository,
GlobalSettings globalSettings)
{
_userService = userService;
_folderRepository = folderRepository;
_cipherRepository = cipherRepository;
_collectionRepository = collectionRepository;
_collectionCipherRepository = collectionCipherRepository;
_organizationUserRepository = organizationUserRepository;
_globalSettings = globalSettings;
}
@ -48,7 +57,19 @@ namespace Bit.Api.Controllers
OrganizationUserStatusType.Confirmed);
var folders = await _folderRepository.GetManyByUserIdAsync(user.Id);
var ciphers = await _cipherRepository.GetManyByUserIdAsync(user.Id);
var response = new SyncResponseModel(_globalSettings, user, organizationUserDetails, folders, ciphers);
IEnumerable<Collection> collections = new List<Collection>();
IDictionary<Guid, IGrouping<Guid, CollectionCipher>> collectionCiphersGroupDict =
new Dictionary<Guid, IGrouping<Guid, CollectionCipher>>();
if(organizationUserDetails.Any(o => o.Enabled))
{
collections = await _collectionRepository.GetManyByUserIdAsync(user.Id, false);
var collectionCiphers = await _collectionCipherRepository.GetManyByUserIdAsync(user.Id);
collectionCiphersGroupDict = collectionCiphers.GroupBy(c => c.CipherId).ToDictionary(s => s.Key);
}
var response = new SyncResponseModel(_globalSettings, user, organizationUserDetails, folders,
collections, ciphers, collectionCiphersGroupDict);
return response;
}
}

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

@ -72,7 +72,7 @@ namespace Bit.Core.Models.Api
IDictionary<Guid, IGrouping<Guid, CollectionCipher>> collectionCiphers, string obj = "cipherDetails")
: base(cipher, globalSettings, obj)
{
if(collectionCiphers.ContainsKey(cipher.Id))
if(collectionCiphers?.ContainsKey(cipher.Id) ?? false)
{
CollectionIds = collectionCiphers[cipher.Id].Select(c => c.CollectionId);
}
@ -86,7 +86,7 @@ namespace Bit.Core.Models.Api
IEnumerable<CollectionCipher> collectionCiphers, string obj = "cipherDetails")
: base(cipher, globalSettings, obj)
{
CollectionIds = collectionCiphers.Select(c => c.CollectionId);
CollectionIds = collectionCiphers?.Select(c => c.CollectionId) ?? new List<Guid>();
}
public IEnumerable<Guid> CollectionIds { get; set; }
@ -98,7 +98,7 @@ namespace Bit.Core.Models.Api
IDictionary<Guid, IGrouping<Guid, CollectionCipher>> collectionCiphers, string obj = "cipherMiniDetails")
: base(cipher, globalSettings, false, obj)
{
if(collectionCiphers.ContainsKey(cipher.Id))
if(collectionCiphers?.ContainsKey(cipher.Id) ?? false)
{
CollectionIds = collectionCiphers[cipher.Id].Select(c => c.CollectionId);
}

10
src/Core/Models/Api/Response/SyncResponseModel.cs
View File

@ -14,18 +14,22 @@ namespace Bit.Core.Models.Api
User user,
IEnumerable<OrganizationUserOrganizationDetails> organizationUserDetails,
IEnumerable<Folder> folders,
IEnumerable<CipherDetails> ciphers)
IEnumerable<Collection> collections,
IEnumerable<CipherDetails> ciphers,
IDictionary<Guid, IGrouping<Guid, CollectionCipher>> collectionCiphersDict)
: base("sync")
{
Profile = new ProfileResponseModel(user, organizationUserDetails);
Folders = folders.Select(f => new FolderResponseModel(f));
Ciphers = ciphers.Select(c => new CipherResponseModel(c, globalSettings));
Ciphers = ciphers.Select(c => new CipherDetailsResponseModel(c, globalSettings, collectionCiphersDict));
Collections = collections.Select(c => new CollectionResponseModel(c));
Domains = new DomainsResponseModel(user, false);
}
public ProfileResponseModel Profile { get; set; }
public IEnumerable<FolderResponseModel> Folders { get; set; }
public IEnumerable<CipherResponseModel> Ciphers { get; set; }
public IEnumerable<CollectionResponseModel> Collections { get; set; }
public IEnumerable<CipherDetailsResponseModel> Ciphers { get; set; }
public DomainsResponseModel Domains { get; set; }
}
}