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

Split out repositories to Infrastructure.Dapper / EntityFramework (#1759)

Browse Source
This commit is contained in:
Oscar Hinton
2022-01-11 10:40:51 +01:00
committed by GitHub
parent e2c6fc81f4
commit e4a10aae27
536 changed files with 1629 additions and 1589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/Core.Test/AutoFixture/CipherFixtures.cs
View File

@ -4,14 +4,14 @@ using System.Linq;
using System.Text.Json;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Entities;
using Bit.Core.Models.Data;
using Bit.Core.Models.Table;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.OrganizationUserFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using Core.Models.Data;

8
test/Core.Test/AutoFixture/CollectionCipherFixtures.cs
View File

@ -1,15 +1,15 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.CipherFixtures;
using Bit.Core.Test.AutoFixture.CollectionFixtures;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.CollectionCipherFixtures
{
@ -23,14 +23,14 @@ namespace Bit.Core.Test.AutoFixture.CollectionCipherFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.CollectionCipher))
if (type == null || type != typeof(CollectionCipher))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.CollectionCipher>();
var obj = fixture.WithAutoNSubstitutions().Create<CollectionCipher>();
return obj;
}
}

8
test/Core.Test/AutoFixture/CollectionFixtures.cs
View File

@ -1,13 +1,13 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.CollectionFixtures
{
@ -21,14 +21,14 @@ namespace Bit.Core.Test.AutoFixture.CollectionFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Collection))
if (type == null || type != typeof(Collection))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Collection>();
var obj = fixture.WithAutoNSubstitutions().Create<Collection>();
return obj;
}
}

8
test/Core.Test/AutoFixture/DeviceFixtures.cs
View File

@ -1,13 +1,13 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.DeviceFixtures
{
@ -21,14 +21,14 @@ namespace Bit.Core.Test.AutoFixture.DeviceFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Device))
if (type == null || type != typeof(Device))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Device>();
var obj = fixture.WithAutoNSubstitutions().Create<Device>();
return obj;
}
}

8
test/Core.Test/AutoFixture/EmergencyAccessFixtures.cs
View File

@ -1,13 +1,13 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.EmergencyAccessFixtures
{
@ -21,14 +21,14 @@ namespace Bit.Core.Test.AutoFixture.EmergencyAccessFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.EmergencyAccess))
if (type == null || type != typeof(EmergencyAccess))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.Create<TableModel.EmergencyAccess>();
var obj = fixture.Create<EmergencyAccess>();
return obj;
}
}

5
test/Core.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
View File

@ -4,11 +4,10 @@ using System.Reflection;
using AutoFixture;
using AutoFixture.Kernel;
using AutoMapper;
using Bit.Core.Models.EntityFramework;
using Bit.Core.Models.EntityFramework.Provider;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Settings;
using Bit.Core.Test.Helpers.Factories;
using Bit.Infrastructure.EntityFramework.Models;
using Bit.Infrastructure.EntityFramework.Repositories;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Moq;

8
test/Core.Test/AutoFixture/EventFixtures.cs
View File

@ -1,12 +1,12 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.EventFixtures
{
@ -20,14 +20,14 @@ namespace Bit.Core.Test.AutoFixture.EventFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Event))
if (type == null || type != typeof(Event))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Event>();
var obj = fixture.WithAutoNSubstitutions().Create<Event>();
return obj;
}
}

8
test/Core.Test/AutoFixture/FolderFixtures.cs
View File

@ -1,13 +1,13 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.FolderFixtures
{
@ -21,14 +21,14 @@ namespace Bit.Core.Test.AutoFixture.FolderFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Folder))
if (type == null || type != typeof(Folder))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Folder>();
var obj = fixture.WithAutoNSubstitutions().Create<Folder>();
return obj;
}
}

8
test/Core.Test/AutoFixture/GrantFixtures.cs
View File

@ -1,12 +1,12 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.GrantFixtures
{
@ -20,14 +20,14 @@ namespace Bit.Core.Test.AutoFixture.GrantFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Grant))
if (type == null || type != typeof(Grant))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Grant>();
var obj = fixture.WithAutoNSubstitutions().Create<Grant>();
return obj;
}
}

8
test/Core.Test/AutoFixture/GroupFixtures.cs
View File

@ -1,14 +1,14 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using Fixtures = Bit.Core.Test.AutoFixture.OrganizationFixtures;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.GroupFixtures
{
@ -36,14 +36,14 @@ namespace Bit.Core.Test.AutoFixture.GroupFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Group))
if (type == null || type != typeof(Group))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Group>();
var obj = fixture.WithAutoNSubstitutions().Create<Group>();
return obj;
}
}

