mirror of
https://github.com/bitwarden/server
synced 2026-03-01 19:01:14 +00:00
[PM 32766][Defect] Regression: Unable to upload Premium License to Self Hosted instances (#7090)
* Fix the license version issue * Fix the lint build error * fix the build error * Revert to return the UserLicense as json
This commit is contained in:
@@ -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<LicenseResponseModel> Run(User user);
|
||||
Task<UserLicense> Run(User user);
|
||||
}
|
||||
|
||||
public class GetUserLicenseQuery(
|
||||
IUserService userService,
|
||||
ILicensingService licensingService) : IGetUserLicenseQuery
|
||||
IUserService userService) : IGetUserLicenseQuery
|
||||
{
|
||||
public async Task<LicenseResponseModel> Run(User user)
|
||||
public async Task<UserLicense> Run(User user)
|
||||
{
|
||||
var license = await userService.GenerateLicenseAsync(user);
|
||||
var claimsPrincipal = licensingService.GetClaimsPrincipalFromLicense(license);
|
||||
return new LicenseResponseModel(license, claimsPrincipal);
|
||||
return await userService.GenerateLicenseAsync(user);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user