nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-09 20:03:47 -05:00
Code Activity

create/get/update collection with groups

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-09 12:41:36 -04:00
parent d166f9cca3
commit 6c923102e9
11 changed files with 196 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Api/Request/CollectionRequestModel.cs
View File

@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
using Bit.Core.Utilities;
using Bit.Core.Models.Table;
using Newtonsoft.Json;
using System.Collections.Generic;
namespace Bit.Core.Models.Api
{
@ -12,6 +13,7 @@ namespace Bit.Core.Models.Api
[EncryptedString]
[StringLength(300)]
public string Name { get; set; }
public IEnumerable<string> GroupIds { get; set; }
public Collection ToCollection(Guid orgId)
{

12
src/Core/Models/Api/Response/CollectionResponseModel.cs
View File

@ -1,6 +1,7 @@
using System;
using Bit.Core.Models.Table;
using Bit.Core.Models.Data;
using System.Collections.Generic;
namespace Bit.Core.Models.Api
{
@ -37,6 +38,17 @@ namespace Bit.Core.Models.Api
public string Name { get; set; }
}
public class CollectionDetailsResponseModel : CollectionResponseModel
{
public CollectionDetailsResponseModel(Collection collection, IEnumerable<Guid> collectionIds)
: base(collection, "collectionDetails")
{
CollectionIds = collectionIds;
}
public IEnumerable<Guid> CollectionIds { get; set; }
}
public class CollectionUserDetailsResponseModel : CollectionResponseModel
{
public CollectionUserDetailsResponseModel(CollectionUserCollectionDetails collection)

3
src/Core/Repositories/ICollectionRepository.cs
View File

@ -8,8 +8,11 @@ namespace Bit.Core.Repositories
public interface ICollectionRepository : IRepository<Collection, Guid>
{
Task<int> GetCountByOrganizationIdAsync(Guid organizationId);
Task<Tuple<Collection, ICollection<Guid>>> GetByIdWithGroupsAsync(Guid id);
Task<ICollection<Collection>> GetManyByOrganizationIdAsync(Guid organizationId);
Task<ICollection<Collection>> GetManyByUserIdAsync(Guid userId);
Task CreateAsync(Collection obj, IEnumerable<Guid> groupIds);
Task ReplaceAsync(Collection obj, IEnumerable<Guid> groupIds);
}
}

52
src/Core/Repositories/SqlServer/CollectionRepository.cs
View File

@ -6,6 +6,8 @@ using System.Data.SqlClient;
using System.Data;
using Dapper;
using System.Linq;
using Newtonsoft.Json;
using Bit.Core.Utilities;
namespace Bit.Core.Repositories.SqlServer
{
@ -32,6 +34,22 @@ namespace Bit.Core.Repositories.SqlServer
}
}
public async Task<Tuple<Collection, ICollection<Guid>>> GetByIdWithGroupsAsync(Guid id)
{
using(var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryMultipleAsync(
$"[{Schema}].[Collection_ReadWithGroupsById]",
new { Id = id },
commandType: CommandType.StoredProcedure);
var collection = await results.ReadFirstOrDefaultAsync<Collection>();
var groupIds = (await results.ReadAsync<Guid>()).ToList();
return new Tuple<Collection, ICollection<Guid>>(collection, groupIds);
}
}
public async Task<ICollection<Collection>> GetManyByOrganizationIdAsync(Guid organizationId)
{
using(var connection = new SqlConnection(ConnectionString))
@ -57,5 +75,39 @@ namespace Bit.Core.Repositories.SqlServer
return results.ToList();
}
}
public async Task CreateAsync(Collection obj, IEnumerable<Guid> groupIds)
{
obj.SetNewId();
var objWithGroups = JsonConvert.DeserializeObject<CollectionWithGroups>(JsonConvert.SerializeObject(obj));
objWithGroups.GroupIds = groupIds.ToGuidIdArrayTVP();
using(var connection = new SqlConnection(ConnectionString))
{
var results = await connection.ExecuteAsync(
$"[{Schema}].[Collection_CreateWithGroups]",
objWithGroups,
commandType: CommandType.StoredProcedure);
}
}
public async Task ReplaceAsync(Collection obj, IEnumerable<Guid> groupIds)
{
var objWithGroups = JsonConvert.DeserializeObject<CollectionWithGroups>(JsonConvert.SerializeObject(obj));
objWithGroups.GroupIds = groupIds.ToGuidIdArrayTVP();
using(var connection = new SqlConnection(ConnectionString))
{
var results = await connection.ExecuteAsync(
$"[{Schema}].[Collection_UpdateWithGroups]",
objWithGroups,
commandType: CommandType.StoredProcedure);
}
}
public class CollectionWithGroups : Collection
{
public DataTable GroupIds { get; set; }
}
}
}

4
src/Core/Services/ICollectionService.cs
View File

@ -1,10 +1,12 @@
using System.Threading.Tasks;
using Bit.Core.Models.Table;
using System.Collections.Generic;
using System;
namespace Bit.Core.Services
{
public interface ICollectionService
{
Task SaveAsync(Collection collection);
Task SaveAsync(Collection collection, IEnumerable<Guid> groupIds = null);
}
}

21
src/Core/Services/Implementations/CollectionService.cs
View File

@ -3,6 +3,7 @@ using System.Threading.Tasks;
using Bit.Core.Exceptions;
using Bit.Core.Models.Table;
using Bit.Core.Repositories;
using System.Collections.Generic;
namespace Bit.Core.Services
{
@ -31,7 +32,7 @@ namespace Bit.Core.Services
_mailService = mailService;
}
public async Task SaveAsync(Collection collection)
public async Task SaveAsync(Collection collection, IEnumerable<Guid> groupIds = null)
{
if(collection.Id == default(Guid))
{
@ -51,11 +52,25 @@ namespace Bit.Core.Services
}
}
await _collectionRepository.CreateAsync(collection);
if(groupIds == null)
{
await _collectionRepository.CreateAsync(collection);
}
else
{
await _collectionRepository.CreateAsync(collection, groupIds);
}
}
else
{
await _collectionRepository.ReplaceAsync(collection);
if(groupIds == null)
{
await _collectionRepository.ReplaceAsync(collection);
}
else
{
await _collectionRepository.ReplaceAsync(collection, groupIds);
}
}
}
}