8
test/Core.Test/AutoFixture/GroupUserFixtures.cs
View File

@ -1,11 +1,11 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.GroupUserFixtures
{
@ -19,13 +19,13 @@ namespace Bit.Core.Test.AutoFixture.GroupUserFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.GroupUser))
if (type == null || type != typeof(GroupUser))
{
return new NoSpecimen();
}
var fixture = new Fixture();
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.GroupUser>();
var obj = fixture.WithAutoNSubstitutions().Create<GroupUser>();
return obj;
}
}

8
test/Core.Test/AutoFixture/InstallationFixtures.cs
View File

@ -1,11 +1,11 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.InstallationFixtures
{
@ -19,13 +19,13 @@ namespace Bit.Core.Test.AutoFixture.InstallationFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Installation))
if (type == null || type != typeof(Installation))
{
return new NoSpecimen();
}
var fixture = new Fixture();
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Installation>();
var obj = fixture.WithAutoNSubstitutions().Create<Installation>();
return obj;
}
}

30
test/Core.Test/AutoFixture/OrganizationFixtures.cs
View File

@ -4,16 +4,16 @@ using System.Linq;
using System.Text.Json;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models;
using Bit.Core.Models.Business;
using Bit.Core.Models.Data;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Utilities;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
{
@ -26,16 +26,18 @@ namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
var organizationId = Guid.NewGuid();
var maxConnections = (short)new Random().Next(10, short.MaxValue);
fixture.Customize<Core.Models.Table.Organization>(composer => composer
fixture.Customize<Entities.Organization>(composer => composer
.With(o => o.Id, organizationId)
.With(o => o.MaxCollections, maxConnections)
.With(o => o.UseGroups, UseGroups));
fixture.Customize<Core.Models.Table.Collection>(composer =>
fixture.Customize<Collection>(composer =>
composer
.With(c => c.OrganizationId, organizationId));
.With(c => c.OrganizationId, organizationId)
.Without(o => o.CreationDate)
.Without(o => o.RevisionDate));
fixture.Customize<TableModel.Group>(composer => composer.With(g => g.OrganizationId, organizationId));
fixture.Customize<Group>(composer => composer.With(g => g.OrganizationId, organizationId));
}
}
@ -49,14 +51,14 @@ namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Organization))
if (type == null || type != typeof(Entities.Organization))
{
return new NoSpecimen();
}
var fixture = new Fixture();
var providers = fixture.Create<Dictionary<TwoFactorProviderType, TwoFactorProvider>>();
var organization = new Fixture().WithAutoNSubstitutions().Create<TableModel.Organization>();
var organization = new Fixture().WithAutoNSubstitutions().Create<Entities.Organization>();
organization.SetTwoFactorProviders(providers);
return organization;
}
@ -71,7 +73,7 @@ namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
var lowestActivePaidPlan = validUpgradePlans.First();
CheckedPlanType = CheckedPlanType.Equals(PlanType.Free) ? lowestActivePaidPlan : CheckedPlanType;
validUpgradePlans.Remove(lowestActivePaidPlan);
fixture.Customize<Core.Models.Table.Organization>(composer => composer
fixture.Customize<Entities.Organization>(composer => composer
.With(o => o.PlanType, CheckedPlanType));
fixture.Customize<OrganizationUpgrade>(composer => composer
.With(ou => ou.Plan, validUpgradePlans.First()));
@ -82,7 +84,7 @@ namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
{
public void Customize(IFixture fixture)
{
fixture.Customize<Core.Models.Table.Organization>(composer => composer
fixture.Customize<Entities.Organization>(composer => composer
.With(o => o.PlanType, PlanType.Free));
}
}
@ -91,7 +93,7 @@ namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
{
public void Customize(IFixture fixture)
{
fixture.Customize<Core.Models.Table.Organization>(composer => composer
fixture.Customize<Entities.Organization>(composer => composer
.With(o => o.PlanType, PlanType.Free));
var plansToIgnore = new List<PlanType> { PlanType.Free, PlanType.Custom };
@ -100,7 +102,7 @@ namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
fixture.Customize<OrganizationUpgrade>(composer => composer
.With(ou => ou.Plan, selectedPlan.Type)
.With(ou => ou.PremiumAccessAddon, selectedPlan.HasPremiumAccessOption));
fixture.Customize<Core.Models.Table.Organization>(composer => composer
fixture.Customize<Entities.Organization>(composer => composer
.Without(o => o.GatewaySubscriptionId));
}
}
@ -117,10 +119,10 @@ namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
});
fixture.Customize<Core.Models.Table.Organization>(composer => composer
fixture.Customize<Entities.Organization>(composer => composer
.With(o => o.Id, organizationId)
.With(o => o.Seats, (short)100));
fixture.Customize<TableModel.OrganizationUser>(composer => composer
fixture.Customize<OrganizationUser>(composer => composer
.With(ou => ou.OrganizationId, organizationId)
.With(ou => ou.Type, InvitorUserType)
.With(ou => ou.Permissions, PermissionsBlob));

8
test/Core.Test/AutoFixture/OrganizationSponsorshipFixtures.cs
View File

@ -1,13 +1,13 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.OrganizationUserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures
{
@ -21,13 +21,13 @@ namespace Bit.Core.Test.AutoFixture.OrganizationSponsorshipFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.OrganizationSponsorship))
if (type == null || type != typeof(OrganizationSponsorship))
{
return new NoSpecimen();
}
var fixture = new Fixture();
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.OrganizationSponsorship>();
var obj = fixture.WithAutoNSubstitutions().Create<OrganizationSponsorship>();
return obj;
}
}

9
test/Core.Test/AutoFixture/OrganizationUserFixtures.cs
View File

@ -8,13 +8,12 @@ using AutoFixture.Xunit2;
using Bit.Core.Enums;
using Bit.Core.Models;
using Bit.Core.Models.Data;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.OrganizationUserFixtures
{
@ -31,7 +30,7 @@ namespace Bit.Core.Test.AutoFixture.OrganizationUserFixtures
if (type == typeof(OrganizationUser))
{
var fixture = new Fixture();
var orgUser = fixture.WithAutoNSubstitutions().Create<TableModel.OrganizationUser>();
var orgUser = fixture.WithAutoNSubstitutions().Create<Entities.OrganizationUser>();
var orgUserPermissions = fixture.WithAutoNSubstitutions().Create<Permissions>();
orgUser.Permissions = JsonSerializer.Serialize(orgUserPermissions, new JsonSerializerOptions()
{
@ -42,7 +41,7 @@ namespace Bit.Core.Test.AutoFixture.OrganizationUserFixtures
else if (type == typeof(List<OrganizationUser>))
{
var fixture = new Fixture();
var orgUsers = fixture.WithAutoNSubstitutions().CreateMany<TableModel.OrganizationUser>(2);
var orgUsers = fixture.WithAutoNSubstitutions().CreateMany<Entities.OrganizationUser>(2);
foreach (var orgUser in orgUsers)
{
var providers = fixture.Create<Dictionary<TwoFactorProviderType, TwoFactorProvider>>();
@ -71,7 +70,7 @@ namespace Bit.Core.Test.AutoFixture.OrganizationUserFixtures
public void Customize(IFixture fixture)
{
fixture.Customize<Core.Models.Table.OrganizationUser>(composer => composer
fixture.Customize<Entities.OrganizationUser>(composer => composer
.With(o => o.Type, Type)
.With(o => o.Status, Status));
}

9
test/Core.Test/AutoFixture/PolicyFixtures.cs
View File

@ -4,12 +4,11 @@ using AutoFixture;
using AutoFixture.Kernel;
using AutoFixture.Xunit2;
using Bit.Core.Enums;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.PolicyFixtures
{
@ -24,7 +23,7 @@ namespace Bit.Core.Test.AutoFixture.PolicyFixtures
public void Customize(IFixture fixture)
{
fixture.Customize<Core.Models.Table.Policy>(composer => composer
fixture.Customize<Entities.Policy>(composer => composer
.With(o => o.OrganizationId, Guid.NewGuid())
.With(o => o.Type, Type)
.With(o => o.Enabled, true));
@ -56,13 +55,13 @@ namespace Bit.Core.Test.AutoFixture.PolicyFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Policy))
if (type == null || type != typeof(Entities.Policy))
{
return new NoSpecimen();
}
var fixture = new Fixture();
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Policy>();
var obj = fixture.WithAutoNSubstitutions().Create<Entities.Policy>();
return obj;
}
}

4
test/Core.Test/AutoFixture/SendFixtures.cs
View File

@ -1,12 +1,12 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Models.Table;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;

8
test/Core.Test/AutoFixture/SsoConfigFixtures.cs
View File

@ -2,13 +2,13 @@
using System.Text.Json;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Entities;
using Bit.Core.Models.Data;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.SsoConfigFixtures
{
@ -22,13 +22,13 @@ namespace Bit.Core.Test.AutoFixture.SsoConfigFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.SsoConfig))
if (type == null || type != typeof(SsoConfig))
{
return new NoSpecimen();
}
var fixture = new Fixture();
var ssoConfig = fixture.WithAutoNSubstitutions().Create<TableModel.SsoConfig>();
var ssoConfig = fixture.WithAutoNSubstitutions().Create<SsoConfig>();
var ssoConfigData = fixture.WithAutoNSubstitutions().Create<SsoConfigurationData>();
ssoConfig.SetData(ssoConfigData);
return ssoConfig;

6
test/Core.Test/AutoFixture/SsoUserFixtures.cs
View File

@ -1,11 +1,11 @@
using AutoFixture;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.SsoUserFixtures
{
@ -17,7 +17,7 @@ namespace Bit.Core.Test.AutoFixture.SsoUserFixtures
fixture.Customizations.Add(new GlobalSettingsBuilder());
fixture.Customizations.Add(new UserBuilder());
fixture.Customizations.Add(new OrganizationBuilder());
fixture.Customize<TableModel.SsoUser>(composer => composer.Without(ou => ou.Id));
fixture.Customize<SsoUser>(composer => composer.Without(ou => ou.Id));
fixture.Customizations.Add(new EfRepositoryListBuilder<SsoUserRepository>());
fixture.Customizations.Add(new EfRepositoryListBuilder<UserRepository>());
fixture.Customizations.Add(new EfRepositoryListBuilder<OrganizationRepository>());

8
test/Core.Test/AutoFixture/TaxRateFixtures.cs
View File

@ -1,12 +1,12 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.TaxRateFixtures
{
@ -20,14 +20,14 @@ namespace Bit.Core.Test.AutoFixture.TaxRateFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.TaxRate))
if (type == null || type != typeof(TaxRate))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.TaxRate>();
var obj = fixture.WithAutoNSubstitutions().Create<TaxRate>();
return obj;
}
}

9
test/Core.Test/AutoFixture/TransactionFixutres.cs
View File

@ -1,15 +1,14 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Models.EntityFramework;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Models;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.TransactionFixtures
{
@ -24,7 +23,7 @@ namespace Bit.Core.Test.AutoFixture.TransactionFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.Transaction))
if (type == null || type != typeof(Entities.Transaction))
{
return new NoSpecimen();
}
@ -36,7 +35,7 @@ namespace Bit.Core.Test.AutoFixture.TransactionFixtures
.Without(c => c.OrganizationId));
}
fixture.Customizations.Add(new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.Transaction>();
var obj = fixture.WithAutoNSubstitutions().Create<Entities.Transaction>();
return obj;
}
}

