nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-15 10:08:14 -05:00
Code

Rework models for global domains

Browse Source
This commit is contained in:
Kyle Spearrin 2017-01-10 17:01:57 -05:00
parent 7abde8c771
commit e57964e978
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Api/Models/Response/DomainsResponseModel.cs
View File

@ -3,6 +3,7 @@ using Bit.Core.Domains;
using System.Collections.Generic; using System.Collections.Generic;
using Newtonsoft.Json; using Newtonsoft.Json;
using Bit.Core.Enums; using Bit.Core.Enums;
using System.Linq;
namespace Bit.Api.Models namespace Bit.Api.Models
{ {
@ -18,13 +19,36 @@ namespace Bit.Api.Models
EquivalentDomains = user.EquivalentDomains != null ? EquivalentDomains = user.EquivalentDomains != null ?
JsonConvert.DeserializeObject<List<List<string>>>(user.EquivalentDomains) : null; JsonConvert.DeserializeObject<List<List<string>>>(user.EquivalentDomains) : null;
GlobalEquivalentDomains = Core.Utilities.EquivalentDomains.Global;
ExcludedGlobalEquivalentDomains = user.ExcludedGlobalEquivalentDomains != null ? var excludedGlobalEquivalentDomains = user.ExcludedGlobalEquivalentDomains != null ?
JsonConvert.DeserializeObject<List<GlobalEquivalentDomainsType>>(user.ExcludedGlobalEquivalentDomains) : null; JsonConvert.DeserializeObject<List<GlobalEquivalentDomainsType>>(user.ExcludedGlobalEquivalentDomains) : null;
var globalDomains = new List<GlobalDomains>();
foreach(var domain in Core.Utilities.EquivalentDomains.Global)
{
globalDomains.Add(new GlobalDomains(domain.Key, domain.Value, excludedGlobalEquivalentDomains));
}
GlobalEquivalentDomains = !globalDomains.Any() ? null : globalDomains;
} }
public IEnumerable<IEnumerable<string>> EquivalentDomains { get; set; } public IEnumerable<IEnumerable<string>> EquivalentDomains { get; set; }
public IDictionary<GlobalEquivalentDomainsType, IEnumerable<string>> GlobalEquivalentDomains { get; set; } public IEnumerable<GlobalDomains> GlobalEquivalentDomains { get; set; }
public IEnumerable<GlobalEquivalentDomainsType> ExcludedGlobalEquivalentDomains { get; set; }
public class GlobalDomains
{
public GlobalDomains(
GlobalEquivalentDomainsType globalDomain,
IEnumerable<string> domains,
IEnumerable<GlobalEquivalentDomainsType> excludedDomains)
{
Type = globalDomain;
Domains = domains;
Excluded = excludedDomains?.Contains(globalDomain) ?? false;
}
public GlobalEquivalentDomainsType Type { get; set; }
public IEnumerable<string> Domains { get; set; }
public bool Excluded { get; set; }
}
} }
} }