diff --git a/Okta.AspNet.Abstractions.Test/StrictTokenHandlerShould.cs b/Okta.AspNet.Abstractions.Test/StrictTokenHandlerShould.cs index aa16782..b2b6a6c 100644 --- a/Okta.AspNet.Abstractions.Test/StrictTokenHandlerShould.cs +++ b/Okta.AspNet.Abstractions.Test/StrictTokenHandlerShould.cs @@ -61,7 +61,7 @@ public void RejectInvalidAlg() var fakeAudience = "aud://default"; var credentials = new SigningCredentials( - new SymmetricSecurityKey(Encoding.UTF8.GetBytes("fakesigningsecret!")), + new SymmetricSecurityKey(Encoding.UTF8.GetBytes("extralongtosatisfynewrequirementsfakesigningsecret!")), SecurityAlgorithms.HmacSha256); // Create the JWT and write it to a string diff --git a/Okta.AspNet.Abstractions.Test/TokenValidationShould.cs b/Okta.AspNet.Abstractions.Test/TokenValidationShould.cs index d758a96..494bbc7 100644 --- a/Okta.AspNet.Abstractions.Test/TokenValidationShould.cs +++ b/Okta.AspNet.Abstractions.Test/TokenValidationShould.cs @@ -22,7 +22,7 @@ public void AllowGoodToken() var fakeAudience = "aud://default"; var credentials = new SigningCredentials( - new SymmetricSecurityKey(Encoding.UTF8.GetBytes("fakesigningsecret!")), + new SymmetricSecurityKey(Encoding.UTF8.GetBytes("extralongtosatisfynewrequirementsfakesigningsecret!")), SecurityAlgorithms.HmacSha256); // Create the JWT and write it to a string @@ -77,7 +77,7 @@ public void RejectExpiredToken() var fakeAudience = "aud://default"; var credentials = new SigningCredentials( - new SymmetricSecurityKey(Encoding.UTF8.GetBytes("fakesigningsecret!")), + new SymmetricSecurityKey(Encoding.UTF8.GetBytes("extralongtosatisfynewrequirementsfakesigningsecret!")), SecurityAlgorithms.HmacSha256); // Create the JWT and write it to a string @@ -144,7 +144,7 @@ public void RejectWrongIssuer() var fakeAudience = "aud://default"; var credentials = new SigningCredentials( - new SymmetricSecurityKey(Encoding.UTF8.GetBytes("fakesigningsecret!")), + new SymmetricSecurityKey(Encoding.UTF8.GetBytes("extralongtosatisfynewrequirementsfakesigningsecret!")), SecurityAlgorithms.HmacSha256); // Create the JWT and write it to a string @@ -180,7 +180,7 @@ public void RejectWrongAudience() var fakeAudience = "aud://default"; var credentials = new SigningCredentials( - new SymmetricSecurityKey(Encoding.UTF8.GetBytes("fakesigningsecret!")), + new SymmetricSecurityKey(Encoding.UTF8.GetBytes("extralongtosatisfynewrequirementsfakesigningsecret!")), SecurityAlgorithms.HmacSha256); // Create the JWT and write it to a string diff --git a/Okta.AspNet.Abstractions/Okta.AspNet.Abstractions.csproj b/Okta.AspNet.Abstractions/Okta.AspNet.Abstractions.csproj index 2a55dcd..7b2ef09 100644 --- a/Okta.AspNet.Abstractions/Okta.AspNet.Abstractions.csproj +++ b/Okta.AspNet.Abstractions/Okta.AspNet.Abstractions.csproj @@ -1,8 +1,8 @@  - net462;netstandard2.0 - 5.0.0 + net462;netstandard2.0;net8.0 + 5.1.0 @@ -15,10 +15,9 @@ - - + - + @@ -36,8 +35,8 @@ true okta.aspnet.public.snk true - 5.0.0.0 - 5.0.0.0 + 5.1.0.0 + 5.1.0.0 diff --git a/Okta.AspNet.Test/JwtOptionsBuilderShould.cs b/Okta.AspNet.Test/JwtOptionsBuilderShould.cs index 24b28bc..1b51bc0 100644 --- a/Okta.AspNet.Test/JwtOptionsBuilderShould.cs +++ b/Okta.AspNet.Test/JwtOptionsBuilderShould.cs @@ -20,7 +20,7 @@ public void BuildJwtBearerOptions() var oktaWebApiOptions = new OktaWebApiOptions { - OktaDomain = "http://myoktadomain.com", + OktaDomain = "https://myoktadomain.com", BackchannelTimeout = TimeSpan.FromMinutes(5), BackchannelHttpClientHandler = new MockHttpClientHandler(), OAuthBearerAuthenticationProvider = mockAuthnProvider, diff --git a/Okta.AspNet.WebApi.IntegrationTest/Okta.AspNet.WebApi.IntegrationTest.csproj b/Okta.AspNet.WebApi.IntegrationTest/Okta.AspNet.WebApi.IntegrationTest.csproj index 8861016..5b04d98 100644 --- a/Okta.AspNet.WebApi.IntegrationTest/Okta.AspNet.WebApi.IntegrationTest.csproj +++ b/Okta.AspNet.WebApi.IntegrationTest/Okta.AspNet.WebApi.IntegrationTest.csproj @@ -47,10 +47,25 @@ 4 + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\packages\Microsoft.IdentityModel.Abstractions.6.35.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll + + + ..\packages\Microsoft.IdentityModel.JsonWebTokens.6.35.0\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll + + + ..\packages\Microsoft.IdentityModel.Logging.6.35.0\lib\net462\Microsoft.IdentityModel.Logging.dll + + + ..\packages\Microsoft.IdentityModel.Tokens.6.35.0\lib\net462\Microsoft.IdentityModel.Tokens.dll + ..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll @@ -93,6 +108,9 @@ ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.6.35.0\lib\net462\System.IdentityModel.Tokens.Jwt.dll + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -110,8 +128,8 @@ ..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -127,9 +145,18 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.4.7.2\lib\net461\System.Text.Json.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + diff --git a/Okta.AspNet.WebApi.IntegrationTest/packages.config b/Okta.AspNet.WebApi.IntegrationTest/packages.config index bb0791e..51cc2c4 100644 --- a/Okta.AspNet.WebApi.IntegrationTest/packages.config +++ b/Okta.AspNet.WebApi.IntegrationTest/packages.config @@ -6,7 +6,12 @@ + + + + + @@ -22,16 +27,21 @@ + - + + + + + diff --git a/Okta.AspNet/Okta.AspNet.csproj b/Okta.AspNet/Okta.AspNet.csproj index 8625790..458aeaa 100644 --- a/Okta.AspNet/Okta.AspNet.csproj +++ b/Okta.AspNet/Okta.AspNet.csproj @@ -3,7 +3,7 @@ Official Okta middleware for ASP.NET 4.6.2+. Easily add authentication and authorization to ASP.NET applications. (c) 2019 Okta, Inc. - 3.2.3 + 3.2.4 Okta, Inc. net462 Okta.AspNet @@ -24,14 +24,14 @@ - + ..\OktaSdk.ruleset - 3.2.3.0 - 3.2.3.0 + 3.2.4.0 + 3.2.4.0 true okta.aspnet.public.snk true diff --git a/Okta.AspNetCore/Okta.AspNetCore.csproj b/Okta.AspNetCore/Okta.AspNetCore.csproj index e45ee26..6f33307 100644 --- a/Okta.AspNetCore/Okta.AspNetCore.csproj +++ b/Okta.AspNetCore/Okta.AspNetCore.csproj @@ -7,8 +7,8 @@ Official Okta middleware for ASP.NET Core 3.1+. Easily add authentication and authorization to ASP.NET Core applications. (c) 2020 - present Okta, Inc. All rights reserved. - 4.6.0 - 4.6.0 + 4.6.1 + 4.6.1 Okta, Inc. Okta.AspNetCore Okta.AspNetCore diff --git a/Okta.AspNetCore/OpenIdConnectOptionsHelper.cs b/Okta.AspNetCore/OpenIdConnectOptionsHelper.cs index acd8914..d4f4eb1 100644 --- a/Okta.AspNetCore/OpenIdConnectOptionsHelper.cs +++ b/Okta.AspNetCore/OpenIdConnectOptionsHelper.cs @@ -37,11 +37,11 @@ public static void ConfigureOpenIdConnectOptions(OktaMvcOptions oktaMvcOptions, oidcOptions.SignedOutRedirectUri = oktaMvcOptions.PostLogoutRedirectUri; oidcOptions.ResponseType = OpenIdConnectResponseType.Code; oidcOptions.GetClaimsFromUserInfoEndpoint = oktaMvcOptions.GetClaimsFromUserInfoEndpoint; + #if NET8_0_OR_GREATER - oidcOptions.TokenHandler = new StrictTokenHandler(); -#else - oidcOptions.SecurityTokenValidator = new StrictSecurityTokenValidator(); + oidcOptions.UseSecurityTokenValidator = true; #endif + oidcOptions.SecurityTokenValidator = new StrictSecurityTokenValidator(); oidcOptions.SaveTokens = true; oidcOptions.UseTokenLifetime = false; oidcOptions.BackchannelHttpHandler = new OktaHttpMessageHandler(