8
test/Core.Test/AutoFixture/U2fFixtures.cs
View File

@ -1,13 +1,13 @@
using System;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Entities;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.Relays;
using Bit.Core.Test.AutoFixture.UserFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.U2fFixtures
{
@ -21,14 +21,14 @@ namespace Bit.Core.Test.AutoFixture.U2fFixtures
}
var type = request as Type;
if (type == null || type != typeof(TableModel.U2f))
if (type == null || type != typeof(U2f))
{
return new NoSpecimen();
}
var fixture = new Fixture();
fixture.Customizations.Add(new MaxLengthStringRelay());
var obj = fixture.WithAutoNSubstitutions().Create<TableModel.U2f>();
var obj = fixture.WithAutoNSubstitutions().Create<U2f>();
return obj;
}
}

12
test/Core.Test/AutoFixture/UserFixtures.cs
View File

@ -2,14 +2,14 @@
using System.Collections.Generic;
using AutoFixture;
using AutoFixture.Kernel;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models;
using Bit.Core.Repositories.EntityFramework;
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
using Bit.Infrastructure.EntityFramework.Repositories;
using Bit.Test.Common.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using TableModel = Bit.Core.Models.Table;
namespace Bit.Core.Test.AutoFixture.UserFixtures
{
@ -23,18 +23,18 @@ namespace Bit.Core.Test.AutoFixture.UserFixtures
}
var type = request as Type;
if (type == typeof(TableModel.User))
if (type == typeof(User))
{
var fixture = new Fixture();
var providers = fixture.Create<Dictionary<TwoFactorProviderType, TwoFactorProvider>>();
var user = fixture.WithAutoNSubstitutions().Create<TableModel.User>();
var user = fixture.WithAutoNSubstitutions().Create<User>();
user.SetTwoFactorProviders(providers);
return user;
}
else if (type == typeof(List<TableModel.User>))
else if (type == typeof(List<User>))
{
var fixture = new Fixture();
var users = fixture.WithAutoNSubstitutions().CreateMany<TableModel.User>(2);
var users = fixture.WithAutoNSubstitutions().CreateMany<User>(2);
foreach (var user in users)
{
var providers = fixture.Create<Dictionary<TwoFactorProviderType, TwoFactorProvider>>();