Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Code improvements of JwtBearer module #1742

Merged
merged 2 commits into from
May 1, 2018
Merged

Code improvements of JwtBearer module #1742

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a91ceb4
Use pattern matching to check exception type in JwtBearerHandler
TechnoBerry Apr 30, 2018
96fc89f
Use expression body to configure events in JwtBearerHandler
TechnoBerry Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 28 additions & 34 deletions src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public JwtBearerHandler(IOptionsMonitor<JwtBearerOptions> options, ILoggerFactor
/// </summary>
protected new JwtBearerEvents Events
{
get { return (JwtBearerEvents)base.Events; }
set { base.Events = value; }
get => (JwtBearerEvents)base.Events;
set => base.Events = value;
}

protected override Task<object> CreateEventsAsync() => Task.FromResult<object>(new JwtBearerEvents());
Expand Down Expand Up @@ -267,9 +267,8 @@ protected override async Task HandleChallengeAsync(AuthenticationProperties prop
private static string CreateErrorDescription(Exception authFailure)
{
IEnumerable<Exception> exceptions;
if (authFailure is AggregateException)
if (authFailure is AggregateException agEx)
{
var agEx = authFailure as AggregateException;
exceptions = agEx.InnerExceptions;
}
else
Expand All @@ -283,37 +282,32 @@ private static string CreateErrorDescription(Exception authFailure)
{
// Order sensitive, some of these exceptions derive from others
Copy link
Member

@Tratcher Tratcher May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this comment still relevant? Does the switch select the most specific match in a type hierarchy?

Copy link
Member

@Tratcher Tratcher May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind: https://docs.microsoft.com/en-us/dotnet/csharp/pattern-matching

The switch expressions are evaluated in textual order.

// and we want to display the most specific message possible.
if (ex is SecurityTokenInvalidAudienceException)
switch (ex)
{
messages.Add("The audience is invalid");
}
else if (ex is SecurityTokenInvalidIssuerException)
{
messages.Add("The issuer is invalid");
}
else if (ex is SecurityTokenNoExpirationException)
{
messages.Add("The token has no expiration");
}
else if (ex is SecurityTokenInvalidLifetimeException)
{
messages.Add("The token lifetime is invalid");
}
else if (ex is SecurityTokenNotYetValidException)
{
messages.Add("The token is not valid yet");
}
else if (ex is SecurityTokenExpiredException)
{
messages.Add("The token is expired");
}
else if (ex is SecurityTokenSignatureKeyNotFoundException)
{
messages.Add("The signature key was not found");
}
else if (ex is SecurityTokenInvalidSignatureException)
{
messages.Add("The signature is invalid");
case SecurityTokenInvalidAudienceException _:
messages.Add("The audience is invalid");
break;
case SecurityTokenInvalidIssuerException _:
messages.Add("The issuer is invalid");
break;
case SecurityTokenNoExpirationException _:
messages.Add("The token has no expiration");
break;
case SecurityTokenInvalidLifetimeException _:
messages.Add("The token lifetime is invalid");
break;
case SecurityTokenNotYetValidException _:
messages.Add("The token is not valid yet");
break;
case SecurityTokenExpiredException _:
messages.Add("The token is expired");
break;
case SecurityTokenSignatureKeyNotFoundException _:
messages.Add("The signature key was not found");
break;
case SecurityTokenInvalidSignatureException _:
messages.Add("The signature is invalid");
break;
}
}

Expand Down