From 8cd040641fcbc7a7e9c5a03a535f5e31d28aec3d Mon Sep 17 00:00:00 2001 From: Conner Turnbull Date: Thu, 7 Nov 2024 16:06:20 -0500 Subject: [PATCH] Ran dotnet format. Resolved identity error --- src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs | 5 +---- src/Core/Models/Business/ILicense.cs | 3 +-- src/Core/Services/Implementations/LicensingService.cs | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs index 92bfccded..184d8dad2 100644 --- a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs +++ b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs @@ -1,10 +1,7 @@ -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using System.Security.Cryptography.X509Certificates; +using System.Security.Claims; using Bit.Core.AdminConsole.Entities; using Bit.Core.Billing.Enums; using Bit.Core.Models.Business; -using Microsoft.IdentityModel.Tokens; namespace Bit.Core.Billing.Licenses.Extensions; diff --git a/src/Core/Models/Business/ILicense.cs b/src/Core/Models/Business/ILicense.cs index 87af0a3ee..b0e295bdd 100644 --- a/src/Core/Models/Business/ILicense.cs +++ b/src/Core/Models/Business/ILicense.cs @@ -1,5 +1,4 @@ -using System.Security.Claims; -using System.Security.Cryptography.X509Certificates; +using System.Security.Cryptography.X509Certificates; namespace Bit.Core.Models.Business; diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs index c83ab952f..1ff653834 100644 --- a/src/Core/Services/Implementations/LicensingService.cs +++ b/src/Core/Services/Implementations/LicensingService.cs @@ -8,6 +8,7 @@ using Bit.Core.Billing.Licenses.Extensions; using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Licenses.Services; using Bit.Core.Entities; +using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.Repositories; using Bit.Core.Settings; @@ -336,7 +337,9 @@ public class LicensingService : ILicensingService } catch (Exception ex) { - throw new SecurityTokenValidationException("License token validation failed.", ex); + // Token exceptions thrown are interpreted by the client as Identity errors and cause the user to logout + // Mask them by rethrowing as BadRequestException + throw new BadRequestException($"Invalid license. {ex.Message}"); } }