diff --git a/src/Core/Billing/Licenses/Queries/GetUserLicenseQuery.cs b/src/Core/Billing/Licenses/Queries/GetUserLicenseQuery.cs index 16344116cb..99d2dbc4f4 100644 --- a/src/Core/Billing/Licenses/Queries/GetUserLicenseQuery.cs +++ b/src/Core/Billing/Licenses/Queries/GetUserLicenseQuery.cs @@ -1,5 +1,4 @@ -using Bit.Core.Billing.Licenses.Models.Api.Response; -using Bit.Core.Billing.Services; +using Bit.Core.Billing.Models.Business; using Bit.Core.Entities; using Bit.Core.Services; @@ -7,17 +6,14 @@ namespace Bit.Core.Billing.Licenses.Queries; public interface IGetUserLicenseQuery { - Task Run(User user); + Task Run(User user); } public class GetUserLicenseQuery( - IUserService userService, - ILicensingService licensingService) : IGetUserLicenseQuery + IUserService userService) : IGetUserLicenseQuery { - public async Task Run(User user) + public async Task Run(User user) { - var license = await userService.GenerateLicenseAsync(user); - var claimsPrincipal = licensingService.GetClaimsPrincipalFromLicense(license); - return new LicenseResponseModel(license, claimsPrincipal); + return await userService.GenerateLicenseAsync(user); } } diff --git a/test/Api.Test/Billing/Controllers/VNext/AccountBillingVNextControllerTests.cs b/test/Api.Test/Billing/Controllers/VNext/AccountBillingVNextControllerTests.cs index 5b14608fc0..ac690a572d 100644 --- a/test/Api.Test/Billing/Controllers/VNext/AccountBillingVNextControllerTests.cs +++ b/test/Api.Test/Billing/Controllers/VNext/AccountBillingVNextControllerTests.cs @@ -2,6 +2,7 @@ using Bit.Api.Billing.Models.Requests.Storage; using Bit.Core.Billing.Commands; using Bit.Core.Billing.Licenses.Queries; +using Bit.Core.Billing.Models.Business; using Bit.Core.Billing.Premium.Commands; using Bit.Core.Billing.Subscriptions.Commands; using Bit.Core.Billing.Subscriptions.Queries; @@ -44,10 +45,10 @@ public class AccountBillingVNextControllerTests [Theory, BitAutoData] public async Task GetLicenseAsync_ValidUser_ReturnsLicenseResponse( User user, - Core.Billing.Licenses.Models.Api.Response.LicenseResponseModel licenseResponse) + UserLicense license) { // Arrange - _getUserLicenseQuery.Run(user).Returns(licenseResponse); + _getUserLicenseQuery.Run(user).Returns(license); // Act var result = await _sut.GetLicenseAsync(user); // Assert