nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-06 18:42:49 -05:00
Code Activity

[BEEEP] Add explicit error message when uploading the wrong license type (#1831)

Browse Source
This commit is contained in:
Oscar Hinton
2022-02-07 09:43:00 +01:00
committed by GitHub
parent 240b6e7463
commit cd61c826f9
5 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Models/Business/UserLicense.cs
View File

@ -6,6 +6,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Text.Json.Serialization;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Services;
namespace Bit.Core.Models.Business
@ -18,6 +19,7 @@ namespace Bit.Core.Models.Business
public UserLicense(User user, SubscriptionInfo subscriptionInfo, ILicensingService licenseService,
int? version = null)
{
LicenseType = Enums.LicenseType.User;
LicenseKey = user.LicenseKey;
Id = user.Id;
Name = user.Name;
@ -39,6 +41,7 @@ namespace Bit.Core.Models.Business
public UserLicense(User user, ILicensingService licenseService, int? version = null)
{
LicenseType = Enums.LicenseType.User;
LicenseKey = user.LicenseKey;
Id = user.Id;
Name = user.Name;
@ -66,6 +69,7 @@ namespace Bit.Core.Models.Business
public DateTime? Refresh { get; set; }
public DateTime? Expires { get; set; }
public bool Trial { get; set; }
public LicenseType? LicenseType { get; set; }
public string Hash { get; set; }
public string Signature { get; set; }
[JsonIgnore]