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

Group access & sproc/model refactoring.

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-11 10:32:25 -04:00
parent 76cebdd886
commit f0d7dc8023
26 changed files with 238 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
using System;
using Bit.Core.Models.Table;
using Bit.Core.Models.Data;
using System.Collections.Generic;
namespace Bit.Core.Models.Api
@ -20,19 +19,6 @@ namespace Bit.Core.Models.Api
Name = collection.Name;
}
public CollectionResponseModel(CollectionUserCollectionDetails collection, string obj = "collection")
: base(obj)
{
if(collection == null)
{
throw new ArgumentNullException(nameof(collection));
}
Id = collection.Id.ToString();
OrganizationId = collection.OrganizationId.ToString();
Name = collection.Name;
}
public string Id { get; set; }
public string OrganizationId { get; set; }
public string Name { get; set; }
@ -48,15 +34,4 @@ namespace Bit.Core.Models.Api
public IEnumerable<Guid> GroupIds { get; set; }
}
public class CollectionUserDetailsResponseModel : CollectionResponseModel
{
public CollectionUserDetailsResponseModel(CollectionUserCollectionDetails collection)
: base(collection, "collectionUserDetails")
{
ReadOnly = collection.ReadOnly;
}
public bool ReadOnly { get; set; }
}
}

26
src/Core/Models/Api/Response/OrganizationUserCollectionResponseModel.cs
View File

@ -1,26 +0,0 @@
using System;
using Bit.Core.Models.Data;
namespace Bit.Core.Models.Api
{
public class OrganizationUserCollectionResponseModel : ResponseModel
{
public OrganizationUserCollectionResponseModel(CollectionUserCollectionDetails details,
string obj = "organizationUserCollection")
: base(obj)
{
if(details == null)
{
throw new ArgumentNullException(nameof(details));
}
Id = details.Id.ToString();
Name = details.Name;
ReadOnly = details.ReadOnly;
}
public string Id { get; set; }
public string Name { get; set; }
public bool ReadOnly { get; set; }
}
}

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

@ -3,11 +3,27 @@ using Bit.Core.Enums;
using Bit.Core.Models.Data;
using System.Collections.Generic;
using System.Linq;
using Bit.Core.Models.Table;
namespace Bit.Core.Models.Api
{
public class OrganizationUserResponseModel : ResponseModel
{
public OrganizationUserResponseModel(OrganizationUser organizationUser, string obj = "organizationUser")
: base(obj)
{
if(organizationUser == null)
{
throw new ArgumentNullException(nameof(organizationUser));
}
Id = organizationUser.Id.ToString();
UserId = organizationUser.UserId?.ToString();
Type = organizationUser.Type;
Status = organizationUser.Status;
AccessAll = organizationUser.AccessAll;
}
public OrganizationUserResponseModel(OrganizationUserUserDetails organizationUser, string obj = "organizationUser")
: base(obj)
{
@ -18,8 +34,6 @@ namespace Bit.Core.Models.Api
Id = organizationUser.Id.ToString();
UserId = organizationUser.UserId?.ToString();
Name = organizationUser.Name;
Email = organizationUser.Email;
Type = organizationUser.Type;
Status = organizationUser.Status;
AccessAll = organizationUser.AccessAll;
@ -27,8 +41,6 @@ namespace Bit.Core.Models.Api
public string Id { get; set; }
public string UserId { get; set; }
public string Name { get; set; }
public string Email { get; set; }
public OrganizationUserType Type { get; set; }
public OrganizationUserStatusType Status { get; set; }
public bool AccessAll { get; set; }
@ -36,14 +48,48 @@ namespace Bit.Core.Models.Api
public class OrganizationUserDetailsResponseModel : OrganizationUserResponseModel
{
public OrganizationUserDetailsResponseModel(OrganizationUserUserDetails organizationUser,
IEnumerable<CollectionUserCollectionDetails> collections)
public OrganizationUserDetailsResponseModel(OrganizationUser organizationUser,
IEnumerable<SelectionReadOnly> collections)
: base(organizationUser, "organizationUserDetails")
{
Collections = new ListResponseModel<OrganizationUserCollectionResponseModel>(
collections.Select(c => new OrganizationUserCollectionResponseModel(c)));
Collections = collections.Select(c => new CollectionSelection(c));
}
public ListResponseModel<OrganizationUserCollectionResponseModel> Collections { get; set; }
public IEnumerable<CollectionSelection> Collections { get; set; }
public class CollectionSelection
{
public CollectionSelection(Data.SelectionReadOnly selection)
{
if(selection == null)
{
throw new ArgumentNullException(nameof(selection));
}
Id = selection.Id.ToString();
ReadOnly = selection.ReadOnly;
}
public string Id { get; set; }
public bool ReadOnly { get; set; }
}
}
public class OrganizationUserUserDetailsResponseModel : OrganizationUserResponseModel
{
public OrganizationUserUserDetailsResponseModel(OrganizationUserUserDetails organizationUser,
string obj = "organizationUserUserDetails")
: base(organizationUser, obj)
{
if(organizationUser == null)
{
throw new ArgumentNullException(nameof(organizationUser));
}
Name = organizationUser.Name;
Email = organizationUser.Email;
}
public string Name { get; set; }
public string Email { get; set; }
}
}

4
src/Core/Models/Data/CollectionUserCollectionDetails.cs → src/Core/Models/Data/SelectionReadOnly.cs
View File

@ -2,11 +2,9 @@
namespace Bit.Core.Models.Data
{
public class CollectionUserCollectionDetails
public class SelectionReadOnly
{
public Guid Id { get; set; }
public Guid OrganizationId { get; set; }
public string Name { get; set; }
public bool ReadOnly { get; set; }
}
}