Merge branch 'master' into ac/ac-1179/event-log-updates-ffc

bitwarden · Nov 2, 2023 · d5316ee · d5316ee
2 parents ed0455c + a66528c
commit d5316ee
Show file tree

Hide file tree

Showing 307 changed files with 5,680 additions and 1,163 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -34,10 +34,15 @@ bitwarden_license/src/test/Scim.ScimTest @bitwarden/team-admin-console-dev
 
 # Billing Team
 **/*billing* @bitwarden/team-billing-dev
-**/*subscription* @bitwarden/team-billing-dev
-**/*stripe* @bitwarden/team-billing-dev
-**/*paypal* @bitwarden/team-billing-dev
-**/*braintree* @bitwarden/team-billing-dev
 **/*bitpay* @bitwarden/team-billing-dev
+**/*braintree* @bitwarden/team-billing-dev
 **/*freshdesk* @bitwarden/team-billing-dev
-**/*freshsales* @bitwarden/team-billing-dev
+**/*freshsales* @bitwarden/team-billing-dev
+**/*paypal* @bitwarden/team-billing-dev
+**/*stripe* @bitwarden/team-billing-dev
+**/*subscription* @bitwarden/team-billing-dev
+**/Billing @bitwarden/team-billing-dev
+
+# Multiple Owners
+**/packages.lock.json
+Directory.Build.props
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>2023.9.1</Version>
+    <Version>2023.10.1</Version>
     <RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/...l.Core/Providers/CreateProviderCommand.cs → ...onsole/Providers/CreateProviderCommand.cs b/...l.Core/Providers/CreateProviderCommand.cs → ...onsole/Providers/CreateProviderCommand.cs
