Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-18 02:11:22 +01:00
Code Issues Projects Releases Wiki Activity

Ran dotnet format. Resolved identity error

Browse Source
This commit is contained in:
Conner Turnbull 2024-11-07 16:06:20 -05:00
parent d366592446
commit 8cd040641f
No known key found for this signature in database
GPG Key ID: D42CA06D8EB866CC
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
View File

@ -1,10 +1,7 @@
using System.IdentityModel.Tokens.Jwt; using System.Security.Claims;
using System.Security.Claims;
using System.Security.Cryptography.X509Certificates;
using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums; using Bit.Core.Billing.Enums;
using Bit.Core.Models.Business; using Bit.Core.Models.Business;
using Microsoft.IdentityModel.Tokens;
namespace Bit.Core.Billing.Licenses.Extensions; namespace Bit.Core.Billing.Licenses.Extensions;

3
src/Core/Models/Business/ILicense.cs
View File

@ -1,5 +1,4 @@
using System.Security.Claims; using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates;
namespace Bit.Core.Models.Business; namespace Bit.Core.Models.Business;

5
src/Core/Services/Implementations/LicensingService.cs
View File

@ -8,6 +8,7 @@ using Bit.Core.Billing.Licenses.Extensions;
using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Licenses.Models;
using Bit.Core.Billing.Licenses.Services; using Bit.Core.Billing.Licenses.Services;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Exceptions;
using Bit.Core.Models.Business; using Bit.Core.Models.Business;
using Bit.Core.Repositories; using Bit.Core.Repositories;
using Bit.Core.Settings; using Bit.Core.Settings;
@ -336,7 +337,9 @@ public class LicensingService : ILicensingService
} }
catch (Exception ex) 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}");
} }
} }