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

updated format of import data

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-15 14:41:20 -04:00
parent befca0561b
commit 670b548b22
9 changed files with 156 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs
View File

@ -1,4 +1,5 @@
using System;
using Bit.Core.Models.Table;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -7,7 +8,8 @@ namespace Bit.Core.Models.Api
public class ImportOrganizationUsersRequestModel
{
public Group[] Groups { get; set; }
public User[] Users { get; set; }
public User[] NewUsers { get; set; }
public User[] RemoveUsers { get; set; }
public class Group
{
@ -15,15 +17,18 @@ namespace Bit.Core.Models.Api
public string Name { get; set; }
[Required]
public string ExternalId { get; set; }
public Table.Group ToGroup(Guid organizationId)
public IEnumerable<string> Users { get; set; }
public Tuple<Table.Group, HashSet<string>> ToGroupTuple(Guid organizationId)
{
return new Table.Group
var group = new Table.Group
{
OrganizationId = organizationId,
Name = Name,
ExternalId = ExternalId
};
return new Tuple<Table.Group, HashSet<string>>(group, new HashSet<string>(Users));
}
}
@ -32,12 +37,6 @@ namespace Bit.Core.Models.Api
[Required]
[EmailAddress]
public string Email { get; set; }
public IEnumerable<string> ExternalGroupIds { get; set; }
public KeyValuePair<string, IEnumerable<string>> ToKvp()
{
return new KeyValuePair<string, IEnumerable<string>>(Email, ExternalGroupIds);
}
}
}
}