@@ -1,11 +1,12 @@
-using Bit.Core.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Providers.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Exceptions;
-using Bit.Core.Providers.Interfaces;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 
-namespace Bit.Commercial.Core.Providers;
+namespace Bit.Commercial.Core.AdminConsole.Providers;
 
 public class CreateProviderCommand : ICreateProviderCommand
 {

diff --git a/...mmercial.Core/Services/ProviderService.cs → .../AdminConsole/Services/ProviderService.cs b/...mmercial.Core/Services/ProviderService.cs → .../AdminConsole/Services/ProviderService.cs
@@ -1,19 +1,21 @@
-using Bit.Core.Context;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Models.Business.Provider;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
+using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Business.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.DataProtection;
 
-namespace Bit.Commercial.Core.Services;
+namespace Bit.Commercial.Core.AdminConsole.Services;
 
 public class ProviderService : IProviderService
 {

diff --git a/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs b/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs
@@ -1,7 +1,7 @@
-using Bit.Commercial.Core.Providers;
-using Bit.Commercial.Core.Services;
-using Bit.Core.Providers.Interfaces;
-using Bit.Core.Services;
+using Bit.Commercial.Core.AdminConsole.Providers;
+using Bit.Commercial.Core.AdminConsole.Services;
+using Bit.Core.AdminConsole.Providers.Interfaces;
+using Bit.Core.AdminConsole.Services;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Commercial.Core.Utilities;

diff --git a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json
@@ -2628,7 +2628,7 @@
         "type": "Project",
         "dependencies": {
           "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
-          "Core": "[2023.9.0, )",
+          "Core": "[2023.10.1, )",
           "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
           "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
           "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",

diff --git a/bitwarden_license/src/Scim/Controllers/v2/UsersController.cs b/bitwarden_license/src/Scim/Controllers/v2/UsersController.cs
@@ -1,6 +1,6 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
+using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Scim.Models;

diff --git a/bitwarden_license/src/Scim/packages.lock.json b/bitwarden_license/src/Scim/packages.lock.json
@@ -2631,15 +2631,15 @@
       "infrastructure.dapper": {
         "type": "Project",
         "dependencies": {
-          "Core": "[2023.9.0, )",
+          "Core": "[2023.10.1, )",
           "Dapper": "[2.0.123, )"
         }
       },
       "infrastructure.entityframework": {
         "type": "Project",
         "dependencies": {
           "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
-          "Core": "[2023.9.0, )",
+          "Core": "[2023.10.1, )",
           "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
           "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
           "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2651,9 +2651,9 @@
       "sharedweb": {
         "type": "Project",
         "dependencies": {
-          "Core": "[2023.9.0, )",
-          "Infrastructure.Dapper": "[2023.9.0, )",
-          "Infrastructure.EntityFramework": "[2023.9.0, )"
+          "Core": "[2023.10.1, )",
+          "Infrastructure.Dapper": "[2023.10.1, )",
+          "Infrastructure.EntityFramework": "[2023.10.1, )"
         }
       }
     }

diff --git a/bitwarden_license/src/Sso/packages.lock.json b/bitwarden_license/src/Sso/packages.lock.json
@@ -2791,15 +2791,15 @@
       "infrastructure.dapper": {
         "type": "Project",
         "dependencies": {
-          "Core": "[2023.9.0, )",
+          "Core": "[2023.10.1, )",
           "Dapper": "[2.0.123, )"
         }
       },
       "infrastructure.entityframework": {
         "type": "Project",
         "dependencies": {
           "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
-          "Core": "[2023.9.0, )",
+          "Core": "[2023.10.1, )",
           "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
           "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
           "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@@ -2811,9 +2811,9 @@
       "sharedweb": {
         "type": "Project",
         "dependencies": {
-          "Core": "[2023.9.0, )",
-          "Infrastructure.Dapper": "[2023.9.0, )",
-          "Infrastructure.EntityFramework": "[2023.9.0, )"
+          "Core": "[2023.10.1, )",
+          "Infrastructure.Dapper": "[2023.10.1, )",
+          "Infrastructure.EntityFramework": "[2023.10.1, )"
         }
       }
     }

diff --git a/....Test/AutoFixture/ProviderUserFixtures.cs → ...nsole/AutoFixture/ProviderUserFixtures.cs b/....Test/AutoFixture/ProviderUserFixtures.cs → ...nsole/AutoFixture/ProviderUserFixtures.cs
@@ -1,9 +1,9 @@
 using System.Reflection;
 using AutoFixture;
 using AutoFixture.Xunit2;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
-namespace Bit.Commercial.Core.Test.AutoFixture;
+namespace Bit.Commercial.Core.Test.AdminConsole.AutoFixture;
 
 internal class ProviderUser : ICustomization
 {
@@ -18,7 +18,7 @@ public ProviderUser(ProviderUserStatusType status, ProviderUserType type)
 
     public void Customize(IFixture fixture)
     {
-        fixture.Customize<Bit.Core.Entities.Provider.ProviderUser>(composer => composer
+        fixture.Customize<Bit.Core.AdminConsole.Entities.Provider.ProviderUser>(composer => composer
             .With(o => o.Type, Type)
             .With(o => o.Status, Status));
     }

diff --git a/...derFeatures/CreateProviderCommandTests.cs → ...derFeatures/CreateProviderCommandTests.cs b/...derFeatures/CreateProviderCommandTests.cs → ...derFeatures/CreateProviderCommandTests.cs
@@ -1,16 +1,17 @@
-using Bit.Commercial.Core.Providers;
+using Bit.Commercial.Core.AdminConsole.Providers;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;
 
-namespace Bit.Commercial.Core.Test.ProviderFeatures;
+namespace Bit.Commercial.Core.Test.AdminConsole.ProviderFeatures;
 
 [SutProviderCustomize]
 public class CreateProviderCommandTests

diff --git a/...ore.Test/Services/ProviderServiceTests.cs → ...nConsole/Services/ProviderServiceTests.cs b/...ore.Test/Services/ProviderServiceTests.cs → ...nConsole/Services/ProviderServiceTests.cs
@@ -1,13 +1,14 @@
-using Bit.Commercial.Core.Services;
-using Bit.Commercial.Core.Test.AutoFixture;
+using Bit.Commercial.Core.AdminConsole.Services;
+using Bit.Commercial.Core.Test.AdminConsole.AutoFixture;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Models.Business.Provider;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Business.Provider;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
@@ -17,10 +18,10 @@
 using NSubstitute;
 using NSubstitute.ReturnsExtensions;
 using Xunit;
-using Provider = Bit.Core.Entities.Provider.Provider;
-using ProviderUser = Bit.Core.Entities.Provider.ProviderUser;
+using Provider = Bit.Core.AdminConsole.Entities.Provider.Provider;
+using ProviderUser = Bit.Core.AdminConsole.Entities.Provider.ProviderUser;
 
-namespace Bit.Commercial.Core.Test.Services;
+namespace Bit.Commercial.Core.Test.AdminConsole.Services;
 
 [SutProviderCustomize]
 public class ProviderServiceTests

diff --git a/...icense/test/Commercial.Core.Test/SecretsManager/Queries/Projects/MaxProjectsQueryTests.cs b/...icense/test/Commercial.Core.Test/SecretsManager/Queries/Projects/MaxProjectsQueryTests.cs
@@ -30,29 +30,36 @@ await sutProvider.GetDependency<IProjectRepository>().DidNotReceiveWithAnyArgs()
 
     [Theory]
     [BitAutoData(PlanType.FamiliesAnnually2019)]
-    [BitAutoData(PlanType.TeamsMonthly2019)]
-    [BitAutoData(PlanType.TeamsAnnually2019)]
-    [BitAutoData(PlanType.EnterpriseMonthly2019)]
-    [BitAutoData(PlanType.EnterpriseAnnually2019)]
     [BitAutoData(PlanType.Custom)]
     [BitAutoData(PlanType.FamiliesAnnually)]
     public async Task GetByOrgIdAsync_SmPlanIsNull_ThrowsBadRequest(PlanType planType,
         SutProvider<MaxProjectsQuery> sutProvider, Organization organization)
     {
         organization.PlanType = planType;
-        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organization.Id).Returns(organization);
+        sutProvider.GetDependency<IOrganizationRepository>()
+            .GetByIdAsync(organization.Id)
+            .Returns(organization);
 
         await Assert.ThrowsAsync<BadRequestException>(
             async () => await sutProvider.Sut.GetByOrgIdAsync(organization.Id, 1));
 
-        await sutProvider.GetDependency<IProjectRepository>().DidNotReceiveWithAnyArgs()
+        await sutProvider.GetDependency<IProjectRepository>()
+            .DidNotReceiveWithAnyArgs()
             .GetProjectCountByOrganizationIdAsync(organization.Id);
     }
 
     [Theory]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
     [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
     [BitAutoData(PlanType.TeamsAnnually)]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
     [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
     [BitAutoData(PlanType.EnterpriseAnnually)]
     public async Task GetByOrgIdAsync_SmNoneFreePlans_ReturnsNull(PlanType planType,
         SutProvider<MaxProjectsQuery> sutProvider, Organization organization)

diff --git a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json
@@ -2667,15 +2667,15 @@
       "commercial.core": {
         "type": "Project",
         "dependencies": {
-          "Core": "[2023.9.0, )"
+          "Core": "[2023.10.1, )"
         }
       },
       "common": {
         "type": "Project",
         "dependencies": {
           "AutoFixture.AutoNSubstitute": "[4.17.0, )",
           "AutoFixture.Xunit2": "[4.17.0, )",
-          "Core": "[2023.9.0, )",
+          "Core": "[2023.10.1, )",
           "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
           "Microsoft.NET.Test.Sdk": "[17.1.0, )",
           "NSubstitute": "[4.3.0, )",
@@ -2729,8 +2729,8 @@
         "dependencies": {
           "AutoFixture.AutoNSubstitute": "[4.17.0, )",
           "AutoFixture.Xunit2": "[4.17.0, )",
-          "Common": "[2023.9.0, )",
-          "Core": "[2023.9.0, )",
+          "Common": "[2023.10.1, )",
+          "Core": "[2023.10.1, )",
           "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
           "Microsoft.NET.Test.Sdk": "[17.1.0, )",
           "NSubstitute": "[4.3.0, )",

diff --git a/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/GroupsControllerTests.cs b/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/GroupsControllerTests.cs
@@ -17,7 +17,6 @@ public class GroupsControllerTests : IClassFixture<ScimApplicationFactory>, IAsy
     public GroupsControllerTests(ScimApplicationFactory factory)
     {
         _factory = factory;
-        _factory.DatabaseName = "test_database_groups";
     }
 
     public Task InitializeAsync()

diff --git a/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/UsersControllerTests.cs b/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/UsersControllerTests.cs
@@ -17,7 +17,6 @@ public class UsersControllerTests : IClassFixture<ScimApplicationFactory>, IAsyn
     public UsersControllerTests(ScimApplicationFactory factory)
     {
         _factory = factory;
-        _factory.DatabaseName = "test_database_users";
     }
 
     public Task InitializeAsync()