Skip to content

Commit c813de6

Browse files
VeritasSoftwareVeritasSoftware
committed
updated framework to .net 5.0
1 parent cdb02dd commit c813de6

File tree

7 files changed

+42
-34
lines changed

7 files changed

+42
-34
lines changed

‎AspNetCore.Security.Jwt.UnitTests/AspNetCore.Security.Jwt.UnitTests.csproj

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="coverlet.msbuild" Version="2.4.0">
10+
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1212
<PrivateAssets>all</PrivateAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0-preview3-35497" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
17-
<PackageReference Include="Moq" Version="4.10.0" />
18-
<PackageReference Include="xunit" Version="2.3.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
14+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
17+
<PackageReference Include="Moq" Version="4.16.1" />
18+
<PackageReference Include="xunit" Version="2.4.1" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
2023
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
2124
</ItemGroup>
2225

‎AspNetCore.Security.Jwt.UnitTests/SecurityExtensionsTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using AspNetCore.Security.Jwt.Facebook;
33
using AspNetCore.Security.Jwt.Google;
44
using AspNetCore.Security.Jwt.Twitter;
5-
using Microsoft.AspNetCore.Builder.Internal;
5+
using Microsoft.AspNetCore.Builder;
66
using Microsoft.Extensions.Configuration;
77
using Microsoft.Extensions.DependencyInjection;
88
using Xunit;

‎AspNetCore.Security.Jwt.UnitTests/Startup.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace AspNetCore.Security.Jwt.UnitTests
88
{
99
using AspNetCore.Security.Jwt;
10+
using Microsoft.AspNetCore.Mvc;
1011

1112
public class Startup
1213
{
@@ -27,6 +28,7 @@ public void ConfigureServices(IServiceCollection services)
2728
c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo { Title = "XXX API", Version = "v1" });
2829
});
2930

31+
3032
var securitySettings = new SecuritySettings();
3133
this.Configuration.Bind("SecuritySettings", securitySettings);
3234

@@ -55,15 +57,16 @@ public void ConfigureServices(IServiceCollection services)
5557
.AddGoogleSecurity();
5658

5759
//services.AddMvc().AddSecurity().AddFacebookSecurity().AddAzureADSecurity();
58-
services.AddMvc()
60+
services.AddMvc(o => o.EnableEndpointRouting = false)
5961
.AddSecurity<UserModel>()
6062
.AddFacebookSecurity()
6163
.AddAzureADSecurity()
62-
.AddGoogleSecurity();
64+
.AddGoogleSecurity()
65+
.AddTwitterSecurity();
6366
}
6467

6568
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
66-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
69+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
6770
{
6871

6972
app.UseCors(builder =>

‎AspNetCore.Security.Jwt.UnitTests/SwaggerExtensionsTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.AspNetCore.Builder.Internal;
1+
using Microsoft.AspNetCore.Builder;
22
using Microsoft.Extensions.Configuration;
33
using Microsoft.Extensions.DependencyInjection;
44
using Xunit;

‎AspNetCore.Security.Jwt/AspNetCore.Security.Jwt.csproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<PackageId>AspNetCore.Security.Jwt</PackageId>
77
<Description>Package makes integrating JWT Bearer Token Security to your ASP .NET Core 2.0+ app a breeze!! Azure Active Directory, Google, Facebook, Twitter auth integration. Also, Swagger UI integration!</Description>
8-
<Version>1.7.0</Version>
8+
<Version>2.0.0</Version>
99
<Authors>Shantanu</Authors>
1010
<Company>Veritas Software</Company>
11-
<Copyright>Veritas Software 2019</Copyright>
11+
<Copyright>Veritas Software 2021</Copyright>
1212
<PackageProjectUrl>https://github.com/VeritasSoftware/AspNetCore.Security.Jwt</PackageProjectUrl>
1313
<PackageTags>AspNetCore.Security.Jwt JWT Bearer Token Security Swagger UI Facebook integration ASP .NET Core 2.0+ Azure Active Directory authentication app web api</PackageTags>
1414
<RepositoryUrl>https://github.com/VeritasSoftware/AspNetCore.Security.Jwt</RepositoryUrl>
15-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
16-
<PackageReleaseNotes>Fixes and enhancements. No breaking changes.</PackageReleaseNotes>
15+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16+
<PackageReleaseNotes>Updated framework to .net 5.0. No breaking changes.</PackageReleaseNotes>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
24-
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.4.0" />
25-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
26-
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc2" />
27-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
20+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.7" />
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
24+
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
25+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
26+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
27+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎AspNetCore.Security.Jwt/Extensions/MiscExtensions.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using Microsoft.AspNetCore.Http;
2-
using Microsoft.AspNetCore.Http.Internal;
32
using Newtonsoft.Json;
43
using System;
54
using System.IO;
65
using System.Text;
6+
using System.Threading.Tasks;
77

88
namespace AspNetCore.Security.Jwt
99
{
@@ -16,14 +16,15 @@ internal static class MiscExtensions
1616
/// <param name="httpRequest">The http request</param>
1717
/// <param name="condition">the valid condition</param>
1818
/// <returns>true/false based on the evaluation of the condition</returns>
19-
internal static bool IsValid<TModel>(this HttpRequest httpRequest, Func<TModel, bool> condition)
19+
internal async static Task<bool> IsValid<TModel>(this HttpRequest httpRequest, Func<TModel, bool> condition)
2020
{
2121
// Allows using several time the stream in ASP.Net Core
22-
httpRequest.EnableRewind();
22+
23+
HttpRequestRewindExtensions.EnableBuffering(httpRequest);
2324

2425
using (MemoryStream m = new MemoryStream())
2526
{
26-
httpRequest.Body.CopyTo(m);
27+
await httpRequest.Body.CopyToAsync(m);
2728

2829
var bodyString = Encoding.UTF8.GetString(m.ToArray());
2930

‎AspNetCore.Security.Jwt/Miscellaneous/Filters/BaseAuthorizeFilter.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
using Microsoft.AspNetCore.Mvc.Filters;
33
using Microsoft.Extensions.Logging;
44
using System;
5+
using System.Threading.Tasks;
56

67
namespace AspNetCore.Security.Jwt
78
{
8-
internal abstract class BaseAuthorizeFilter<TModel, TFilter> : IAuthorizationFilter
9+
internal abstract class BaseAuthorizeFilter<TModel, TFilter> : IAsyncAuthorizationFilter
910
{
1011
private readonly ILogger<TFilter> logger;
1112

@@ -14,13 +15,13 @@ protected BaseAuthorizeFilter(ILogger<TFilter> logger = null)
1415
this.logger = logger;
1516
}
1617

17-
public void OnAuthorization(AuthorizationFilterContext context)
18+
public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
1819
{
1920
var req = context.HttpContext.Request;
2021

2122
try
2223
{
23-
if (!req.IsValid(this.ValidCondition))
24+
if (!await req.IsValid(this.ValidCondition))
2425
{
2526
context.Result = new UnauthorizedResult();
2627
}

0 commit comments

Comments
 (0)