Moved license models over to billing folder

src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs

@@ -2,6 +2,7 @@
 using Bit.Api.Models.Response;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.StaticStore;

src/Api/Billing/Controllers/AccountsController.cs

@@ -4,6 +4,7 @@ using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Services;
 using Bit.Core.Exceptions;

src/Api/Billing/Controllers/OrganizationsController.cs

@@ -7,6 +7,7 @@ using Bit.Api.Models.Response;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Repositories;

src/Api/Controllers/LicensesController.cs

@@ -1,8 +1,8 @@
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.OrganizationLicenses;
-using Bit.Core.Models.Business;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;

src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs

@@ -2,10 +2,10 @@
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Utilities;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Business;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 using Bit.Core.Repositories;

src/Api/Models/Response/SubscriptionResponseModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.Billing.Licenses.Models;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;

src/Core/AdminConsole/Entities/Organization.cs

@@ -4,9 +4,9 @@ using System.Text.Json;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
 using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Business;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 

src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs

@@ -3,9 +3,9 @@ using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Business;
 
 namespace Bit.Core.Models.Data.Organizations;
 

src/Core/AdminConsole/Services/IOrganizationService.cs

@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.Auth.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

src/Core/AdminConsole/Services/Implementations/OrganizationService.cs

@@ -17,7 +17,9 @@ using Bit.Core.Auth.Repositories;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
+using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Billing.Pricing;
 using Bit.Core.Context;
 using Bit.Core.Entities;

src/Core/Billing/Licenses/Enums/LicenseType.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums;
+namespace Bit.Core.Billing.Licenses.Enums;
 
 public enum LicenseType : byte
 {

src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs

@@ -6,8 +6,9 @@ using System.Text;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Licenses.Attributes;
+using Bit.Core.Billing.Licenses.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;

src/Core/Billing/Licenses/Models/BaseLicense.cs

@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
 using Bit.Core.Billing.Licenses.Attributes;
-using Bit.Core.Enums;
+using Bit.Core.Billing.Licenses.Enums;
 
-namespace Bit.Core.Models.Business;
+namespace Bit.Core.Billing.Licenses.Models;
 
 public abstract class BaseLicense : ILicense
 {

src/Core/Billing/Licenses/Models/ILicense.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Licenses.Enums;
 
-namespace Bit.Core.Models.Business;
+namespace Bit.Core.Billing.Licenses.Models;
 
 public interface ILicense
 {

src/Core/Billing/Licenses/Models/OrganizationLicense.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Licenses.Attributes;
 
-namespace Bit.Core.Models.Business;
+namespace Bit.Core.Billing.Licenses.Models;
 
 public class OrganizationLicense : BaseLicense
 {

src/Core/Billing/Licenses/Models/UserLicense.cs

@@ -2,9 +2,10 @@
 using Bit.Core.Billing.Licenses.Attributes;
 using Bit.Core.Billing.Licenses.Extensions;
 using Bit.Core.Entities;
+using Bit.Core.Models.Business;
 using Bit.Core.Services;
 
-namespace Bit.Core.Models.Business;
+namespace Bit.Core.Billing.Licenses.Models;
 
 public class UserLicense : BaseLicense
 {

src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs

@@ -1,9 +1,9 @@
 using System.Globalization;
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
 using Bit.Core.Billing.Licenses.Models;
-using Bit.Core.Enums;
 
 namespace Bit.Core.Billing.Licenses.Services.Implementations;
 

src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs

@@ -1,9 +1,9 @@
 using System.Globalization;
 using System.Security.Claims;
+using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
 using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 
 namespace Bit.Core.Billing.Licenses.Services.Implementations;
 

src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs

@@ -1,6 +1,8 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;

src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IGetOrganizationLicenseQuery.cs

@@ -1,6 +1,6 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
-using Bit.Core.Models.Business;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 

src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IUpdateOrganizationLicenseCommand.cs

@@ -1,7 +1,7 @@
 #nullable enable
 
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Models.Business;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Models.Data.Organizations;
 
 namespace Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;

src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs

@@ -1,9 +1,9 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.OrganizationLicenses;
-using Bit.Core.Models.Business;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 using Bit.Core.Services;

src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs

@@ -3,8 +3,8 @@
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Licenses.Extensions;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Business;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 using Bit.Core.Services;

src/Core/Services/ILicensingService.cs

@@ -2,6 +2,7 @@
 
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 

src/Core/Services/IUserService.cs

@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

src/Core/Services/Implementations/UserService.cs

@@ -15,7 +15,9 @@ using Bit.Core.Auth.Models;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
 using Bit.Core.Billing.Constants;
+using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Models.Sales;
 using Bit.Core.Billing.Services;

src/Core/Services/NoopImplementations/NoopLicensingService.cs

@@ -2,6 +2,7 @@
 
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 using Bit.Core.Settings;

test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs

@@ -4,11 +4,11 @@ using Bit.Api.AdminConsole.Models.Request.Organizations;
 using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Business;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.Repositories;
 using Bit.Core.Services;

test/Api.Test/Utilities/ApiHelpersTests.cs

@@ -1,6 +1,6 @@
 using System.Text;
 using Bit.Api.Utilities;
-using Bit.Core.Models.Business;
+using Bit.Core.Billing.Licenses.Models;
 using Microsoft.AspNetCore.Http;
 using NSubstitute;
 using Xunit;

test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs

@@ -5,9 +5,9 @@ using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Business;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Test.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;

test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs

@@ -1,5 +1,5 @@
 using AutoFixture;
-using Bit.Core.Models.Business;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Test.Common.AutoFixture.Attributes;
 
 namespace Bit.Core.Test.AutoFixture;

test/Core.Test/Models/Business/OrganizationLicenseFileFixtures.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Enums;
-using Bit.Core.Models.Business;
 
 namespace Bit.Core.Test.Models.Business;
 

test/Core.Test/Models/Business/OrganizationLicenseTests.cs

@@ -1,6 +1,6 @@
 using System.Security.Claims;
 using Bit.Core.Billing.Licenses.Extensions;
-using Bit.Core.Models.Business;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Settings;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;

test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs

@@ -1,6 +1,8 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Billing.Licenses.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;

test/Core.Test/OrganizationFeatures/OrganizationLicenses/SelfHostedGetOrganizationLicenseQueryTests.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Business;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses;
 using Bit.Core.Settings;

test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs

@@ -1,7 +1,7 @@
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Models.Business;
+using Bit.Core.Billing.Licenses.Enums;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses;
 using Bit.Core.Services;

test/Core.Test/Services/LicensingServiceTests.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using AutoFixture;
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Models.Business;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Test.AutoFixture;

test/Core.Test/Services/UserServiceTests.cs

@@ -13,12 +13,12 @@ using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
+using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Business;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;