diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..642304369 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# xUnit1031: Do not use blocking task operations in test method +dotnet_diagnostic.xUnit1031.severity = none diff --git a/.github/workflows/codeql-analysis-js.yml b/.github/workflows/codeql-analysis-js.yml index 468693e2e..f69324b1b 100644 --- a/.github/workflows/codeql-analysis-js.yml +++ b/.github/workflows/codeql-analysis-js.yml @@ -66,7 +66,7 @@ jobs: name: Restore # Build - run: dotnet build -c Release - name: Builde + name: Build - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.sonarlint/TheIdServer.slconfig b/.sonarlint/TheIdServer.slconfig deleted file mode 100644 index 6328c13ad..000000000 --- a/.sonarlint/TheIdServer.slconfig +++ /dev/null @@ -1,27 +0,0 @@ -{ - "ServerUri": "https://sonarcloud.io/", - "Organization": { - "Key": "aguacongas", - "Name": "Olivier Lefebvre" - }, - "ProjectKey": "aguacongas_TheIdServer", - "ProjectName": "TheIdServer", - "Profiles": { - "Secrets": { - "ProfileKey": "AYXoTKWz9Ao2yLWbM0n6", - "ProfileTimestamp": "2023-01-25T09:40:14Z" - }, - "CSharp": { - "ProfileKey": "AW8e9NVJZPoDbtkGSYCm", - "ProfileTimestamp": "2023-02-22T15:28:25Z" - }, - "Js": { - "ProfileKey": "AW8POwb8PHYyZX2yhorZ", - "ProfileTimestamp": "2023-01-25T09:26:55Z" - }, - "Ts": { - "ProfileKey": "AW8POwb8PHYyZX2yhore", - "ProfileTimestamp": "2023-01-25T09:47:40Z" - } - } -} \ No newline at end of file diff --git a/.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml b/.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml deleted file mode 100644 index 90bc98dff..000000000 --- a/.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - sonar.cs.analyzeGeneratedCode - false - - - sonar.cs.file.suffixes - .cs - - - sonar.cs.ignoreHeaderComments - true - - - sonar.cs.roslyn.ignoreIssues - false - - - - - S107 - - - max - 7 - - - - - S110 - - - max - 5 - - - - - S1479 - - - maximum - 30 - - - - - S2342 - - - flagsAttributeFormat - ^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?s$ - - - format - ^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?$ - - - - - S2436 - - - max - 2 - - - maxMethod - 3 - - - - - S3776 - - - propertyThreshold - 3 - - - threshold - 15 - - - - - \ No newline at end of file diff --git a/.sonarlint/aguacongas_theidservercsharp.ruleset b/.sonarlint/aguacongas_theidservercsharp.ruleset deleted file mode 100644 index dcdb5c053..000000000 --- a/.sonarlint/aguacongas_theidservercsharp.ruleset +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TheIdServer.sln b/TheIdServer.sln index f79869041..fdeb47a4b 100644 --- a/TheIdServer.sln +++ b/TheIdServer.sln @@ -235,6 +235,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientCredentials", "sample EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebClient", "sample\DPoP\WebClient\WebClient.csproj", "{D2B86706-5A7D-4414-8AE4-E579B4DEA462}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BF817CA8-D33B-401C-8DFB-D7069180E7AA}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/appveyor.yml b/appveyor.yml index acaf5da8e..e50afbfb5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,13 +14,13 @@ services: environment: GITHUB_TOKEN: secure: /o9VAhx5ewGmdLR9qcgFJMzBaCuzOmGlsXAHu7khUJLdQzsv4gJzLUfYDghcRPHd - donetsdk: 7.0.400 + donetsdk: 7.0.402 JAVA_HOME: C:\Program Files\Java\jdk14 PATH: $(JAVA_HOME)\bin;$(PATH) init: - cmd: git config --global core.autocrlf true install: - - ps: Install-Product node '' + - ps: Install-Product node 18 x64 - ps: .\dotnet-install.ps1 -Version 6.0.11 -Runtime dotnet -Architecture x64 -InstallDir "C:\Program Files\dotnet" - ps: .\dotnet-install.ps1 -Version 6.0.11 -Runtime aspnetcore -Architecture x64 -InstallDir "C:\Program Files\dotnet" - ps: .\dotnet-install.ps1 -Version $env:donetsdk -InstallDir "C:\Program Files\dotnet" diff --git a/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj b/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj index 09666e804..7f805e06a 100644 --- a/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj +++ b/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj @@ -13,11 +13,7 @@ - - - - - + @@ -25,7 +21,4 @@ - - - diff --git a/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.ruleset b/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.ruleset index 3da2e113d..8617caca4 100644 --- a/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.ruleset +++ b/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj b/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj index 79d867443..198fb6692 100644 --- a/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj +++ b/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj @@ -6,15 +6,10 @@ enable enable false - ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/sample/Aguacongas.TheIdServer.CibaSample/Program.cs b/sample/Aguacongas.TheIdServer.CibaSample/Program.cs index 7505c3554..8a93c4eb7 100644 --- a/sample/Aguacongas.TheIdServer.CibaSample/Program.cs +++ b/sample/Aguacongas.TheIdServer.CibaSample/Program.cs @@ -20,13 +20,14 @@ async Task RequestTokenAsync(BackchannelAuthenticationResponse au var disco = await _cache.GetAsync(); if (disco.IsError) { - throw new Exception(disco.Error); + throw new InvalidOperationException(disco.Error); } var client = new HttpClient(); while (true) { +#pragma warning disable CS8601 // Possible null reference assignment. var response = await client.RequestBackchannelAuthenticationTokenAsync(new BackchannelAuthenticationTokenRequest { Address = disco.TokenEndpoint, @@ -34,6 +35,7 @@ async Task RequestTokenAsync(BackchannelAuthenticationResponse au ClientSecret = "secret", AuthenticationRequestId = authorizeResponse.AuthenticationRequestId }); +#pragma warning restore CS8601 // Possible null reference assignment. if (response.IsError) { @@ -100,8 +102,13 @@ async Task RequestBackchannelLoginAsync() return response; } -async Task CallServiceAsync(string token) +async Task CallServiceAsync(string? token) { + if (token is null) + { + return; + } + var baseAddress = Constants.SampleApi; var client = new HttpClient diff --git a/sample/Aguacongas.TheIdServer.CibaSample/TokenResponseExtensions.cs b/sample/Aguacongas.TheIdServer.CibaSample/TokenResponseExtensions.cs index 5443eb0df..5aaf575a3 100644 --- a/sample/Aguacongas.TheIdServer.CibaSample/TokenResponseExtensions.cs +++ b/sample/Aguacongas.TheIdServer.CibaSample/TokenResponseExtensions.cs @@ -14,7 +14,7 @@ public static void Show(this TokenResponse response) "Token response:".ConsoleGreen(); Console.WriteLine(response.Json); - if (response.AccessToken.Contains(".")) + if (response.AccessToken is not null && response.AccessToken.Contains(".") == true) { "\nAccess Token (decoded):".ConsoleGreen(); diff --git a/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.csproj b/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.csproj index 215bf0203..df940b4f9 100644 --- a/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.csproj +++ b/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.csproj @@ -1,4 +1,4 @@ - + Exe @@ -15,11 +15,7 @@ - - - - - + diff --git a/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.ruleset b/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.ruleset index 3cc039a1f..95b794ed0 100644 --- a/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.ruleset +++ b/sample/Aguacongas.TheIdServer.ClientCredentialSample/Aguacongas.TheIdServer.ClientCredentialSample.ruleset @@ -1,5 +1,4 @@ - + - \ No newline at end of file diff --git a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj index a1b266e9a..1354352b2 100644 --- a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj +++ b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj @@ -1,16 +1,11 @@ - + net7.0 false True - ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - diff --git a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj index 5a898939b..a75e07773 100644 --- a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj +++ b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj @@ -1,4 +1,4 @@ - + Exe @@ -15,11 +15,7 @@ - - - - - + diff --git a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.ruleset b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.ruleset index c11e53ff3..11e9f3c81 100644 --- a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.ruleset +++ b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj b/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj index c513e40c3..d8974298c 100644 --- a/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj +++ b/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj @@ -1,4 +1,4 @@ - + Exe @@ -6,15 +6,10 @@ enable enable false - ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/sample/Aguacongas.TheIdServer.MtlsSample/TokenResponseExtensions.cs b/sample/Aguacongas.TheIdServer.MtlsSample/TokenResponseExtensions.cs index f8e5623b6..9536d5cdf 100644 --- a/sample/Aguacongas.TheIdServer.MtlsSample/TokenResponseExtensions.cs +++ b/sample/Aguacongas.TheIdServer.MtlsSample/TokenResponseExtensions.cs @@ -14,7 +14,7 @@ public static void Show(this TokenResponse response) "Token response:".ConsoleGreen(); Console.WriteLine(response.Json); - if (response.AccessToken.Contains(".")) + if (response.AccessToken is not null && response.AccessToken.Contains(".")) { "\nAccess Token (decoded):".ConsoleGreen(); diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj b/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj index 77e6d48ac..93d9c993c 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj +++ b/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -14,12 +14,8 @@ - - - - - - + + diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.ruleset b/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.ruleset index 3da2e113d..8617caca4 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.ruleset +++ b/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.csproj b/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.csproj index cf68c95ed..bd51ec13a 100644 --- a/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.csproj +++ b/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.csproj @@ -13,8 +13,4 @@ Aguacongas.TheIdServer.Sample.Shared.ruleset - - - - diff --git a/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.ruleset b/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.ruleset index 3da2e113d..8617caca4 100644 --- a/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.ruleset +++ b/sample/Aguacongas.TheIdServer.Sample.Shared/Aguacongas.TheIdServer.Sample.Shared.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj b/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj index 7dd00cb21..06139e759 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj @@ -1,17 +1,12 @@ - + net7.0 - ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset false - - - - - + diff --git a/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj b/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj index 0f44335ee..c1b3d7a76 100644 --- a/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj +++ b/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,15 +12,11 @@ Aguacongas.TheIdentityServer.SpaSample.ruleset - - - - - - - + + + diff --git a/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.ruleset b/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.ruleset index 3da2e113d..8617caca4 100644 --- a/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.ruleset +++ b/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/sample/DPoP/Api/ApiHost.csproj b/sample/DPoP/Api/ApiHost.csproj index 352b35790..9e58e510b 100644 --- a/sample/DPoP/Api/ApiHost.csproj +++ b/sample/DPoP/Api/ApiHost.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/sample/DPoP/ClientCredentials/ClientCredentials.csproj b/sample/DPoP/ClientCredentials/ClientCredentials.csproj index a23ff0153..0e9a9f8c2 100644 --- a/sample/DPoP/ClientCredentials/ClientCredentials.csproj +++ b/sample/DPoP/ClientCredentials/ClientCredentials.csproj @@ -8,6 +8,6 @@ - + diff --git a/sample/DPoP/WebClient/WebClient.csproj b/sample/DPoP/WebClient/WebClient.csproj index 0b48f03d0..c628bfdbd 100644 --- a/sample/DPoP/WebClient/WebClient.csproj +++ b/sample/DPoP/WebClient/WebClient.csproj @@ -6,7 +6,7 @@ - + diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj index d754dfda6..470c3fc40 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -27,10 +27,6 @@ - - - - 1701;1702;NU1603 @@ -39,24 +35,24 @@ 1701;1702;NU1603 - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.ruleset b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.ruleset index 693e8e889..11e9f3c81 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.ruleset +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj index 58735f2dd..e61683dbc 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -15,9 +15,6 @@ Aguacongas.TheIdServer.Private.ruleset - - - 1701;1702;NU1603 @@ -26,36 +23,36 @@ 1701;1702;NU1603 - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + \ No newline at end of file diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.ruleset b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.ruleset index 693e8e889..11e9f3c81 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.ruleset +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj index 70c5304ac..8c1633c08 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -16,35 +16,32 @@ Aguacongas.TheIdServer.Public.ruleset - - - - - - - + + + + - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.ruleset b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.ruleset index 693e8e889..11e9f3c81 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.ruleset +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj b/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj index 4958f4902..f54c20c51 100644 --- a/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj +++ b/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,14 +12,8 @@ Aguacongas.AspNetCore.Authentication store implementation for TheIdServer API. Full package-icon.png - - ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj b/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj index c545dfc3d..c5a64d749 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj +++ b/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -29,15 +29,14 @@ - Always - - + + diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.ruleset b/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.ruleset index 3da2e113d..8617caca4 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.ruleset +++ b/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Dockerfile b/src/Aguacongas.TheIdServer.BlazorApp/Dockerfile index 40eabdd86..8a279090a 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/Dockerfile +++ b/src/Aguacongas.TheIdServer.BlazorApp/Dockerfile @@ -40,7 +40,7 @@ RUN dotnet build "Aguacongas.TheIdServer.BlazorApp.csproj" -c Release -o /app/bu FROM build AS publish RUN dotnet publish "Aguacongas.TheIdServer.BlazorApp.csproj" -c Release -o /app/publish -p:FileVersion=$FILE_VERSION -p:SourceRevisionId=$SOURCE_VERSION -FROM nginx:1.24 AS final +FROM nginx:1.25.2 AS final WORKDIR /usr/share/nginx/html COPY --from=publish /app/publish/wwwroot . COPY --from=build /src/src/Aguacongas.TheIdServer.BlazorApp/nginx.conf /etc/nginx/nginx.conf diff --git a/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj b/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj index 633aafa0a..af6c934a8 100644 --- a/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj +++ b/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -7,8 +7,6 @@ ..\.. True - - ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset @@ -25,10 +23,6 @@ - - - - Always @@ -48,7 +42,7 @@ - - + + diff --git a/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.csproj b/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.csproj index a81fcff76..16d400aff 100644 --- a/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.csproj +++ b/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -23,11 +23,7 @@ - - - - - + diff --git a/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.ruleset b/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.ruleset index c11e53ff3..11e9f3c81 100644 --- a/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.ruleset +++ b/src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.csproj b/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.csproj index d25123b55..65f7a36f5 100644 --- a/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.csproj +++ b/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.csproj @@ -29,39 +29,36 @@ Aguacongas.TheIdServer.ruleset 1701;1702;CA1416;NU1603;NU1608 - - - - + - + - - - - - - - - - + + + + + + + + + - - + + - - + + @@ -69,9 +66,9 @@ - + - + diff --git a/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.ruleset b/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.ruleset index 3da2e113d..8617caca4 100644 --- a/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.ruleset +++ b/src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/Aguacongas.TheIdServer.BlazorApp.Components.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/Aguacongas.TheIdServer.BlazorApp.Components.csproj index f0a8d0ae7..cc9e3aa6d 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/Aguacongas.TheIdServer.BlazorApp.Components.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/Aguacongas.TheIdServer.BlazorApp.Components.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,17 +13,11 @@ TheIdServer administration application components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - - + + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Infrastructure/Aguacongas.TheIdServer.BlazorApp.Infrastructure.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Infrastructure/Aguacongas.TheIdServer.BlazorApp.Infrastructure.csproj index 1738afcbd..dc1f9e602 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Infrastructure/Aguacongas.TheIdServer.BlazorApp.Infrastructure.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Infrastructure/Aguacongas.TheIdServer.BlazorApp.Infrastructure.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,24 +13,18 @@ Full Aguacongas.TheIdServer.BlazorApp package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - - - + + + - - + + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Api/Aguacongas.TheIdServer.BlazorApp.Pages.Api.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Api/Aguacongas.TheIdServer.BlazorApp.Pages.Api.csproj index 46ad90d46..35c0b5674 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Api/Aguacongas.TheIdServer.BlazorApp.Pages.Api.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Api/Aguacongas.TheIdServer.BlazorApp.Pages.Api.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,20 +13,14 @@ TheIdServer administration application api page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope.csproj index f6475869e..2e0f64614 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,21 +13,15 @@ TheIdServer administration application api scope page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes.csproj index 56d7f7a62..b1f6318d1 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,21 +13,15 @@ TheIdServer administration application api scope list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Apis/Aguacongas.TheIdServer.BlazorApp.Pages.Apis.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Apis/Aguacongas.TheIdServer.BlazorApp.Pages.Apis.csproj index 32204df05..b342342bf 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Apis/Aguacongas.TheIdServer.BlazorApp.Pages.Apis.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Apis/Aguacongas.TheIdServer.BlazorApp.Pages.Apis.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,21 +13,15 @@ TheIdServer administration application api list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Aguacongas.TheIdServer.BlazorApp.Pages.Client.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Aguacongas.TheIdServer.BlazorApp.Pages.Client.csproj index ab70d4ded..9c02078fd 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Aguacongas.TheIdServer.BlazorApp.Pages.Client.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Aguacongas.TheIdServer.BlazorApp.Pages.Client.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,21 +13,15 @@ TheIdServer administration application client page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Clients/Aguacongas.TheIdServer.BlazorApp.Pages.Clients.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Clients/Aguacongas.TheIdServer.BlazorApp.Pages.Clients.csproj index 5feecd5d1..c3d3d28ba 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Clients/Aguacongas.TheIdServer.BlazorApp.Pages.Clients.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Clients/Aguacongas.TheIdServer.BlazorApp.Pages.Clients.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,21 +13,15 @@ TheIdServer administration application client list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Culture/Aguacongas.TheIdServer.BlazorApp.Pages.Culture.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Culture/Aguacongas.TheIdServer.BlazorApp.Pages.Culture.csproj index 73749e8f7..a85a3af06 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Culture/Aguacongas.TheIdServer.BlazorApp.Pages.Culture.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Culture/Aguacongas.TheIdServer.BlazorApp.Pages.Culture.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,21 +13,15 @@ TheIdServer administration application culture page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures.csproj index 55b9fded8..4f6e902e2 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,21 +13,15 @@ TheIdServer administration application culture list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider.csproj index c13af37df..bed97dea7 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application external provider page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders.csproj index 5657cb5bd..4cc34fcf5 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application external provider list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identities/Aguacongas.TheIdServer.BlazorApp.Pages.Identities.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identities/Aguacongas.TheIdServer.BlazorApp.Pages.Identities.csproj index 0d8bb9c0a..ccac99c88 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identities/Aguacongas.TheIdServer.BlazorApp.Pages.Identities.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identities/Aguacongas.TheIdServer.BlazorApp.Pages.Identities.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application identity list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identity/Aguacongas.TheIdServer.BlazorApp.Pages.Identity.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identity/Aguacongas.TheIdServer.BlazorApp.Pages.Identity.csproj index 28d825508..99dc1fae9 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identity/Aguacongas.TheIdServer.BlazorApp.Pages.Identity.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identity/Aguacongas.TheIdServer.BlazorApp.Pages.Identity.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application identity page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Import/Aguacongas.TheIdServer.BlazorApp.Pages.Import.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Import/Aguacongas.TheIdServer.BlazorApp.Pages.Import.csproj index 5ec088233..573f08acf 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Import/Aguacongas.TheIdServer.BlazorApp.Pages.Import.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Import/Aguacongas.TheIdServer.BlazorApp.Pages.Import.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application import page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Keys/Aguacongas.TheIdServer.BlazorApp.Pages.Keys.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Keys/Aguacongas.TheIdServer.BlazorApp.Pages.Keys.csproj index 1ac8a0678..e82a3390f 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Keys/Aguacongas.TheIdServer.BlazorApp.Pages.Keys.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Keys/Aguacongas.TheIdServer.BlazorApp.Pages.Keys.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application key list page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties.csproj index e4cc653c4..bd1b63a71 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application relying party list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty.csproj index 9f3447988..745c55b5f 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application api scope page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - - + + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Role/Aguacongas.TheIdServer.BlazorApp.Pages.Role.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Role/Aguacongas.TheIdServer.BlazorApp.Pages.Role.csproj index 11a3d84b5..c5d8fb433 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Role/Aguacongas.TheIdServer.BlazorApp.Pages.Role.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Role/Aguacongas.TheIdServer.BlazorApp.Pages.Role.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application role page and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Roles/Aguacongas.TheIdServer.BlazorApp.Pages.Roles.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Roles/Aguacongas.TheIdServer.BlazorApp.Pages.Roles.csproj index a638ef08a..54aa9b421 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Roles/Aguacongas.TheIdServer.BlazorApp.Pages.Roles.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Roles/Aguacongas.TheIdServer.BlazorApp.Pages.Roles.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application role list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Settings/Aguacongas.TheIdServer.BlazorApp.Pages.Settings.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Settings/Aguacongas.TheIdServer.BlazorApp.Pages.Settings.csproj index 8f59f198e..7543672c8 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Settings/Aguacongas.TheIdServer.BlazorApp.Pages.Settings.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Settings/Aguacongas.TheIdServer.BlazorApp.Pages.Settings.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -14,21 +14,16 @@ package-icon.png enable enable - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.User/Aguacongas.TheIdServer.BlazorApp.Pages.User.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.User/Aguacongas.TheIdServer.BlazorApp.Pages.User.csproj index 7372795dd..e62ea59da 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.User/Aguacongas.TheIdServer.BlazorApp.Pages.User.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.User/Aguacongas.TheIdServer.BlazorApp.Pages.User.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application external provider user and components. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Users/Aguacongas.TheIdServer.BlazorApp.Pages.Users.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Users/Aguacongas.TheIdServer.BlazorApp.Pages.Users.csproj index 6a9befd2f..11e1d9ae7 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Users/Aguacongas.TheIdServer.BlazorApp.Pages.Users.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Users/Aguacongas.TheIdServer.BlazorApp.Pages.Users.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,21 +12,15 @@ TheIdServer administration application user list page. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Aguacongas.TheIdServer.BlazorApp.Pages.csproj b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Aguacongas.TheIdServer.BlazorApp.Pages.csproj index 9d77e1730..c3ca6e43b 100644 --- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Aguacongas.TheIdServer.BlazorApp.Pages.csproj +++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Aguacongas.TheIdServer.BlazorApp.Pages.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,16 +13,10 @@ TheIdServer administration application pages. Full package-icon.png - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.csproj b/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.csproj index f18d4592b..42a6b204e 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -22,14 +22,10 @@ Aguacongas.IdentityServer.Admin.Http.Store.ruleset - - - - - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.ruleset b/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.ruleset index 5dfc947b5..8617caca4 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.ruleset +++ b/src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.csproj b/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.csproj index b2e217fe8..8e64ae0f2 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -30,25 +30,21 @@ - - - - - + - - - - - - - - - - + + + + + + + + + + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.ruleset b/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.ruleset index 5dfc947b5..8617caca4 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.ruleset +++ b/src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.csproj b/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.csproj index 8a62aa959..71df502d5 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -24,11 +24,7 @@ - - - - - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.ruleset b/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.ruleset index 5dfc947b5..8617caca4 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.ruleset +++ b/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.csproj b/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.csproj index 9b934f045..803852e31 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -23,13 +23,9 @@ - - - - - + - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.ruleset b/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.ruleset index 693e8e889..11e9f3c81 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.ruleset +++ b/src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/IdentityServer/Aguacongas.IdentityServer.KeysRotation/Aguacongas.IdentityServer.KeysRotation.csproj b/src/IdentityServer/Aguacongas.IdentityServer.KeysRotation/Aguacongas.IdentityServer.KeysRotation.csproj index 1bd9d5823..539b884e2 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.KeysRotation/Aguacongas.IdentityServer.KeysRotation.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.KeysRotation/Aguacongas.IdentityServer.KeysRotation.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,27 +12,21 @@ package-icon.png Apache-2.0 true - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - - - - + + + + - - - - - + + + + + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.MongoDb.Store/Aguacongas.IdentityServer.MongoDb.Store.csproj b/src/IdentityServer/Aguacongas.IdentityServer.MongoDb.Store/Aguacongas.IdentityServer.MongoDb.Store.csproj index cdf790086..462edd256 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.MongoDb.Store/Aguacongas.IdentityServer.MongoDb.Store.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.MongoDb.Store/Aguacongas.IdentityServer.MongoDb.Store.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -11,20 +11,14 @@ theidserver;administration;mongodb package-icon.png Apache-2.0 - - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.csproj b/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.csproj index 9f2ad39d3..d31b16299 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -24,11 +24,7 @@ - - - - - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.ruleset b/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.ruleset index 5dfc947b5..8617caca4 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.ruleset +++ b/src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.csproj b/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.csproj index 9e200c334..63f40d8c2 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -24,11 +24,7 @@ - - - - - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.ruleset b/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.ruleset index 5dfc947b5..8617caca4 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.ruleset +++ b/src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/IdentityServer/Aguacongas.IdentityServer.WsFederation/Aguacongas.IdentityServer.WsFederation.csproj b/src/IdentityServer/Aguacongas.IdentityServer.WsFederation/Aguacongas.IdentityServer.WsFederation.csproj index 72160bdee..f9898d66d 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer.WsFederation/Aguacongas.IdentityServer.WsFederation.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer.WsFederation/Aguacongas.IdentityServer.WsFederation.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -15,7 +15,6 @@ true Library true - ..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset README.md @@ -33,11 +32,7 @@ - - - - - + diff --git a/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.csproj b/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.csproj index 6c8c95d0b..7800dd740 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.csproj +++ b/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -30,18 +30,14 @@ - - - - - - - - - - + + + + + + diff --git a/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.ruleset b/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.ruleset index 5dfc947b5..8617caca4 100644 --- a/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.ruleset +++ b/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Admin.Duende/Aguacongas.IdentityServer.Admin.Duende.csproj b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Admin.Duende/Aguacongas.IdentityServer.Admin.Duende.csproj index 193b9166a..26156b28e 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Admin.Duende/Aguacongas.IdentityServer.Admin.Duende.csproj +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Admin.Duende/Aguacongas.IdentityServer.Admin.Duende.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,8 +12,6 @@ Apache-2.0 true package-icon.png - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True @@ -33,10 +31,6 @@ 1701;1702;AD0001 - - - - @@ -44,7 +38,7 @@ - + diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Duende/Aguacongas.IdentityServer.Duende.csproj b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Duende/Aguacongas.IdentityServer.Duende.csproj index cee1ab8f9..3c595a47f 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Duende/Aguacongas.IdentityServer.Duende.csproj +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Duende/Aguacongas.IdentityServer.Duende.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -15,7 +15,6 @@ package-icon.png Aguacongas.IdentityServer True - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset @@ -26,10 +25,6 @@ $(DefineConstants)TRACE - - - - @@ -41,7 +36,7 @@ - + diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.csproj b/src/IdentityServer/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.csproj index 6347806f9..fa31f53f4 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.csproj +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -11,14 +11,9 @@ theidserver;duende.identityserver;ef;administration package-icon.png Apache-2.0 - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.KeysRotation.Duende/Aguacongas.IdentityServer.KeysRotation.Duende.csproj b/src/IdentityServer/Duende/Aguacongas.IdentityServer.KeysRotation.Duende/Aguacongas.IdentityServer.KeysRotation.Duende.csproj index 5755c8019..6a04e5d05 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.KeysRotation.Duende/Aguacongas.IdentityServer.KeysRotation.Duende.csproj +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.KeysRotation.Duende/Aguacongas.IdentityServer.KeysRotation.Duende.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,8 +12,6 @@ package-icon.png Apache-2.0 true - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True @@ -25,16 +23,12 @@ $(DefineConstants)TRACE - - - - - + diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.csproj b/src/IdentityServer/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.csproj index 296cfeda2..3fe4dede4 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.csproj +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,13 +12,8 @@ package-icon.png Apache-2.0 True - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - - - - diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.csproj b/src/IdentityServer/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.csproj index 3a2b1b3d6..349d7477d 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.csproj +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -11,15 +11,9 @@ theidserver;duende.identityserver;administration;ravendb package-icon.png Apache-2.0 - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Aguacongas.IdentityServer.Saml2p.Duende.csproj b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Aguacongas.IdentityServer.Saml2p.Duende.csproj index 9abd6ec44..89d7cf4d1 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Aguacongas.IdentityServer.Saml2p.Duende.csproj +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Aguacongas.IdentityServer.Saml2p.Duende.csproj @@ -13,8 +13,6 @@ true package-icon.png Apache-2.0 - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset README.md enable @@ -30,7 +28,7 @@ - + diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Saml2PService.cs b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Saml2PService.cs index e43ffd6f4..7bf49ab08 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Saml2PService.cs +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Saml2PService.cs @@ -68,7 +68,8 @@ public async Task ArtifactAsync(HttpRequest request) /// public async Task LoginAsync(HttpRequest request, IUrlHelper helper) { - var user = await _userSession.GetUserAsync().ConfigureAwait(false); + var user = await _userSession.GetUserAsync().ConfigureAwait(false) ?? + throw new InvalidOperationException("No user found in session"); var signinResult = await _signInValidator.ValidateLoginAsync(request, user).ConfigureAwait(false); @@ -85,7 +86,7 @@ public async Task LoginAsync(HttpRequest request, IUrlHelper help var userInteraction = _identityServerOptions.Value.UserInteraction; var loginUrl = request.PathBase + userInteraction.LoginUrl; - var url = AddQueryString(loginUrl, userInteraction.LoginReturnUrlParameter, returnUrl); + var url = AddQueryString(loginUrl, userInteraction.LoginReturnUrlParameter ?? "", returnUrl); return new RedirectResult(url); } diff --git a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Signin/SignInResponseGenerator.cs b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Signin/SignInResponseGenerator.cs index 206d8f257..79436fcb5 100644 --- a/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Signin/SignInResponseGenerator.cs +++ b/src/IdentityServer/Duende/Aguacongas.IdentityServer.Saml2p.Duende/Services/Signin/SignInResponseGenerator.cs @@ -301,9 +301,10 @@ protected async Task CreateSubjectAsync(SignInValidationResult CreateSubjectAsync(SignInValidationResult + net7.0 @@ -12,17 +12,11 @@ true package-icon.png Apache-2.0 - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset README.md True - - - - \ diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.MySql/Aguacongas.TheIdServer.Migrations.MySql.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.MySql/Aguacongas.TheIdServer.Migrations.MySql.csproj index 7e4ada56a..f3503c281 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.MySql/Aguacongas.TheIdServer.Migrations.MySql.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.MySql/Aguacongas.TheIdServer.Migrations.MySql.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,8 +12,6 @@ theidserver;mysql Contains db contexts migrations code for MySql. package-icon.png - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True @@ -22,7 +20,6 @@ - PreserveNewest Never @@ -30,7 +27,7 @@ - + diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Oracle/Aguacongas.TheIdServer.Migrations.Oracle.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Oracle/Aguacongas.TheIdServer.Migrations.Oracle.csproj index ab4d60b57..1b1927012 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Oracle/Aguacongas.TheIdServer.Migrations.Oracle.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Oracle/Aguacongas.TheIdServer.Migrations.Oracle.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,17 +12,11 @@ theidserver;oracle Contains db contexts migrations code for Oracle. package-icon.png - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - + diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.PostgreSQL/Aguacongas.TheIdServer.Migrations.PostgreSQL.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.PostgreSQL/Aguacongas.TheIdServer.Migrations.PostgreSQL.csproj index 1fd1754d8..7fa5b7a33 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.PostgreSQL/Aguacongas.TheIdServer.Migrations.PostgreSQL.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.PostgreSQL/Aguacongas.TheIdServer.Migrations.PostgreSQL.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,8 +12,6 @@ theidserver;postgresql Contains db contexts migrations code for PostgreSQL. package-icon.png - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True @@ -22,7 +20,6 @@ - PreserveNewest Never @@ -30,7 +27,7 @@ - + diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.SqlServer/Aguacongas.TheIdServer.Migrations.SqlServer.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.SqlServer/Aguacongas.TheIdServer.Migrations.SqlServer.csproj index e5aa292c3..99627563f 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.SqlServer/Aguacongas.TheIdServer.Migrations.SqlServer.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.SqlServer/Aguacongas.TheIdServer.Migrations.SqlServer.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,17 +12,11 @@ theidserver;sqlserver Contains db contexts migrations code for SqlServer. package-icon.png - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - + diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Sqlite/Aguacongas.TheIdServer.Migrations.Sqlite.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Sqlite/Aguacongas.TheIdServer.Migrations.Sqlite.csproj index b116c31c8..18e920db5 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Sqlite/Aguacongas.TheIdServer.Migrations.Sqlite.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Sqlite/Aguacongas.TheIdServer.Migrations.Sqlite.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -12,17 +12,11 @@ theidserver;sqlite Contains db contexts migrations code for Sqlite. package-icon.png - - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - + diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.MySql.Startup/Aguacongas.TheIdServer.MySql.Startup.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.MySql.Startup/Aguacongas.TheIdServer.MySql.Startup.csproj index 145a9aa53..acb59eccc 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.MySql.Startup/Aguacongas.TheIdServer.MySql.Startup.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.MySql.Startup/Aguacongas.TheIdServer.MySql.Startup.csproj @@ -1,4 +1,4 @@ - + Exe @@ -11,18 +11,13 @@ https://github.com/Aguafrommars/TheIdServer git false - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Oracle.Startup/Aguacongas.TheIdServer.Oracle.Startup.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Oracle.Startup/Aguacongas.TheIdServer.Oracle.Startup.csproj index 93dcdfc2d..22efbc3ed 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Oracle.Startup/Aguacongas.TheIdServer.Oracle.Startup.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Oracle.Startup/Aguacongas.TheIdServer.Oracle.Startup.csproj @@ -1,4 +1,4 @@ - + Exe @@ -11,20 +11,15 @@ https://github.com/Aguafrommars/TheIdServer git false - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset enable enable True - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.PostgreSQL.Startup/Aguacongas.TheIdServer.PostgreSQL.Startup.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.PostgreSQL.Startup/Aguacongas.TheIdServer.PostgreSQL.Startup.csproj index bdd74b043..c4437cc3b 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.PostgreSQL.Startup/Aguacongas.TheIdServer.PostgreSQL.Startup.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.PostgreSQL.Startup/Aguacongas.TheIdServer.PostgreSQL.Startup.csproj @@ -1,4 +1,4 @@ - + Exe @@ -11,18 +11,13 @@ https://github.com/Aguafrommars/TheIdServer git false - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.SqlServer.Startup/Aguacongas.TheIdServer.SqlServer.Startup.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.SqlServer.Startup/Aguacongas.TheIdServer.SqlServer.Startup.csproj index 346c58cee..2a45bc3bb 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.SqlServer.Startup/Aguacongas.TheIdServer.SqlServer.Startup.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.SqlServer.Startup/Aguacongas.TheIdServer.SqlServer.Startup.csproj @@ -1,4 +1,4 @@ - + Exe @@ -11,18 +11,13 @@ https://github.com/Aguafrommars/TheIdServer git false - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Sqlite.Startup/Aguacongas.TheIdServer.Sqlite.Startup.csproj b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Sqlite.Startup/Aguacongas.TheIdServer.Sqlite.Startup.csproj index 4863f6bc0..b0c60ad97 100644 --- a/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Sqlite.Startup/Aguacongas.TheIdServer.Sqlite.Startup.csproj +++ b/src/IdentityServer/Migrations/Aguacongas.TheIdServer.Sqlite.Startup/Aguacongas.TheIdServer.Sqlite.Startup.csproj @@ -1,4 +1,4 @@ - + Exe @@ -11,18 +11,13 @@ https://github.com/Aguafrommars/TheIdServer git false - ..\..\..\..\.sonarlint\aguacongas_theidservercsharp.ruleset True - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Aguacongas.IdentityServer.Admin.Http.Store.Test/Aguacongas.IdentityServer.Admin.Http.Store.Test.csproj b/test/Aguacongas.IdentityServer.Admin.Http.Store.Test/Aguacongas.IdentityServer.Admin.Http.Store.Test.csproj index f59e8d731..800032cb6 100644 --- a/test/Aguacongas.IdentityServer.Admin.Http.Store.Test/Aguacongas.IdentityServer.Admin.Http.Store.Test.csproj +++ b/test/Aguacongas.IdentityServer.Admin.Http.Store.Test/Aguacongas.IdentityServer.Admin.Http.Store.Test.csproj @@ -5,9 +5,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Aguacongas.TheIdServer.BlazorApp.Test/Aguacongas.TheIdServer.BlazorApp.Test.csproj b/test/Aguacongas.TheIdServer.BlazorApp.Test/Aguacongas.TheIdServer.BlazorApp.Test.csproj index cba3a8b1f..cb444b33d 100644 --- a/test/Aguacongas.TheIdServer.BlazorApp.Test/Aguacongas.TheIdServer.BlazorApp.Test.csproj +++ b/test/Aguacongas.TheIdServer.BlazorApp.Test/Aguacongas.TheIdServer.BlazorApp.Test.csproj @@ -6,15 +6,19 @@ false + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Aguacongas.TheIdServer.BlazorApp.Test/Services/ClaimsPrincipalFactoryTest.cs b/test/Aguacongas.TheIdServer.BlazorApp.Test/Services/ClaimsPrincipalFactoryTest.cs index 8ef3536d3..ff46afcf3 100644 --- a/test/Aguacongas.TheIdServer.BlazorApp.Test/Services/ClaimsPrincipalFactoryTest.cs +++ b/test/Aguacongas.TheIdServer.BlazorApp.Test/Services/ClaimsPrincipalFactoryTest.cs @@ -33,7 +33,7 @@ public async Task CreateUserAsync_should_transform_array_claims() AuthenticationType = "oidc", NameClaim = "name", RoleClaim = "role" - }).ConfigureAwait(false); + }); Assert.Contains(user.Claims, c => c.Type == "role" && c.Value == "role"); } diff --git a/test/Aguacongas.TheIdServer.Test/Aguacongas.TheIdServer.Test.csproj b/test/Aguacongas.TheIdServer.Test/Aguacongas.TheIdServer.Test.csproj index 3d9680e2d..317e24de7 100644 --- a/test/Aguacongas.TheIdServer.Test/Aguacongas.TheIdServer.Test.csproj +++ b/test/Aguacongas.TheIdServer.Test/Aguacongas.TheIdServer.Test.csproj @@ -13,9 +13,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Aguacongas.IdentityServer.Admin.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Aguacongas.IdentityServer.Admin.Duende.Test.csproj index 736eb58b2..353a09151 100644 --- a/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Aguacongas.IdentityServer.Admin.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Aguacongas.IdentityServer.Admin.Duende.Test.csproj @@ -16,12 +16,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/PersistedGrantServiceTest.cs b/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/PersistedGrantServiceTest.cs index b04fc229a..2136d5ccd 100644 --- a/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/PersistedGrantServiceTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/PersistedGrantServiceTest.cs @@ -24,13 +24,13 @@ public async Task RemoveAllGrantsAsync_should_return_user_grants() { var sut = CreateSut(out Mock _); - await sut.RemoveAllGrantsAsync("test", "test", "test").ConfigureAwait(false); + await sut.RemoveAllGrantsAsync("test", "test", "test"); - await sut.RemoveAllGrantsAsync("test", "test").ConfigureAwait(false); + await sut.RemoveAllGrantsAsync("test", "test"); - await sut.RemoveAllGrantsAsync("test").ConfigureAwait(false); + await sut.RemoveAllGrantsAsync("test"); - var grants = await sut.GetAllGrantsAsync("test").ConfigureAwait(false); + var grants = await sut.GetAllGrantsAsync("test"); Assert.NotEmpty(grants); } @@ -41,7 +41,7 @@ public async Task GetAllGrantsAsync_should_catch_decryption_error() var sut = CreateSut(out Mock mock); mock.Setup(m => m.Unprotect(It.IsAny())).Throws(new CryptographicException()); - var grants = await sut.GetAllGrantsAsync("test").ConfigureAwait(false); + var grants = await sut.GetAllGrantsAsync("test"); Assert.NotEmpty(grants); } diff --git a/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/ProxyClaimsProviderTest.cs b/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/ProxyClaimsProviderTest.cs index 7e4db883c..2cf4c8218 100644 --- a/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/ProxyClaimsProviderTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.Admin.Duende.Test/Services/ProxyClaimsProviderTest.cs @@ -55,7 +55,7 @@ public async Task GetAsync_should_resolve_provider_type_from_di() provider.GetRequiredService>(), provider.GetRequiredService>()); - var result = await sut.GetAsync("test", "test", "test", "test", typeof(ClaimsProvider).FullName).ConfigureAwait(false); + var result = await sut.GetAsync("test", "test", "test", "test", typeof(ClaimsProvider).FullName); Assert.Contains(result.Items, c => c.ClaimType == "test"); } @@ -102,7 +102,7 @@ public async Task GetAsync_should_load_assemby_from_path() provider.GetRequiredService>(), provider.GetRequiredService>()); - var result = await sut.GetAsync("test", "test", "test", "test", typeof(ClaimsProvider).FullName).ConfigureAwait(false); + var result = await sut.GetAsync("test", "test", "test", "test", typeof(ClaimsProvider).FullName); Assert.Contains(result.Items, c => c.ClaimType == "test"); } @@ -147,7 +147,7 @@ public async Task GetAsync_should_get_claims_from_identity_resources() provider.GetRequiredService>(), provider.GetRequiredService>()); - var result = await sut.GetAsync("test", "test", "test", "test", typeof(ClaimsProvider).FullName).ConfigureAwait(false); + var result = await sut.GetAsync("test", "test", "test", "test", typeof(ClaimsProvider).FullName); Assert.Contains(result.Items, c => c.ClaimType == "test"); } diff --git a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Aguacongas.IdentityServer.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Aguacongas.IdentityServer.Duende.Test.csproj index 0a67b3705..a26abd2f6 100644 --- a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Aguacongas.IdentityServer.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Aguacongas.IdentityServer.Duende.Test.csproj @@ -16,10 +16,10 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ResourceStoreTest.cs b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ResourceStoreTest.cs index ad8c94249..52aaff96d 100644 --- a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ResourceStoreTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ResourceStoreTest.cs @@ -35,7 +35,7 @@ public async Task FindApiResourcesByScopeNameAsync_should_return_empty_when_not_ new Mock>().Object, storeMock.Object); - var result = await sut.FindApiResourcesByScopeNameAsync(new[] { Guid.NewGuid().ToString() }).ConfigureAwait(false); + var result = await sut.FindApiResourcesByScopeNameAsync(new[] { Guid.NewGuid().ToString() }); Assert.Empty(result); } diff --git a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ServerSideSessionStoreTest.cs b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ServerSideSessionStoreTest.cs index 12f2da4b7..5ff678ce4 100644 --- a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ServerSideSessionStoreTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Store/ServerSideSessionStoreTest.cs @@ -29,7 +29,7 @@ public async Task CreateSessionAsync_should_fallback_to_underliying_store() var sut = new ServerSideSessionStore(storeMock.Object); - await sut.CreateSessionAsync(new ServerSideSession()).ConfigureAwait(false); + await sut.CreateSessionAsync(new ServerSideSession()); storeMock.Verify(); } @@ -42,7 +42,7 @@ public async Task DeleteSessionAsync_should_fallback_to_underliying_store() var sut = new ServerSideSessionStore(storeMock.Object); - await sut.DeleteSessionAsync(Guid.NewGuid().ToString()).ConfigureAwait(false); + await sut.DeleteSessionAsync(Guid.NewGuid().ToString()); storeMock.Verify(); } @@ -71,7 +71,7 @@ public async Task DeleteSessionsAsync_should_create_odata_filter() await sut.DeleteSessionsAsync(new SessionFilter { SessionId = id - }).ConfigureAwait(false); + }); storeMock.Verify(); } @@ -98,7 +98,7 @@ public async Task GetAndRemoveExpiredSessionsAsync_should_create_odata_filter() var sut = new ServerSideSessionStore(storeMock.Object); - var result = await sut.GetAndRemoveExpiredSessionsAsync(1).ConfigureAwait(false); + var result = await sut.GetAndRemoveExpiredSessionsAsync(1); storeMock.Verify(); @@ -119,7 +119,7 @@ public async Task GetSessionAsync_should_fallback_to_underliying_store() var sut = new ServerSideSessionStore(storeMock.Object); - var session = await sut.GetSessionAsync(id).ConfigureAwait(false); + var session = await sut.GetSessionAsync(id); storeMock.Verify(); @@ -150,7 +150,7 @@ public async Task GetSessionsAsync_should_create_odata_filter() var result = await sut.GetSessionsAsync(new SessionFilter { SubjectId = id, - }).ConfigureAwait(false); + }); storeMock.Verify(); @@ -183,7 +183,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ var sut = new ServerSideSessionStore(storeMock.Object); - var result = await sut.QuerySessionsAsync().ConfigureAwait(false); + var result = await sut.QuerySessionsAsync(); storeMock.Verify(); @@ -192,7 +192,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ result = await sut.QuerySessionsAsync(new SessionQuery { CountRequested = 2, - }).ConfigureAwait(false); + }); Assert.True(result.HasNextResults); Assert.False(result.HasPrevResults); @@ -204,7 +204,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ { CountRequested = 2, ResultsToken = result.ResultsToken - }).ConfigureAwait(false); + }); Assert.True(result.HasNextResults); Assert.True(result.HasPrevResults); @@ -216,7 +216,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ { CountRequested = 2, ResultsToken = result.ResultsToken - }).ConfigureAwait(false); + }); Assert.False(result.HasNextResults); Assert.True(result.HasPrevResults); @@ -229,7 +229,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ RequestPriorResults = true, CountRequested = 2, ResultsToken = result.ResultsToken - }).ConfigureAwait(false); + }); Assert.True(result.HasNextResults); Assert.True(result.HasPrevResults); @@ -242,7 +242,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ RequestPriorResults = true, CountRequested = 2, ResultsToken = result.ResultsToken - }).ConfigureAwait(false); + }); Assert.True(result.HasNextResults); Assert.False(result.HasPrevResults); @@ -254,7 +254,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ { CountRequested = 1, DisplayName = "test" - }).ConfigureAwait(false); + }); Assert.True(result.HasNextResults); Assert.False(result.HasPrevResults); @@ -265,7 +265,7 @@ public async Task QuerySessionsAsync_should_create_odata_filter_and_create_page_ result = await sut.QuerySessionsAsync(new SessionQuery { CountRequested = 5 - }).ConfigureAwait(false); + }); Assert.False(result.HasNextResults); Assert.False(result.HasPrevResults); @@ -282,7 +282,7 @@ public async Task UpdateSessionAsync_should_fallback_to_underliying_store() var sut = new ServerSideSessionStore(storeMock.Object); - await sut.UpdateSessionAsync(new ServerSideSession()).ConfigureAwait(false); + await sut.UpdateSessionAsync(new ServerSideSession()); storeMock.Verify(); } diff --git a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Validators/TokenExchangeGrantValidatorTest.cs b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Validators/TokenExchangeGrantValidatorTest.cs index bdeefe3f9..ae56ae888 100644 --- a/test/Duende/Aguacongas.IdentityServer.Duende.Test/Validators/TokenExchangeGrantValidatorTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.Duende.Test/Validators/TokenExchangeGrantValidatorTest.cs @@ -30,13 +30,13 @@ public async Task ValidateAsync_should_verify_subject_token() Raw = new NameValueCollection() } }; - await sut.ValidateAsync(context).ConfigureAwait(false); + await sut.ValidateAsync(context) ; Assert.Equal("invalid_request", context.Result.Error); context.Request.Raw.Add(OidcConstants.TokenRequest.SubjectToken, "test"); - await sut.ValidateAsync(context).ConfigureAwait(false); + await sut.ValidateAsync(context); Assert.Equal("invalid_request", context.Result.Error); } @@ -63,7 +63,7 @@ public async Task ValidateAsync_should_validate_token_using_validator() }; var sut = new TokenExchangeGrantValidator(validatorMock.Object); - await sut.ValidateAsync(context).ConfigureAwait(false); + await sut.ValidateAsync(context); Assert.Equal("invalid_request", context.Result.Error); } @@ -96,7 +96,7 @@ public async Task ValidateAsync_should_create_impersonation_result() }; var sut = new TokenExchangeGrantValidator(validatorMock.Object); - await sut.ValidateAsync(context).ConfigureAwait(false); + await sut.ValidateAsync(context); Assert.False(context.Result.IsError); Assert.Equal("test", context.Request.ClientId); @@ -136,7 +136,7 @@ public async Task ValidateAsync_should_create_delegation_result() }; var sut = new TokenExchangeGrantValidator(validatorMock.Object); - await sut.ValidateAsync(context).ConfigureAwait(false); + await sut.ValidateAsync(context); Assert.False(context.Result.IsError); Assert.Equal("test", context.Request.ClientId); @@ -177,7 +177,7 @@ public async Task ValidateAsync_should_create_custom_result() }; var sut = new TokenExchangeGrantValidator(validatorMock.Object); - await sut.ValidateAsync(context).ConfigureAwait(false); + await sut.ValidateAsync(context); Assert.False(context.Result.IsError); Assert.Contains(context.Result.Subject.Claims, c => c.Type == JwtClaimTypes.Subject && c.Value == "test"); diff --git a/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test.csproj index 7e6267a8a..900cdff9b 100644 --- a/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test.csproj @@ -17,14 +17,14 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/AuthorizationCodeStoreTest.cs b/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/AuthorizationCodeStoreTest.cs index f651befa5..6ad5ec46c 100644 --- a/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/AuthorizationCodeStoreTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/AuthorizationCodeStoreTest.cs @@ -50,8 +50,8 @@ await context.AuthorizationCodes.AddAsync(new AuthorizationCode }); await context.SaveChangesAsync(); - Assert.NotNull(await sut.GetAuthorizationCodeAsync(id).ConfigureAwait(false)); - Assert.Null(await sut.GetAuthorizationCodeAsync(GenerateId()).ConfigureAwait(false)); + Assert.NotNull(await sut.GetAuthorizationCodeAsync(id)); + Assert.Null(await sut.GetAuthorizationCodeAsync(GenerateId())); } } @@ -72,8 +72,8 @@ await context.AuthorizationCodes.AddAsync(new AuthorizationCode }); await context.SaveChangesAsync(); - await sut.RemoveAuthorizationCodeAsync(id).ConfigureAwait(false); - await sut.RemoveAuthorizationCodeAsync(id).ConfigureAwait(false); + await sut.RemoveAuthorizationCodeAsync(id); + await sut.RemoveAuthorizationCodeAsync(id); Assert.Null(await context.DeviceCodes.FirstOrDefaultAsync(d => d.Id == id)); } diff --git a/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/DeviceFlowStoreTest.cs b/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/DeviceFlowStoreTest.cs index 9b7d95730..91683177b 100644 --- a/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/DeviceFlowStoreTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test/DeviceFlowStoreTest.cs @@ -50,8 +50,8 @@ await context.DeviceCodes.AddAsync(new DeviceCode }); await context.SaveChangesAsync(); - Assert.NotNull(await sut.FindByDeviceCodeAsync(code).ConfigureAwait(false)); - Assert.Null(await sut.FindByDeviceCodeAsync(GenerateId()).ConfigureAwait(false)); + Assert.NotNull(await sut.FindByDeviceCodeAsync(code)); + Assert.Null(await sut.FindByDeviceCodeAsync(GenerateId())); } } @@ -72,8 +72,8 @@ await context.DeviceCodes.AddAsync(new DeviceCode }); await context.SaveChangesAsync(); - Assert.NotNull(await sut.FindByUserCodeAsync(code).ConfigureAwait(false)); - Assert.Null(await sut.FindByUserCodeAsync(GenerateId()).ConfigureAwait(false)); + Assert.NotNull(await sut.FindByUserCodeAsync(code)); + Assert.Null(await sut.FindByUserCodeAsync(GenerateId())); } } @@ -94,8 +94,8 @@ await context.DeviceCodes.AddAsync(new DeviceCode }); await context.SaveChangesAsync(); - await sut.RemoveByDeviceCodeAsync(code).ConfigureAwait(false); - await sut.RemoveByDeviceCodeAsync(code).ConfigureAwait(false); + await sut.RemoveByDeviceCodeAsync(code); + await sut.RemoveByDeviceCodeAsync(code); Assert.Null(await context.DeviceCodes.FirstOrDefaultAsync(d => d.Code == code)); } @@ -138,7 +138,7 @@ await context.DeviceCodes.AddAsync(new DeviceCode }); await context.SaveChangesAsync(); - await sut.UpdateByUserCodeAsync(code, new ISModels.DeviceCode()).ConfigureAwait(false); + await sut.UpdateByUserCodeAsync(code, new ISModels.DeviceCode()); await Assert.ThrowsAsync(() => sut.UpdateByUserCodeAsync(GenerateId(), new ISModels.DeviceCode())); diff --git a/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/Aguacongas.IdentityServer.Http.Store.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/Aguacongas.IdentityServer.Http.Store.Duende.Test.csproj index bee839166..6fa842b0e 100644 --- a/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/Aguacongas.IdentityServer.Http.Store.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/Aguacongas.IdentityServer.Http.Store.Duende.Test.csproj @@ -15,11 +15,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/ResourceStoreTest.cs b/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/ResourceStoreTest.cs index 7996fa93d..99bb4f3c2 100644 --- a/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/ResourceStoreTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.Http.Store.Duende.Test/ResourceStoreTest.cs @@ -20,7 +20,7 @@ public async Task GetAllResourcesAsync_should_call_store_GetAsync() out Mock> apiApiScopeStoreMock, out ResourceStore sut); - await sut.GetAllResourcesAsync().ConfigureAwait(false); + await sut.GetAllResourcesAsync(); apiStoreMock.Verify(m => m.GetAsync(It.Is(p => p.Expand == $"{nameof(ProtectResource.ApiClaims)},{nameof(ProtectResource.Secrets)},{nameof(ProtectResource.ApiScopes)},{nameof(ProtectResource.Properties)},{nameof(ProtectResource.Resources)}"), default)); @@ -39,7 +39,7 @@ public async Task FindIdentityResourcesByScopeNameAsync_should_call_store_GetAsy out Mock> apiApiScopeStoreMock, out ResourceStore sut); - await sut.FindIdentityResourcesByScopeNameAsync(new string[] { "test" }).ConfigureAwait(false); + await sut.FindIdentityResourcesByScopeNameAsync(new string[] { "test" }); identityStoreMock.Verify(m => m.GetAsync(It.Is(p => p.Filter == "Id eq 'test'"), default)); @@ -79,7 +79,7 @@ public async Task FindApiResourcesByScopeNameAsync_should_call_store_GetAsync() } }); - await sut.FindApiResourcesByScopeNameAsync(new string[] { "test" }).ConfigureAwait(false); + await sut.FindApiResourcesByScopeNameAsync(new string[] { "test" }); apiApiScopeStoreMock.Verify(m => m.GetAsync(It.Is(p => p.Filter == $"{nameof(ApiApiScope.ApiScopeId)} eq 'test'"), default)); @@ -96,7 +96,7 @@ public async Task FindApiResourcesByNameAsync_should_call_store_GetAsync() out Mock> apiApiScopeStoreMock, out ResourceStore sut); - await sut.FindApiResourcesByNameAsync(new string[] { "test" }).ConfigureAwait(false); + await sut.FindApiResourcesByNameAsync(new string[] { "test" }); apiStoreMock.Verify(m => m.GetAsync(It.Is(p => p.Expand == $"{nameof(ProtectResource.ApiClaims)},{nameof(ProtectResource.Secrets)},{nameof(ProtectResource.ApiScopes)},{nameof(ProtectResource.Properties)},{nameof(ProtectResource.Resources)}"), default)); @@ -111,7 +111,7 @@ public async Task FindApiScopesByNameAsync_should_call_store_GetAsync() out Mock> apiApiScopeStoreMock, out ResourceStore sut); - await sut.FindApiScopesByNameAsync(new string[] { "test" }).ConfigureAwait(false); + await sut.FindApiScopesByNameAsync(new string[] { "test" }); apiScopeStoreMock.Verify(m => m.GetAsync(It.Is(p => p.Expand == $"{nameof(ApiScope.ApiScopeClaims)},{nameof(ApiScope.Properties)},{nameof(ApiScope.Resources)}"), default)); diff --git a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/Aguacongas.IdentityServer.KeysRotation.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/Aguacongas.IdentityServer.KeysRotation.Duende.Test.csproj index 62e38d588..3b9193b14 100644 --- a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/Aguacongas.IdentityServer.KeysRotation.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/Aguacongas.IdentityServer.KeysRotation.Duende.Test.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/ECDsaEncryptorDescriptorTest.cs b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/ECDsaEncryptorDescriptorTest.cs index 94943f09d..54cef8c47 100644 --- a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/ECDsaEncryptorDescriptorTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/ECDsaEncryptorDescriptorTest.cs @@ -35,7 +35,7 @@ public async Task ExportToXml_should_export_key_without_ECDsa() var provider = services.BuildServiceProvider(); var keyProvider = provider.GetRequiredService>(); - var cred = await keyProvider.GetSigningCredentialsAsync().ConfigureAwait(false); + var cred = await keyProvider.GetSigningCredentialsAsync(); var sut = new ECDsaEncryptorDescriptor(new ECDsaEncryptorConfiguration(), cred.Key as ECDsaSecurityKey); diff --git a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/KeyManagement/KeyRingProviderTest.cs b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/KeyManagement/KeyRingProviderTest.cs index 12ecbe9a8..8f9e67c45 100644 --- a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/KeyManagement/KeyRingProviderTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/KeyManagement/KeyRingProviderTest.cs @@ -40,11 +40,11 @@ public async Task GetCurrentKeyRing_should_create_keys_and_cache() var provider = builder.Services.BuildServiceProvider(); var sut = provider.GetRequiredService>(); - var cred = await sut.GetSigningCredentialsAsync().ConfigureAwait(false); + var cred = await sut.GetSigningCredentialsAsync(); Assert.NotNull(cred); sut = provider.GetRequiredService>(); - var newCred = await sut.GetSigningCredentialsAsync().ConfigureAwait(false); + var newCred = await sut.GetSigningCredentialsAsync(); Assert.Equal(cred.Key.KeyId, newCred.Key.KeyId); } @@ -63,7 +63,7 @@ public async Task GetCurrentKeyRing_should_not_return_revoked_keys() var provider = builder.Services.BuildServiceProvider(); var sut = provider.GetRequiredService>(); - var keys = await sut.GetValidationKeysAsync().ConfigureAwait(false); + var keys = await sut.GetValidationKeysAsync(); Assert.NotNull(keys); Assert.NotEmpty(keys); @@ -71,7 +71,7 @@ public async Task GetCurrentKeyRing_should_not_return_revoked_keys() var cacheableKeyRingProvider = provider.GetRequiredService>(); cacheableKeyRingProvider.KeyManager.RevokeKey(defaultKeyId, "test"); sut = provider.GetRequiredService>(); - var newKeys = await sut.GetValidationKeysAsync().ConfigureAwait(false); + var newKeys = await sut.GetValidationKeysAsync(); Assert.DoesNotContain(keys, k => newKeys.Any(nk => nk.Key.KeyId == k.Key.KeyId)); } @@ -96,11 +96,11 @@ public async Task GetCurrentKeyRing_should_create_keys_from_derived_RSA_algoryth var provider = builder.Services.BuildServiceProvider(); var sut = provider.GetRequiredService>(); - var cred = await sut.GetSigningCredentialsAsync().ConfigureAwait(false); + var cred = await sut.GetSigningCredentialsAsync(); Assert.NotNull(cred); sut = provider.GetRequiredService>(); - var newCred = await sut.GetSigningCredentialsAsync().ConfigureAwait(false); + var newCred = await sut.GetSigningCredentialsAsync(); Assert.Equal(cred.Key.KeyId, newCred.Key.KeyId); } diff --git a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/RsaEncryptorDescriptorTest.cs b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/RsaEncryptorDescriptorTest.cs index 955411d56..2056d2120 100644 --- a/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/RsaEncryptorDescriptorTest.cs +++ b/test/Duende/Aguacongas.IdentityServer.KeysRotation.Duende.Test/RsaEncryptorDescriptorTest.cs @@ -34,7 +34,7 @@ public async Task ExportToXml_should_export_key_without_Rsa() var provider = builder.Services.BuildServiceProvider(); var keyProvider = provider.GetRequiredService>(); - var cred = await keyProvider.GetSigningCredentialsAsync().ConfigureAwait(false); + var cred = await keyProvider.GetSigningCredentialsAsync(); var sut = new RsaEncryptorDescriptor(new RsaEncryptorConfiguration(), cred.Key as RsaSecurityKey); diff --git a/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/AdminStores/AdminStoreTestBase.cs b/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/AdminStores/AdminStoreTestBase.cs index 7a82699e4..fb318640c 100644 --- a/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/AdminStores/AdminStoreTestBase.cs +++ b/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/AdminStores/AdminStoreTestBase.cs @@ -65,12 +65,12 @@ public async Task GetAsync_by_page_request_should_expand_sur_entities() var sut = provider.GetRequiredService>(); Assert.NotNull(sut); - await CreateEntityGraphAsync(navigationProperties, provider, sut).ConfigureAwait(false); + await CreateEntityGraphAsync(navigationProperties, provider, sut); var entities = await sut.GetAsync(new PageRequest { Expand = GetExpand() - }).ConfigureAwait(false); + }); Assert.NotEmpty(entities.Items); foreach(var property in navigationProperties) @@ -99,12 +99,12 @@ public async Task GetAsync_by_id_should_expand_sur_entities() var sut = provider.GetRequiredService>(); Assert.NotNull(sut); - var entity = await CreateEntityGraphAsync(navigationProperties, provider, sut).ConfigureAwait(false); + var entity = await CreateEntityGraphAsync(navigationProperties, provider, sut); var result = await sut.GetAsync(entity.Id, new GetRequest { Expand = GetExpand() - }).ConfigureAwait(false); + }); Assert.NotNull(result); foreach (var property in navigationProperties.Where(p => p.PropertyType.ImplementsGenericInterface(typeof(ICollection<>)))) @@ -138,10 +138,10 @@ public async Task UpdateAsync_should_update_entity() Assert.NotNull(sut); var create = new TEntity(); - var entity = await sut.CreateAsync(create).ConfigureAwait(false); - await sut.UpdateAsync(entity).ConfigureAwait(false); + var entity = await sut.CreateAsync(create); + await sut.UpdateAsync(entity); - var updated = await sut.GetAsync(entity.Id, null).ConfigureAwait(false); + var updated = await sut.GetAsync(entity.Id, null); if (updated is IAuditable auditable) { Assert.NotNull(auditable.ModifiedAt); @@ -169,11 +169,11 @@ public async Task DeleteAsync_should_cascade_delete() var sut = provider.GetRequiredService>(); Assert.NotNull(sut); - var entity = await CreateEntityGraphAsync(navigationProperties, provider, sut).ConfigureAwait(false); + var entity = await CreateEntityGraphAsync(navigationProperties, provider, sut); - await sut.DeleteAsync(entity.Id).ConfigureAwait(false); + await sut.DeleteAsync(entity.Id); - var nullResult = await sut.GetAsync(entity.Id, null).ConfigureAwait(false); + var nullResult = await sut.GetAsync(entity.Id, null); Assert.Null(nullResult); foreach (var property in navigationProperties.Where(p => p.PropertyType.ImplementsGenericInterface(typeof(ICollection<>)))) { @@ -189,7 +189,7 @@ public async Task DeleteAsync_should_cascade_delete() }, null }); - await (task as Task).ConfigureAwait(false); + await (task as Task); var response = task.GetType().GetProperty(nameof(Task.Result)).GetValue(task); var items = response.GetType().GetProperty(nameof(PageResponse.Items)).GetValue(response); Assert.Empty(items as IEnumerable); @@ -216,7 +216,7 @@ public async Task DeleteAsync_should_throw_on_entity_not_found() var sut = provider.GetRequiredService>(); Assert.NotNull(sut); - await Assert.ThrowsAsync(() => sut.DeleteAsync(Guid.NewGuid().ToString())).ConfigureAwait(false); + await Assert.ThrowsAsync(() => sut.DeleteAsync(Guid.NewGuid().ToString())); } [Fact] @@ -241,7 +241,7 @@ public async Task UpdateAsync_should_throw_on_entity_not_found() var notFound = new TEntity(); notFound.Id = Guid.NewGuid().ToString(); - await Assert.ThrowsAsync(() => sut.UpdateAsync(notFound)).ConfigureAwait(false); + await Assert.ThrowsAsync(() => sut.UpdateAsync(notFound)); } protected virtual object CreateParentEntiy(Type parentType) @@ -259,9 +259,9 @@ private async Task CreateEntityGraphAsync(IEnumerable nav if (parentPropetyName != null) { var parentPropetyType = GetParentType(parentPropetyName); - await AddParentEntity(provider, create, parentPropetyName, parentPropetyType).ConfigureAwait(false); + await AddParentEntity(provider, create, parentPropetyName, parentPropetyType); } - var entity = await sut.CreateAsync(create).ConfigureAwait(false); + var entity = await sut.CreateAsync(create); foreach (var property in navigationProperties) { var subEntityType = property.PropertyType; @@ -274,13 +274,13 @@ private async Task CreateEntityGraphAsync(IEnumerable nav var storeType = typeof(IAdminStore<>).MakeGenericType(subEntityType); var subStore = provider.GetRequiredService(storeType) as IAdminStore; - await subStore.CreateAsync(subEntity).ConfigureAwait(false); + await subStore.CreateAsync(subEntity); continue; } - await AddParentEntity(provider, create, $"{property.Name}Id", property.PropertyType).ConfigureAwait(false); + await AddParentEntity(provider, create, $"{property.Name}Id", property.PropertyType); } - await sut.UpdateAsync(entity).ConfigureAwait(false); + await sut.UpdateAsync(entity); return entity; } @@ -289,7 +289,7 @@ private async Task AddParentEntity(ServiceProvider provider, TEntity create, str { var parentStoreType = typeof(IAdminStore<>).MakeGenericType(parentPropetyType); var parentStore = provider.GetRequiredService(parentStoreType) as IAdminStore; - var parent = await parentStore.CreateAsync(CreateParentEntiy(parentPropetyType)).ConfigureAwait(false) as IEntityId; + var parent = await parentStore.CreateAsync(CreateParentEntiy(parentPropetyType)) as IEntityId; var parentPropety = create.GetType().GetProperty(parentPropetyName); parentPropety.SetValue(create, parent.Id); } diff --git a/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test.csproj index 3e814a5a9..a7745c7f8 100644 --- a/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test/Aguacongas.IdentityServer.MongoDb.Store.Duende.Test.csproj @@ -15,10 +15,10 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test.csproj index 07157a200..395ecffcf 100644 --- a/test/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test/Aguacongas.IdentityServer.RavenDb.Store.Duende.Test.csproj @@ -17,12 +17,12 @@ - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Duende/Aguacongas.IdentityServer.Saml2P.Duende.Test/Aguacongas.IdentityServer.Saml2P.Duende.Test.csproj b/test/Duende/Aguacongas.IdentityServer.Saml2P.Duende.Test/Aguacongas.IdentityServer.Saml2P.Duende.Test.csproj index 24282f10c..ab8f4a322 100644 --- a/test/Duende/Aguacongas.IdentityServer.Saml2P.Duende.Test/Aguacongas.IdentityServer.Saml2P.Duende.Test.csproj +++ b/test/Duende/Aguacongas.IdentityServer.Saml2P.Duende.Test/Aguacongas.IdentityServer.Saml2P.Duende.Test.csproj @@ -11,10 +11,10 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Duende/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test.csproj b/test/Duende/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test.csproj index 5514f0083..2777419a4 100644 --- a/test/Duende/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test.csproj +++ b/test/Duende/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test/Aguacongas.TheIdServer.Authentication.Integration.Duende.Test.csproj @@ -16,14 +16,14 @@ - + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.TheIdServer.Duende.Test/Aguacongas.TheIdServer.Duende.Test.csproj b/test/Duende/Aguacongas.TheIdServer.Duende.Test/Aguacongas.TheIdServer.Duende.Test.csproj index dd8498d11..2f1ff3177 100644 --- a/test/Duende/Aguacongas.TheIdServer.Duende.Test/Aguacongas.TheIdServer.Duende.Test.csproj +++ b/test/Duende/Aguacongas.TheIdServer.Duende.Test/Aguacongas.TheIdServer.Duende.Test.csproj @@ -24,12 +24,12 @@ - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.TheIdServer.Duende.Test/ExternalClaimsTransformerTest.cs b/test/Duende/Aguacongas.TheIdServer.Duende.Test/ExternalClaimsTransformerTest.cs index a10f61c95..b0eaffee6 100644 --- a/test/Duende/Aguacongas.TheIdServer.Duende.Test/ExternalClaimsTransformerTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Duende.Test/ExternalClaimsTransformerTest.cs @@ -57,7 +57,7 @@ public async Task TransformPrincipal_should_transform_claims() var sut = builder.GetRequiredService>(); - var result = await sut.TransformPrincipalAsync(principal, "test").ConfigureAwait(false); + var result = await sut.TransformPrincipalAsync(principal, "test"); Assert.Contains(result.Claims, c => c.Type == "transformed"); } @@ -88,7 +88,7 @@ public async Task TransformPrincipal_should_provision_user(string claimType) var sut = builder.GetRequiredService>(); - var result = await sut.TransformPrincipalAsync(principal, "test").ConfigureAwait(false); + var result = await sut.TransformPrincipalAsync(principal, "test"); Assert.Contains(result.Claims, c => c.Type == claimType); var applicationDbContext = scope.ServiceProvider.GetRequiredService(); @@ -117,7 +117,7 @@ public async Task TransformPrincipal_should_throw_when_id_not_found() var sut = builder.GetRequiredService>(); await Assert.ThrowsAsync(() => sut.TransformPrincipalAsync(principal, "test")) - .ConfigureAwait(false); + ; } [Fact] @@ -158,7 +158,7 @@ public async Task TransformPrincipal_should_throw_when_cannot_create_user() var sut = builder.GetRequiredService>(); await Assert.ThrowsAsync(() => sut.TransformPrincipalAsync(principal, "test")) - .ConfigureAwait(false); + ; } [Fact] @@ -210,7 +210,7 @@ public async Task TransformPrincipal_should_throw_when_cannot_create_login() var sut = builder.GetRequiredService>(); await Assert.ThrowsAsync(() => sut.TransformPrincipalAsync(principal, "test")) - .ConfigureAwait(false); + ; } [Fact] @@ -238,7 +238,7 @@ public async Task TransformPrincipal_should_add_remove_claims() var sut = builder.GetRequiredService>(); - await sut.TransformPrincipalAsync(principal, "test").ConfigureAwait(false); + await sut.TransformPrincipalAsync(principal, "test"); principal = new ClaimsPrincipal(new ClaimsIdentity(new Claim[] { @@ -246,7 +246,7 @@ public async Task TransformPrincipal_should_add_remove_claims() new Claim("new", "test"), })); - await sut.TransformPrincipalAsync(principal, "test").ConfigureAwait(false); + await sut.TransformPrincipalAsync(principal, "test"); var applicationDbContext = scope.ServiceProvider.GetRequiredService(); Assert.NotNull(applicationDbContext.UserClaims.FirstOrDefault(c => c.ClaimType == "new")); diff --git a/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/BackchannelAuthenticationUserNotificationServiceTest.cs b/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/BackchannelAuthenticationUserNotificationServiceTest.cs index 9758806f7..eb12ad273 100644 --- a/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/BackchannelAuthenticationUserNotificationServiceTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/BackchannelAuthenticationUserNotificationServiceTest.cs @@ -60,7 +60,7 @@ await sut.SendLoginRequestAsync(new BackchannelUserLoginRequest Subject = new ClaimsPrincipal(new ClaimsIdentity(new [] { new Claim(JwtClaimTypes.Email, "aguacongas@gmail.com") })), InternalId = Guid.NewGuid().ToString(), BindingMessage = bindinMessage - }).ConfigureAwait(false); + }); } } } diff --git a/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/KeyStoreTest.cs b/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/KeyStoreTest.cs index 1e3c4b608..cc43ffd0d 100644 --- a/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/KeyStoreTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Duende.Test/Services/KeyStoreTest.cs @@ -33,7 +33,7 @@ public async Task GetAllKeysAsync_should_return_page_method() var sut = new KeyStore(wrapper); - var page = await sut.GetAllKeysAsync().ConfigureAwait(false); + var page = await sut.GetAllKeysAsync(); Assert.Empty(page.Items); } @@ -49,7 +49,7 @@ public async Task RevokeKeyAsync_should_not_be_implemented() var sut = new KeyStore(wrapper); - await Assert.ThrowsAsync(() => sut.RevokeKeyAsync(Guid.NewGuid().ToString(), Guid.NewGuid().ToString())).ConfigureAwait(false); + await Assert.ThrowsAsync(() => sut.RevokeKeyAsync(Guid.NewGuid().ToString(), Guid.NewGuid().ToString())); } } } diff --git a/test/Duende/Aguacongas.TheIdServer.Identity.Duende.Test/Aguacongas.TheIdServer.Identity.Duende.Test.csproj b/test/Duende/Aguacongas.TheIdServer.Identity.Duende.Test/Aguacongas.TheIdServer.Identity.Duende.Test.csproj index b67ef78c0..ed615a4ba 100644 --- a/test/Duende/Aguacongas.TheIdServer.Identity.Duende.Test/Aguacongas.TheIdServer.Identity.Duende.Test.csproj +++ b/test/Duende/Aguacongas.TheIdServer.Identity.Duende.Test/Aguacongas.TheIdServer.Identity.Duende.Test.csproj @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.TheIdServer.Identity.Integration.Duende.Test/Aguacongas.TheIdServer.Identity.Integration.Duende.Test.csproj b/test/Duende/Aguacongas.TheIdServer.Identity.Integration.Duende.Test/Aguacongas.TheIdServer.Identity.Integration.Duende.Test.csproj index 1e65488d2..ce92a4426 100644 --- a/test/Duende/Aguacongas.TheIdServer.Identity.Integration.Duende.Test/Aguacongas.TheIdServer.Identity.Integration.Duende.Test.csproj +++ b/test/Duende/Aguacongas.TheIdServer.Identity.Integration.Duende.Test/Aguacongas.TheIdServer.Identity.Integration.Duende.Test.csproj @@ -17,13 +17,13 @@ - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Aguacongas.TheIdServer.Integration.Duende.Test.csproj b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Aguacongas.TheIdServer.Integration.Duende.Test.csproj index db3ee3bc4..ed9094fa1 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Aguacongas.TheIdServer.Integration.Duende.Test.csproj +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Aguacongas.TheIdServer.Integration.Duende.Test.csproj @@ -18,16 +18,16 @@ - + - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiScopeTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiScopeTest.cs index 498118027..19893f6c0 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiScopeTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiScopeTest.cs @@ -37,7 +37,7 @@ public async Task OnAddTranslation_should_validate_resource() Assert.NotNull(addButton); - await addButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await addButton.ClickAsync(new MouseEventArgs()); var cultureInputs = component.FindAll("input[placeholder=\"culture\"]"); @@ -45,18 +45,18 @@ public async Task OnAddTranslation_should_validate_resource() var cultureInput = cultureInputs[cultureInputs.Count - 1]; - await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "en" }).ConfigureAwait(false); + await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "en" }); var dropDownItem = component.Find("button.dropdown-item"); Assert.NotNull(dropDownItem); - await dropDownItem.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await dropDownItem.ClickAsync(new MouseEventArgs()); var addDescriptionButton = component.Find("#btnAddDescription"); Assert.NotNull(addButton); - await addDescriptionButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await addDescriptionButton.ClickAsync(new MouseEventArgs()); cultureInputs = component.FindAll("input[placeholder=\"culture\"]"); @@ -64,13 +64,13 @@ public async Task OnAddTranslation_should_validate_resource() cultureInput = cultureInputs[cultureInputs.Count - 1]; - await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }).ConfigureAwait(false); + await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }); var items = component.FindAll("button.dropdown-item"); dropDownItem = items[items.Count - 1]; Assert.NotNull(dropDownItem); - await dropDownItem.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await dropDownItem.ClickAsync(new MouseEventArgs()); cultureInputs = component.FindAll("input[placeholder=\"culture\"]"); @@ -78,19 +78,19 @@ public async Task OnAddTranslation_should_validate_resource() cultureInput = cultureInputs[cultureInputs.Count - 1]; - await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }).ConfigureAwait(false); + await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }); items = component.FindAll("button.dropdown-item"); dropDownItem = items[items.Count - 1]; Assert.NotNull(dropDownItem); - await dropDownItem.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await dropDownItem.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); } @@ -110,7 +110,7 @@ public async Task OnFilterChanged_should_filter_properties_and_claims() await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = apiScopeId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } @@ -132,7 +132,7 @@ public async Task SaveClick_should_update_entity() await input.ChangeAsync(new ChangeEventArgs { Value = expected - }).ConfigureAwait(false); + }); Assert.Contains(expected, component.Markup); @@ -140,7 +140,7 @@ await input.ChangeAsync(new ChangeEventArgs Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiTest.cs index 66d11df02..60f652321 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ApiTest.cs @@ -43,7 +43,7 @@ public async Task OnFilterChanged_should_filter_properties_scopes_scopeClaims_an await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = apiId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } @@ -63,7 +63,7 @@ public async Task SaveClicked_should_update_api() await input.ChangeAsync(new ChangeEventArgs { Value = expected - }).ConfigureAwait(false); + }); Assert.Contains(expected, component.Markup); @@ -71,7 +71,7 @@ await input.ChangeAsync(new ChangeEventArgs Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -94,7 +94,7 @@ public async Task SaveClicked_should_create_api() await input.ChangeAsync(new ChangeEventArgs { Value = apiId - }).ConfigureAwait(false); + }); input = component.Find("#displayName"); @@ -103,13 +103,13 @@ await input.ChangeAsync(new ChangeEventArgs await input.ChangeAsync(new ChangeEventArgs { Value = apiId - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -132,11 +132,11 @@ public async Task DeleteClicked_should_delete_api() await input.ChangeAsync(new ChangeEventArgs { Value = apiId - }).ConfigureAwait(false); + }); var confirm = component.Find("#delete-entity button.btn-danger"); - await confirm.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await confirm.ClickAsync(new MouseEventArgs()); await DbActionAsync(async context => { @@ -171,14 +171,14 @@ public async Task ClickSecretsButtons_should_not_throw() buttons = buttons.Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); var expected = buttons.Count; - await buttons.First().ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await buttons.First().ClickAsync(new MouseEventArgs()); buttons = component.FindAll("#secrets button") .Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); Assert.NotEqual(expected, buttons.Count); - await buttons.Last().ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await buttons.Last().ClickAsync(new MouseEventArgs()); } [Fact] @@ -195,7 +195,7 @@ public async Task ClickPropertiesButtons_should_not_throw() .Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); var notExpected = buttons.Count; - await buttons.First().ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await buttons.First().ClickAsync(new MouseEventArgs()); buttons = component.FindAll("#properties button") .Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); @@ -204,7 +204,7 @@ public async Task ClickPropertiesButtons_should_not_throw() var expected = buttons.Count - 1; - await buttons.Last().ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await buttons.Last().ClickAsync(new MouseEventArgs()); buttons = component.FindAll("#properties button") .Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); @@ -222,20 +222,20 @@ public async Task ClickAddRemoveClaims_should_not_throw() var input = component.Find("#claims input.new-claim"); - await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "name" }).ConfigureAwait(false); + await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "name" }); component.WaitForElement("#claims button.dropdown-item"); var button = component.Find("#claims button.dropdown-item"); Assert.NotNull(button); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); var divs = component.FindAll("#claims div.select"); Assert.NotEmpty(divs); - await divs[divs.Count - 1].ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await divs[divs.Count - 1].ClickAsync(new MouseEventArgs()); } [Fact] diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ClientTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ClientTest.cs index dac788cf1..1878dad3c 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ClientTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ClientTest.cs @@ -4,6 +4,7 @@ using Aguacongas.IdentityServer.Store; using Aguacongas.IdentityServer.Store.Entity; using Aguacongas.TheIdServer.BlazorApp; +using Aguacongas.TheIdServer.Integration.Duende.Test; using AngleSharp.Dom; using Bunit; using Bunit.Extensions.WaitForHelpers; @@ -45,7 +46,7 @@ public async Task OnFilterChanged_should_filter_properties_scopes_claims_and_sec await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } @@ -63,7 +64,7 @@ public async Task UrlsHeaderClick_should_sort_urls() Assert.NotNull(header); - await header.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await header.ClickAsync(new MouseEventArgs()); var urls = component.FindAll("#urls tr"); @@ -71,7 +72,7 @@ public async Task UrlsHeaderClick_should_sort_urls() header = component.Find("#urls th div"); - await header.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await header.ClickAsync(new MouseEventArgs()); urls = component.FindAll("#urls tr"); @@ -79,7 +80,7 @@ public async Task UrlsHeaderClick_should_sort_urls() var headers = component.FindAll("#urls th div"); - await headers.ToArray()[1].ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await headers.ToArray()[1].ClickAsync(new MouseEventArgs()); urls = component.FindAll("#urls tr"); @@ -87,7 +88,7 @@ public async Task UrlsHeaderClick_should_sort_urls() headers = component.FindAll("#urls th div"); - await headers.ToArray()[1].ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await headers.ToArray()[1].ClickAsync(new MouseEventArgs()); urls = component.FindAll("#urls tr"); @@ -105,7 +106,7 @@ public async Task AddGrantType_should_validate_grant_type_rules() var input = component.Find("#grantTypes input"); - await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "test test" }).ConfigureAwait(false); + await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "test test" }); var message = component.Find(".validation-message"); @@ -114,7 +115,7 @@ public async Task AddGrantType_should_validate_grant_type_rules() input = component.Find("#grantTypes input"); Assert.NotNull(input); - await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "hybrid" }).ConfigureAwait(false); + await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "hybrid" }); message = component.Find(".validation-message"); @@ -124,7 +125,7 @@ public async Task AddGrantType_should_validate_grant_type_rules() input = component.Find("#grantTypes input"); Assert.NotNull(input); - await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "authorization_code" }).ConfigureAwait(false); + await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "authorization_code" }); message = component.Find(".validation-message"); @@ -135,7 +136,7 @@ public async Task AddGrantType_should_validate_grant_type_rules() Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); } [Theory] @@ -159,7 +160,7 @@ public async Task AddToken_should_validate_token_regex(string value) await input.ChangeAsync(new ChangeEventArgs { Value = "test test" - }).ConfigureAwait(false); + }); var message = component.Find(".validation-message"); @@ -170,7 +171,7 @@ await input.ChangeAsync(new ChangeEventArgs await input.ChangeAsync(new ChangeEventArgs { Value = value - }).ConfigureAwait(false); + }); Assert.Throws(()=> component.Find(".validation-message")); } @@ -206,19 +207,19 @@ await c.Identities.AddAsync(new IdentityResource var expected = 1; var input = WaitForNode(component, "#scopes input"); - await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = firstId }).ConfigureAwait(false); + await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = firstId }); var nodes = WaitForAllNodes(component, "#scopes .dropdown-item"); Assert.Equal(expected, nodes.Count); - await nodes.First().ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await nodes.First().ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -239,7 +240,7 @@ public async Task AlgorithmInputChanges_should_filter_scopes_list() var expected = 3; var input = WaitForNode(component, "#tokens input.new-claim"); - await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "RS" }).ConfigureAwait(false); + await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "RS" }); var nodes = WaitForAllNodes(component, "#tokens .list-inline-item .dropdown-item"); @@ -258,13 +259,13 @@ public async Task RemoveGrantType_should_validate_grant_type_rule() var button = WaitForNode(component, "#grantTypes div.select"); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); var message = component.Find(".validation-message"); @@ -392,7 +393,7 @@ await c.Identities.AddAsync(new IdentityResource var expected = 1; var input = WaitForNode(component, "#scopes input"); - await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "t" }).ConfigureAwait(false); + await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "t" }); var nodes = WaitForAllNodes(component, "#scopes .dropdown-item"); @@ -447,7 +448,7 @@ public async Task Custom_client_should_not_have_consent() Assert.NotNull(component.Find("input[name=require-pkce]")); } - [Fact] + [SkipCiFact] public async Task Options_clicks_should_enable_save_button() { var clientId = await CreateClient(allowOfflineAccess: true); @@ -487,11 +488,11 @@ public async Task DeleteButtonClick_should_delete_client() await input.ChangeAsync(new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); var confirm = component.Find("#delete-entity button.btn-danger"); - await confirm.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await confirm.ClickAsync(new MouseEventArgs()); await DbActionAsync(async context => { @@ -512,11 +513,11 @@ public async Task SaveClick_should_create_client() var input = WaitForNode(component, "#grantTypes input"); - await input.TriggerEventAsync("onfocus", new FocusEventArgs()).ConfigureAwait(false); + await input.TriggerEventAsync("onfocus", new FocusEventArgs()); var button = WaitForNode(component, "#grantTypes .dropdown-item.m-0.p-0.pl-1.pr-1"); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); var idInput = component.Find("#id"); Assert.NotNull(idInput); @@ -524,7 +525,7 @@ public async Task SaveClick_should_create_client() await idInput.ChangeAsync(new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); var nameInput = component.Find("#name"); @@ -532,23 +533,23 @@ await idInput.ChangeAsync(new ChangeEventArgs await nameInput.ChangeAsync(new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); button = WaitForNode(component, "#secrets button.btn-sm"); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); var valueInput = component.Find("#secrets input[placeholder=value]"); await valueInput.ChangeAsync(new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -570,12 +571,12 @@ public async Task SaveClick_should_sanetize_cors_uri() await input.ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -592,12 +593,12 @@ await DbActionAsync(async context => await input.ChangeAsync(new ChangeEventArgs { Value = false - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -640,7 +641,7 @@ public async Task SaveClik_should_validate_wsfed_entity() await idInput.ChangeAsync(new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); var protocolTypeInputs = WaitForAllNodes(component, "input[type=radio]"); Assert.NotNull(protocolTypeInputs); @@ -659,7 +660,7 @@ await redirectUriInput { Value = clientId }) - .ConfigureAwait(false); + ; redirectUriInput = WaitForNode(component, "#redirect-uri"); Assert.NotNull(redirectUriInput); @@ -669,12 +670,12 @@ await redirectUriInput { Value = clientId }) - .ConfigureAwait(false); + ; var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); Assert.Contains("The id must be an URI when protocol is WS-Federation. (ex: urn:wsfed).", component.Markup); Assert.Contains("The relying party is required.", component.Markup); @@ -696,7 +697,7 @@ public async Task SaveClick_should_validate_saml2p_entity() await idInput.ChangeAsync(new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); var protocolTypeInputs = WaitForAllNodes(component, "input[type=radio]"); Assert.NotNull(protocolTypeInputs); @@ -717,13 +718,13 @@ await protocolTypeInput.ChangeAsync(new ChangeEventArgs await urlInputs[0].ChangeAsync(new ChangeEventArgs { Value = "https://test" - }).ConfigureAwait(false); + }); var urlCheckBoxes = WaitForAllNodes(component, "#urls input.form-check-input"); await urlCheckBoxes[0].ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); addButton = WaitForNode(component, "#urls button"); await addButton.ClickAsync(new MouseEventArgs()); @@ -732,19 +733,19 @@ await urlCheckBoxes[0].ChangeAsync(new ChangeEventArgs await urlInputs[1].ChangeAsync(new ChangeEventArgs { Value = "https://test" - }).ConfigureAwait(false); + }); urlCheckBoxes = WaitForAllNodes(component, "#urls input.form-check-input"); await urlCheckBoxes[3].ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); Assert.Contains("Uri must be unique.", component.Markup); Assert.Contains("Cannot have more than one URI per kind.", component.Markup); @@ -754,11 +755,11 @@ await urlCheckBoxes[3].ChangeAsync(new ChangeEventArgs await urlCheckBoxes[4].ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); form = component.Find("form"); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); Assert.Contains($"Either a metadata URI or a X509Certificate secret must be set.", component.Markup); } diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/CultureTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/CultureTest.cs index bf04b9fe0..b3a5d83be 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/CultureTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/CultureTest.cs @@ -39,7 +39,7 @@ public async Task OnFilterChanged_should_filter_resources() await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = cultureId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/EntitiesPageTestBase.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/EntitiesPageTestBase.cs index 41013e357..f63107e3c 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/EntitiesPageTestBase.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/EntitiesPageTestBase.cs @@ -43,12 +43,12 @@ public async Task OnFilterChanged_should_filter_entities() await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); // cancel previous search await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); component.WaitForState(() => !component.Markup.Contains(FilteredString), TimeSpan.FromMinutes(1)); @@ -75,7 +75,7 @@ public async Task Export_click_should_download_entities() await selectAll.ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); button = component.Find("button.btn-secondary"); Assert.DoesNotContain(button.Attributes, a => a.Name == "disabled"); @@ -84,7 +84,7 @@ await selectAll.ChangeAsync(new ChangeEventArgs var invocationHanlder = JSInterop.SetupVoid("open", i => true).SetVoidResult(); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); Assert.Single(invocationHanlder.Invocations); var calledUrl = invocationHanlder.Invocations.First().Arguments[0] as string; @@ -179,7 +179,7 @@ public async Task OnSelectAllClicked_should_select_all_items() await selectAll.ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); var selected = component.Find(".table.table-hover td input"); @@ -193,7 +193,7 @@ await selectAll.ChangeAsync(new ChangeEventArgs await selectAll.ChangeAsync(new ChangeEventArgs { Value = false - }).ConfigureAwait(false); + }); selected = component.Find(".table.table-hover td input"); @@ -206,7 +206,7 @@ await selectAll.ChangeAsync(new ChangeEventArgs await selectAll.ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); selected = component.Find(".table.table-hover td input"); diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ExternalProviderTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ExternalProviderTest.cs index cf4a91edd..6f6f5ee0e 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ExternalProviderTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/ExternalProviderTest.cs @@ -38,118 +38,118 @@ public async Task SaveClick_should_create_provider() await input.ChangeAsync(new ChangeEventArgs { Value = "WsFederation" - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#wreply"); await input.ChangeAsync(new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); input = WaitForNode(component, "#type"); await input.ChangeAsync(new ChangeEventArgs { Value = "Windows" - }).ConfigureAwait(false); + }); input = WaitForNode(component, "input[name=ldapEnabled]"); await input.ChangeAsync(new ChangeEventArgs { Value = true - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#machineAccountName"); await input.ChangeAsync(new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); input = WaitForNode(component, "#type"); await input.ChangeAsync(new ChangeEventArgs { Value = "Twitter" - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#consumerKey"); await input.ChangeAsync(new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); input = WaitForNode(component, "#type"); await input.ChangeAsync(new ChangeEventArgs { Value = "OpenIdConnect" - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#authority"); await input.ChangeAsync(new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); input = WaitForNode(component, "#type"); await input.ChangeAsync(new ChangeEventArgs { Value = "OAuth" - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#clientSecret"); await input.ChangeAsync(new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); input = WaitForNode(component, "#type"); await input.ChangeAsync(new ChangeEventArgs { Value = "MicrosoftAccount" - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); input = WaitForNode(component, "#type"); await input.ChangeAsync(new ChangeEventArgs { Value = "Facebook" - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#appId"); await input.ChangeAsync(new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); input = WaitForNode(component, "#type"); await input.ChangeAsync(new ChangeEventArgs { Value = "Google" - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#clientId"); @@ -158,7 +158,7 @@ await input.ChangeAsync(new ChangeEventArgs await input.ChangeAsync(new ChangeEventArgs { Value = clientId - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#clientSecret"); @@ -167,7 +167,7 @@ await input.ChangeAsync(new ChangeEventArgs await input.ChangeAsync(new ChangeEventArgs { Value = clientSecret - }).ConfigureAwait(false); + }); form = component.Find("form"); Assert.NotNull(form); @@ -176,7 +176,7 @@ await input.ChangeAsync(new ChangeEventArgs await input.ChangeAsync(new ChangeEventArgs { Value = GenerateId() - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#name"); @@ -185,7 +185,7 @@ await input.ChangeAsync(new ChangeEventArgs await input.ChangeAsync(new ChangeEventArgs { Value = providerName - }).ConfigureAwait(false); + }); input = WaitForNode(component, "#displayName"); @@ -194,9 +194,9 @@ await input.ChangeAsync(new ChangeEventArgs await input.ChangeAsync(new ChangeEventArgs { Value = displayName - }).ConfigureAwait(false); + }); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -220,12 +220,12 @@ public async Task SaveClick_should_update_provider() await input.ChangeAsync(new ChangeEventArgs { Value = displayName - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -248,11 +248,11 @@ public async Task DeleteButtonClick_should_delete_Role() await input.ChangeAsync(new ChangeEventArgs { Value = providerId - }).ConfigureAwait(false); + }); var confirm = component.Find("#delete-entity button.btn-danger"); - await confirm.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await confirm.ClickAsync(new MouseEventArgs()); await DbActionAsync(async context => { @@ -274,31 +274,31 @@ public async Task ClickTransformationButtons_should_not_throw() buttons = buttons.Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); var expected = buttons.Count; - await buttons.First().ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await buttons.First().ClickAsync(new MouseEventArgs()); var from = WaitForNode(component, "#fromClaimType"); await from.ChangeAsync(new ChangeEventArgs { Value = "test" - }).ConfigureAwait(false); + }); var to = WaitForNode(component, "#toClaimType"); await to.ChangeAsync(new ChangeEventArgs { Value = "test" - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); buttons = component.FindAll("#transformations button") .Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); Assert.NotEqual(expected, buttons.Count); - await buttons.Last().ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await buttons.Last().ClickAsync(new MouseEventArgs()); buttons = component.FindAll("#transformations button") .Where(b => b.Attributes.Any(a => a.Name == "blazor:onclick")).ToList(); @@ -316,13 +316,13 @@ public async Task AddRemoveScope_should_not_throw() var input = WaitForNode(component, "#scope input.new-claim"); - await input.ChangeAsync(new ChangeEventArgs { Value = "name" }).ConfigureAwait(false); + await input.ChangeAsync(new ChangeEventArgs { Value = "name" }); var divs = component.FindAll("ul.list-inline div.input-group-append.select"); Assert.NotEmpty(divs); - await divs[divs.Count - 1].ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await divs[divs.Count - 1].ClickAsync(new MouseEventArgs()); } [Fact] @@ -349,13 +349,13 @@ await c.Providers.AddAsync(new ExternalProvider var input = WaitForNode(component, "#require-https input"); - await input.ChangeAsync(new ChangeEventArgs { Value = true }).ConfigureAwait(false); + await input.ChangeAsync(new ChangeEventArgs { Value = true }); Assert.NotNull(component.Find("li.validation-message")); input = WaitForNode(component, "#require-https input"); - await input.ChangeAsync(new ChangeEventArgs { Value = false }).ConfigureAwait(false); + await input.ChangeAsync(new ChangeEventArgs { Value = false }); Assert.Throws(() => component.Find("li.validation-message")); } diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/IdentityTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/IdentityTest.cs index 8dda3b6de..2550d3ee6 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/IdentityTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/IdentityTest.cs @@ -36,7 +36,7 @@ public async Task OnAddTranslation_should_validate_resource() Assert.NotNull(addButton); - await addButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await addButton.ClickAsync(new MouseEventArgs()); var cultureInputs = component.FindAll("input[placeholder=\"culture\"]"); @@ -44,18 +44,18 @@ public async Task OnAddTranslation_should_validate_resource() var cultureInput = cultureInputs[cultureInputs.Count - 1]; - await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "en" }).ConfigureAwait(false); + await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "en" }); var dropDownItem = WaitForNode(component, "button.dropdown-item"); Assert.NotNull(dropDownItem); - await dropDownItem.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await dropDownItem.ClickAsync(new MouseEventArgs()); var addDescriptionButton = component.Find("#btnAddDescription"); Assert.NotNull(addButton); - await addDescriptionButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await addDescriptionButton.ClickAsync(new MouseEventArgs()); cultureInputs = component.FindAll("input[placeholder=\"culture\"]"); @@ -63,13 +63,13 @@ public async Task OnAddTranslation_should_validate_resource() cultureInput = cultureInputs[cultureInputs.Count - 1]; - await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }).ConfigureAwait(false); + await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }); var items = component.FindAll("button.dropdown-item"); dropDownItem = items[items.Count - 1]; Assert.NotNull(dropDownItem); - await dropDownItem.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await dropDownItem.ClickAsync(new MouseEventArgs()); cultureInputs = component.FindAll("input[placeholder=\"culture\"]"); @@ -77,19 +77,19 @@ public async Task OnAddTranslation_should_validate_resource() cultureInput = cultureInputs[cultureInputs.Count - 1]; - await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }).ConfigureAwait(false); + await cultureInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = "fr-FR" }); items = component.FindAll("button.dropdown-item"); dropDownItem = items[items.Count - 1]; Assert.NotNull(dropDownItem); - await dropDownItem.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await dropDownItem.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); } @@ -109,7 +109,7 @@ public async Task OnFilterChanged_should_filter_properties_and_claims() await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = identityId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } @@ -131,7 +131,7 @@ public async Task SaveClick_should_update_entity() await input.ChangeAsync(new ChangeEventArgs { Value = expected - }).ConfigureAwait(false); + }); Assert.Contains(expected, component.Markup); @@ -139,7 +139,7 @@ await input.ChangeAsync(new ChangeEventArgs Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/KeysTests.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/KeysTests.cs index d7084a894..1bccf789b 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/KeysTests.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/KeysTests.cs @@ -46,11 +46,11 @@ public async Task DataProtectionRevokeClick_should_revoke_key() await input.ChangeAsync(new ChangeEventArgs { Value = keyId - }).ConfigureAwait(false); + }); var confirm = component.Find($"#revoke-entity-{keyId} .modal-footer button.btn-danger"); - await confirm.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await confirm.ClickAsync(new MouseEventArgs()); await Factory.DbActionAsync(async context => { @@ -99,11 +99,11 @@ await context.KeyRotationKeys.AddAsync(new KeyRotationKey await input.ChangeAsync(new ChangeEventArgs { Value = keyId - }).ConfigureAwait(false); + }); var confirm = component.Find($"#revoke-entity-{keyId} .modal-footer button.btn-danger"); - await confirm.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await confirm.ClickAsync(new MouseEventArgs()); await Factory.DbActionAsync(async context => { diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RelyingPartyTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RelyingPartyTest.cs index 0b7538edb..56fed8a5a 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RelyingPartyTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RelyingPartyTest.cs @@ -33,7 +33,7 @@ public RelyingPartyTest(TheIdServerFactory factory) : base(factory) [Fact] public async Task OnInitializedAsync_should_get_certificate_thumbprint() { - string relyingPartyId = await CreateEntity(await File.ReadAllBytesAsync("test.crt").ConfigureAwait(false)); + string relyingPartyId = await CreateEntity(await File.ReadAllBytesAsync("test.crt")); var component = CreateComponent("Alice Smith", SharedConstants.WRITERPOLICY, @@ -55,7 +55,7 @@ public async Task SetCertificateAsync_should_get_certificate_thumbprint() await component.InvokeAsync(()=> inputFile.Instance.OnChange.InvokeAsync(new InputFileChangeEventArgs(new List { new FakeBrowserFile() - })).ConfigureAwait(false)).ConfigureAwait(false); + }))); DotNetDispatcher.BeginInvokeDotNet(new JSRuntimeImpl(), new DotNetInvocationInfo(null, "NotifyChange", 1, default), "[[{ \"name\": \"test.crt\" }]]"); @@ -80,7 +80,7 @@ public async Task OnFilterChanged_should_filter_claims() await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = relyingPartyId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } @@ -102,7 +102,7 @@ public async Task SaveClick_should_update_entity() await input.ChangeAsync(new ChangeEventArgs { Value = expected - }).ConfigureAwait(false); + }); Assert.Contains(expected, component.Markup); @@ -110,7 +110,7 @@ await input.ChangeAsync(new ChangeEventArgs Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RoleTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RoleTest.cs index 3714c0a40..d37d3fc10 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RoleTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/RoleTest.cs @@ -40,7 +40,7 @@ public async Task OnFilterChanged_should_filter_claims() await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = roleId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } @@ -59,12 +59,12 @@ public async Task SaveClick_should_create_role() await input.ChangeAsync(new ChangeEventArgs { Value = roleName - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -88,11 +88,11 @@ public async Task DeleteButtonClick_should_delete_Role() await input.ChangeAsync(new ChangeEventArgs { Value = roleId - }).ConfigureAwait(false); + }); var confirm = component.Find("#delete-entity button.btn-danger"); - await confirm.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await confirm.ClickAsync(new MouseEventArgs()); await DbActionAsync(async context => { @@ -112,7 +112,7 @@ public async Task AddRoleClaim_should_add_claim_to_role() var addButton = WaitForNode(component, "#claims button"); - await addButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await addButton.ClickAsync(new MouseEventArgs()); var rows = component.FindAll("#claims tr"); @@ -127,7 +127,7 @@ public async Task AddRoleClaim_should_add_claim_to_role() await inputList.First().ChangeAsync(new ChangeEventArgs { Value = expected - }).ConfigureAwait(false); + }); rows = component.FindAll("#claims tr"); lastRow = rows[rows.Count - 1]; @@ -136,13 +136,13 @@ await inputList.First().ChangeAsync(new ChangeEventArgs await inputList.Last().ChangeAsync(new ChangeEventArgs { Value = expected - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -176,13 +176,13 @@ public async Task UpdateRoleClaim_should_update_claim() await inputList.Last().ChangeAsync(new ChangeEventArgs { Value = expected - }).ConfigureAwait(false); + }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -203,13 +203,13 @@ public async Task DeleteRoleClaim_should_remove_claim_from_role() var button = WaitForNode(component, "#claims tr button"); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/SettingsTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/SettingsTest.cs index da1624c03..a783f0eff 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/SettingsTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/SettingsTest.cs @@ -36,7 +36,7 @@ public async Task SaveButonClick_should_notify() return Task.CompletedTask; }; - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); } private IRenderedComponent CreateComponent(string userName, diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/UserTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/UserTest.cs index a66832b69..ff14544b2 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/UserTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/BlazorApp/Pages/UserTest.cs @@ -44,7 +44,7 @@ public async Task OnFilterChanged_should_filter_roles_consents_claims_and_tokens await filterInput.TriggerEventAsync("oninput", new ChangeEventArgs { Value = userId - }).ConfigureAwait(false); + }); Assert.DoesNotContain("filtered", component.Markup); } @@ -66,13 +66,13 @@ await DbActionAsync(async context => var deleteButton = WaitForNode(component, "#external-logins-tokens button[type=button]"); - await deleteButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await deleteButton.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); var tokensDiv = component.Find("#external-logins-tokens"); @@ -104,13 +104,13 @@ await DbActionAsync(async context => var deleteButton = WaitForNode(component, "#external-logins button[type=button]"); - await deleteButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await deleteButton.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); var tokensDiv = component.Find("#external-logins"); @@ -142,13 +142,13 @@ await DbActionAsync(async context => var deleteButton = WaitForNode(component, "#consents button[type=button]"); - await deleteButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await deleteButton.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); var tokensDiv = component.Find("#consents"); @@ -180,13 +180,13 @@ await DbActionAsync(async context => var deleteButton = WaitForNode(component, "#roles .input-group-append"); - await deleteButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await deleteButton.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); var tokensDiv = component.Find("#roles"); @@ -227,13 +227,13 @@ await DbActionAsync(context => await input.TriggerEventAsync("oninput", new ChangeEventArgs { Value = roleId - }).ConfigureAwait(false); + }); var button = WaitForNode(component, ".dropdown-item"); Assert.NotNull(button); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); Assert.Contains(roleId, component.Markup); @@ -241,7 +241,7 @@ await DbActionAsync(context => Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); var rolessDiv = component.Find("#roles"); @@ -268,7 +268,7 @@ public async Task AddUserClaim_should_add_claim_to_user() Assert.NotNull(addButton); - await addButton.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await addButton.ClickAsync(new MouseEventArgs()); var rows = component.FindAll("#claims tr"); @@ -280,19 +280,19 @@ public async Task AddUserClaim_should_add_claim_to_user() Assert.NotEmpty(inputList); var expected = GenerateId(); - await inputList.First().ChangeAsync(new ChangeEventArgs { Value = expected }).ConfigureAwait(false); + await inputList.First().ChangeAsync(new ChangeEventArgs { Value = expected }); rows = component.FindAll("#claims tr"); lastRow = rows[rows.Count - 1]; inputList = lastRow.QuerySelectorAll("input"); - await inputList.Last().ChangeAsync(new ChangeEventArgs { Value = expected }).ConfigureAwait(false); + await inputList.Last().ChangeAsync(new ChangeEventArgs { Value = expected }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -329,13 +329,13 @@ public async Task UpdateUserClaim_should_update_claim() var expected = GenerateId(); - await inputList.Last().ChangeAsync(new ChangeEventArgs { Value = expected }).ConfigureAwait(false); + await inputList.Last().ChangeAsync(new ChangeEventArgs { Value = expected }); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -358,13 +358,13 @@ public async Task DeleteUserClaim_should_remove_claim_from_user() Assert.NotNull(button); - await button.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await button.ClickAsync(new MouseEventArgs()); var form = component.Find("form"); Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -384,11 +384,11 @@ public async Task SaveClicked_create_new_user() var input = WaitForNode(component, "#name"); var userId = GenerateId(); - await input.ChangeAsync(new ChangeEventArgs { Value = userId }).ConfigureAwait(false); + await input.ChangeAsync(new ChangeEventArgs { Value = userId }); var form = component.Find("form"); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -408,7 +408,7 @@ public async Task SaveClicked_should_update_user() var input = WaitForNode(component, "#email"); var expected = "test@exemple.com"; - await input.ChangeAsync(new ChangeEventArgs { Value = expected }).ConfigureAwait(false); + await input.ChangeAsync(new ChangeEventArgs { Value = expected }); Assert.Contains(expected, component.Markup); @@ -416,7 +416,7 @@ public async Task SaveClicked_should_update_user() Assert.NotNull(form); - await form.SubmitAsync().ConfigureAwait(false); + await form.SubmitAsync(); await DbActionAsync(async context => { @@ -436,11 +436,11 @@ public async Task DeleteClicked_should_remove_user() var input = component.Find("#delete-entity input"); - await input.ChangeAsync(new ChangeEventArgs { Value = userId }).ConfigureAwait(false); + await input.ChangeAsync(new ChangeEventArgs { Value = userId }); var confirm = component.Find("#delete-entity button.btn-danger"); - await confirm.ClickAsync(new MouseEventArgs()).ConfigureAwait(false); + await confirm.ClickAsync(new MouseEventArgs()); await DbActionAsync(async context => { diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/Saml2PControllerTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/Saml2PControllerTest.cs index 738e4ee71..124cda800 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/Saml2PControllerTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/Saml2PControllerTest.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Net; using System.Net.Http; @@ -52,7 +53,7 @@ public async Task Metadata_should_return_saml2_metadata() Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); var descriptor = new EntityDescriptor(); descriptor.ReadIdPSsoDescriptor(content); @@ -124,8 +125,8 @@ await context.Clients.AddAsync(new Client Value = Convert.ToBase64String(certificate.Export(X509ContentType.Cert)) } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -134,8 +135,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -145,7 +146,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -179,16 +180,16 @@ await identityContext.Users.AddAsync(new User NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); } - [Fact] + [SkipCiFact] public async Task Login_should_return_redirect_result_when_no_user_found() { var certificate = new X509Certificate2("itfoxtec.identity.saml2.testwebappcore_Certificate.pfx", "!QAZ2wsx"); @@ -221,8 +222,8 @@ await context.Clients.AddAsync(new Client Value = Convert.ToBase64String(certificate.Export(X509ContentType.Cert)) } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var config = new Saml2Configuration { @@ -232,7 +233,7 @@ await context.Clients.AddAsync(new Client }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -266,7 +267,7 @@ await context.Clients.AddAsync(new Client NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.Redirect, response.StatusCode); } @@ -318,8 +319,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -329,7 +330,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -363,11 +364,11 @@ await identityContext.Users.AddAsync(new User NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); } @@ -437,8 +438,8 @@ await context.Clients.AddAsync(new Client Value = Convert.ToBase64String(certificate.Export(X509ContentType.Cert)) } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -447,8 +448,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -458,7 +459,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -492,11 +493,11 @@ await identityContext.Users.AddAsync(new User NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); } @@ -567,8 +568,8 @@ await context.Clients.AddAsync(new Client Value = Convert.ToBase64String(certificate.Export(X509ContentType.Cert)) } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -577,8 +578,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -588,7 +589,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -622,11 +623,11 @@ await identityContext.Users.AddAsync(new User NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); } @@ -715,7 +716,7 @@ await context.Clients.AddAsync(new Client Value = true.ToString() } } - }).ConfigureAwait(false); + }); await context.Identities.AddAsync(new IdentityResource { Id = "profile", @@ -733,7 +734,7 @@ await context.Identities.AddAsync(new IdentityResource Type = "test" } } - }).ConfigureAwait(false); + }); await context.RelyingParties.AddAsync(new IdentityServer.Store.Entity.RelyingParty { Id = "test", @@ -749,8 +750,8 @@ await context.RelyingParties.AddAsync(new IdentityServer.Store.Entity.RelyingPar ToClaimType = "urm:amr" } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -759,8 +760,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -770,7 +771,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -809,7 +810,7 @@ await identityContext.Users.AddAsync(new User NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.Found, response.StatusCode); @@ -843,7 +844,7 @@ await identityContext.Users.AddAsync(new User var saml2AuthnResponse = new Saml2AuthnResponse(config); await soapEnvelope.ResolveAsync(httpFactoryMock.Object, saml2ArtifactResolve, saml2AuthnResponse) - .ConfigureAwait(false); + ; var relayStateQuery = artifactBinding.GetRelayStateQuery(); @@ -967,8 +968,8 @@ await context.Clients.AddAsync(new Client Value = Convert.ToBase64String(certificate.Export(X509ContentType.Cert)) } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -977,8 +978,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -988,7 +989,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -1022,11 +1023,11 @@ await identityContext.Users.AddAsync(new User NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); } @@ -1096,8 +1097,8 @@ await context.Clients.AddAsync(new Client Value = Convert.ToBase64String(certificate.Export(X509ContentType.Cert)) } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -1106,8 +1107,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -1117,7 +1118,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -1151,11 +1152,11 @@ await identityContext.Users.AddAsync(new User ["SAMLRequest"] = Convert.ToBase64String(Encoding.UTF8.GetBytes(binding.XmlDocument.OuterXml)), ["RelayState"] = binding.RelayState }); - using var response = await client.PostAsync("/saml2p/logout", logoutContent).ConfigureAwait(false); + using var response = await client.PostAsync("/saml2p/logout", logoutContent); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); } @@ -1257,8 +1258,8 @@ public async Task Artifact_should_validate_request() } }; - await context.Clients.AddAsync(app).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + await context.Clients.AddAsync(app); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -1267,8 +1268,8 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); var config = new Saml2Configuration { @@ -1278,7 +1279,7 @@ await identityContext.Users.AddAsync(new User }; config.AllowedAudienceUris.Add(issuer); - var entityDiscriptor = await GetIpdDescriptorAsync().ConfigureAwait(false); + var entityDiscriptor = await GetIpdDescriptorAsync(); config.AllowedIssuer = entityDiscriptor.EntityId; var idPSsoDescriptor = entityDiscriptor.IdPSsoDescriptor; config.SingleSignOnDestination = idPSsoDescriptor.SingleSignOnServices.First().Location; @@ -1317,7 +1318,7 @@ await identityContext.Users.AddAsync(new User NameIdPolicy = new NameIdPolicy { AllowCreate = true, Format = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" }, }); - using var response = await client.GetAsync(binding.RedirectLocation).ConfigureAwait(false); + using var response = await client.GetAsync(binding.RedirectLocation); Assert.Equal(HttpStatusCode.Found, response.StatusCode); @@ -1355,14 +1356,14 @@ await Assert.ThrowsAsync(() => soapEnvelope.ResolveAsync(httpFactoryM saml2AuthnResponse)); app.ProtocolType = IdentityServerConstants.ProtocolTypes.WsFederation; - await context.SaveChangesAsync().ConfigureAwait(false); + await context.SaveChangesAsync(); await Assert.ThrowsAsync(() => soapEnvelope.ResolveAsync(httpFactoryMock.Object, saml2ArtifactResolve, saml2AuthnResponse)); app.Enabled = false; - await context.SaveChangesAsync().ConfigureAwait(false); + await context.SaveChangesAsync(); await Assert.ThrowsAsync(() => soapEnvelope.ResolveAsync(httpFactoryMock.Object, saml2ArtifactResolve, @@ -1376,7 +1377,7 @@ private async Task GetIpdDescriptorAsync() Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); var descriptor = new EntityDescriptor(); descriptor.ReadIdPSsoDescriptor(content); @@ -1393,7 +1394,7 @@ private IEnumerable CreateRequestedAttributes() class MockHttpMessageHandler : HttpMessageHandler { - public Func Process { get; set; } + public required Func Process { get; set; } protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { return Task.FromResult(Process(request)); diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/WsFederationControllerTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/WsFederationControllerTest.cs index 9dbe703cc..91f7278a6 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/WsFederationControllerTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/Controllers/WsFederationControllerTest.cs @@ -42,7 +42,7 @@ public async Task Metadata_should_return_metadata_document_with_key_rotation() Assert.Equal(HttpStatusCode.OK, response.StatusCode); - using var reader = XmlReader.Create(await response.Content.ReadAsStreamAsync().ConfigureAwait(false)); + using var reader = XmlReader.Create(await response.Content.ReadAsStreamAsync()); var serializer = new Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMetadataSerializer(); var metadata = serializer.ReadMetadata(reader); @@ -78,8 +78,8 @@ await context.Clients.AddAsync(new Client Id = clientId, Enabled = true, ProtocolType = "oidc" - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); using var client = _factory.CreateClient(); using var response = await client.GetAsync($"/wsfederation?wtrealm={clientId}&wa=wsignin1.0"); @@ -99,8 +99,8 @@ await context.Clients.AddAsync(new Client Id = clientId, Enabled = true, ProtocolType = IdentityServerConstants.ProtocolTypes.WsFederation - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); using var client = _factory.CreateClient(); using var response = await client.GetAsync($"/wsfederation?wtrealm={clientId}&wa=wsignin1.0"); @@ -128,8 +128,8 @@ await context.Clients.AddAsync(new Client SignatureAlgorithm = SecurityAlgorithms.RsaSha256Signature, SamlNameIdentifierFormat = WsFederationConstants.SamlNameIdentifierFormats.UnspecifiedString } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); using var client = _factory.CreateClient(); using var response = await client.GetAsync($"/wsfederation?wtrealm={clientId}&wa=wsignin1.0"); @@ -157,8 +157,8 @@ await context.Clients.AddAsync(new Client SignatureAlgorithm = SecurityAlgorithms.RsaSha256Signature, SamlNameIdentifierFormat = WsFederationConstants.SamlNameIdentifierFormats.UnspecifiedString } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); using var client = _factory.CreateClient(new WebApplicationFactoryClientOptions { @@ -286,8 +286,8 @@ await context.Clients.AddAsync(new Client } } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -296,15 +296,15 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); using var client = _factory.CreateClient(); using var response = await client.GetAsync($"/wsfederation?wtrealm={clientId}&wa=wsignin1.0&wreply={client.BaseAddress}"); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); } @@ -453,8 +453,8 @@ await context.Clients.AddAsync(new Client } } } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -463,15 +463,15 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); using var client = _factory.CreateClient(); using var response = await client.GetAsync($"/wsfederation?wtrealm={clientId}&wa=wsignin1.0&wreply={client.BaseAddress}"); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); Assert.Contains("exemple.com", content); @@ -546,8 +546,8 @@ await context.Clients.AddAsync(new Client SamlNameIdentifierFormat = WsFederationConstants.SamlNameIdentifierFormats.UnspecifiedString, ClaimMappings = Array.Empty() } - }).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); + }); + await context.SaveChangesAsync(); var identityContext = scope.ServiceProvider.GetRequiredService(); await identityContext.Users.AddAsync(new User @@ -556,15 +556,15 @@ await identityContext.Users.AddAsync(new User UserName = name, NormalizedUserName = name.ToUpperInvariant(), SecurityStamp = Guid.NewGuid().ToString() - }).ConfigureAwait(false); - await identityContext.SaveChangesAsync().ConfigureAwait(false); + }); + await identityContext.SaveChangesAsync(); using var client = _factory.CreateClient(); using var response = await client.GetAsync($"/wsfederation?wtrealm={clientId}&wa=wsignin1.0&wreply={client.BaseAddress}"); Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.NotNull(content); Assert.Contains("exemple.com", content); diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/HealthCheckTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/HealthCheckTest.cs index cf735f981..0759d49ef 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/HealthCheckTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/HealthCheckTest.cs @@ -20,7 +20,7 @@ public async Task Healthz_should_return_health_status() using var client = _factory.CreateClient(); using var response = await client.GetAsync("/healthz"); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Contains("Healthy", content); } diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/PrometheusEndpointTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/PrometheusEndpointTest.cs index 15fd1c1d4..2ed5a2685 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/PrometheusEndpointTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/PrometheusEndpointTest.cs @@ -27,7 +27,7 @@ public async Task Metrics_should_return_prometheus_metrics() userService.SetTestUser(true, new[] { new Claim("role", SharedConstants.READERPOLICY) }); using var client = _factory.CreateClient(); using var response = await client.GetAsync("/metrics"); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); } @@ -36,7 +36,7 @@ public async Task Metrics_should_return_unauthorized_when_protected() { using var client = _factory.CreateClient(); using var response = await client.GetAsync("/metrics"); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); } } diff --git a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/StartupTest.cs b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/StartupTest.cs index 2d31a42a5..67512ed2b 100644 --- a/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/StartupTest.cs +++ b/test/Duende/Aguacongas.TheIdServer.Integration.Duende.Test/StartupTest.cs @@ -41,7 +41,7 @@ public async Task Configure_should_add_get_certificate_from_header_middleware() using var client = factory.CreateClient(); using var request = new HttpRequestMessage(HttpMethod.Get, "/connect"); request.Headers.Add("ssl-client-cert", Uri.EscapeDataString(File.ReadAllText("test.pem"))); - using var response = await client.SendAsync(request).ConfigureAwait(false); + using var response = await client.SendAsync(request); Assert.Equal(HttpStatusCode.OK, response.StatusCode); } @@ -71,7 +71,7 @@ public async Task SeedData_should_seed_data() SeedData.SeedUsers(scope, configurationManager); var clientStore = scope.ServiceProvider.GetRequiredService>(); - var result = await clientStore.GetAsync("theidserveradmin", new GetRequest()).ConfigureAwait(false); + var result = await clientStore.GetAsync("theidserveradmin", new GetRequest()); Assert.NotNull(result); @@ -79,7 +79,7 @@ public async Task SeedData_should_seed_data() SeedData.SeedUsers(scope, configurationManager); var userMgr = provider.GetRequiredService>(); - var user = await userMgr.FindByNameAsync("alice").ConfigureAwait(false); + var user = await userMgr.FindByNameAsync("alice"); Assert.NotNull(user); } @@ -213,16 +213,16 @@ public async Task ConfigureService_should_configure_proxy_services(bool disableS mockHttpContext.SetupGet(m => m.RequestServices).Returns(requestServices); if (jwtBearerHandler != null) { - await jwtBearerHandler.InitializeAsync(new AuthenticationScheme("Bearer", null, typeof(JwtBearerHandler)), mockHttpContext.Object).ConfigureAwait(false); - await jwtBearerHandler.AuthenticateAsync().ConfigureAwait(false); + await jwtBearerHandler.InitializeAsync(new AuthenticationScheme("Bearer", null, typeof(JwtBearerHandler)), mockHttpContext.Object); + await jwtBearerHandler.AuthenticateAsync(); } var oauthIntrospectionHandler = provider.GetService(); Assert.NotNull(oauthIntrospectionHandler); if (oauthIntrospectionHandler != null) { - await oauthIntrospectionHandler.InitializeAsync(new AuthenticationScheme("introspection", null, typeof(OAuth2IntrospectionHandler)), mockHttpContext.Object).ConfigureAwait(false); - await oauthIntrospectionHandler.AuthenticateAsync().ConfigureAwait(false); + await oauthIntrospectionHandler.InitializeAsync(new AuthenticationScheme("introspection", null, typeof(OAuth2IntrospectionHandler)), mockHttpContext.Object); + await oauthIntrospectionHandler.AuthenticateAsync(); } } diff --git a/test/WebAssembly.Net.Http/WebAssembly.Net.Http.ruleset b/test/WebAssembly.Net.Http/WebAssembly.Net.Http.ruleset index c11e53ff3..11e9f3c81 100644 --- a/test/WebAssembly.Net.Http/WebAssembly.Net.Http.ruleset +++ b/test/WebAssembly.Net.Http/WebAssembly.Net.Http.ruleset @@ -1,4 +1,3 @@ - + - \ No newline at end of file