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

map json columns for org and user

Browse Source
This commit is contained in:
Kyle Spearrin 2020-01-08 21:38:32 -05:00
parent 9fa7f335bd
commit 002efaafd4
4 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Core/Models/EntityFramework/Organization.cs
View File

@ -1,11 +1,24 @@
using System.Collections.Generic;
using System.Text.Json;
using AutoMapper;
namespace Bit.Core.Models.EntityFramework
{
public class Organization : Table.Organization
{
private JsonDocument _twoFactorProvidersJson;
public ICollection<Cipher> Ciphers { get; set; }
public JsonDocument TwoFactorProvidersJson
{
get => _twoFactorProvidersJson;
set
{
TwoFactorProviders = value.ToString();
_twoFactorProvidersJson = value;
}
}
}
public class OrganizationMapperProfile : Profile

13
src/Core/Models/EntityFramework/User.cs
View File

@ -1,11 +1,24 @@
using System.Collections.Generic;
using System.Text.Json;
using AutoMapper;
namespace Bit.Core.Models.EntityFramework
{
public class User : Table.User
{
private JsonDocument _twoFactorProvidersJson;
public ICollection<Cipher> Ciphers { get; set; }
public JsonDocument TwoFactorProvidersJson
{
get => _twoFactorProvidersJson;
set
{
TwoFactorProviders = value.ToString();
_twoFactorProvidersJson = value;
}
}
}
public class UserMapperProfile : Profile

6
src/Core/Repositories/EntityFramework/DatabaseContext.cs
View File

@ -35,6 +35,12 @@ namespace Bit.Core.Repositories.EntityFramework
builder.Entity<Cipher>().Ignore(e => e.Attachments);
builder.Entity<Cipher>().Property(e => e.Attachments).HasColumnName("Attachments");
builder.Entity<User>().Ignore(e => e.TwoFactorProviders);
builder.Entity<User>().Property(e => e.TwoFactorProvidersJson).HasColumnName("TwoFactorProviders");
builder.Entity<Organization>().Ignore(e => e.TwoFactorProviders);
builder.Entity<Organization>().Property(e => e.TwoFactorProvidersJson).HasColumnName("TwoFactorProviders");
builder.Entity<User>().ToTable(nameof(User));
builder.Entity<Cipher>().ToTable(nameof(Cipher));
builder.Entity<Organization>().ToTable(nameof(Organization));

2
src/Core/Repositories/EntityFramework/OrganizationRepository.cs
View File

@ -55,7 +55,7 @@ namespace Bit.Core.Repositories.EntityFramework
Use2fa = e.Use2fa,
UseEvents = e.UseEvents,
UsersGetPremium = e.UsersGetPremium,
Using2fa = e.Use2fa && e.TwoFactorProviders != null && e.TwoFactorProviders != "{}",
Using2fa = e.Use2fa && e.TwoFactorProviders != null,
}).ToListAsync();
}
}