diff --git a/.editorconfig b/.editorconfig index 185385361..969ae02dd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,10 @@ # Copyright Header file_header_template=Copyright (c) Duende Software. All rights reserved.\nSee LICENSE in the project root for license information. -dotnet_diagnostic.IDE0073.severity=warning +dotnet_diagnostic.IDE0073.severity = warning + + + # Unnecessary Using dotnet_diagnostic.IDE0005.severity=warning \ No newline at end of file diff --git a/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent.Client/_Imports.razor b/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent.Client/_Imports.razor index cd19f9fd6..9dd1cea95 100644 --- a/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent.Client/_Imports.razor +++ b/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent.Client/_Imports.razor @@ -1,10 +1,10 @@ @using System.Net.Http @using System.Net.Http.Json +@using Hosts.Bff.Blazor.PerComponent.Client @using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web -@using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using Hosts.Bff.Blazor.PerComponent.Client +@using static Microsoft.AspNetCore.Components.Web.RenderMode diff --git a/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Components/_Imports.razor b/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Components/_Imports.razor index 67c9ddb75..4efdb5b39 100644 --- a/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Components/_Imports.razor +++ b/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Components/_Imports.razor @@ -1,13 +1,13 @@ @using System.Net.Http @using System.Net.Http.Json +@using Hosts.Bff.Blazor.PerComponent +@using Hosts.Bff.Blazor.PerComponent.Client +@using Hosts.Bff.Blazor.PerComponent.Client.Components +@using Hosts.Bff.Blazor.PerComponent.Components @using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web -@using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using Hosts.Bff.Blazor.PerComponent -@using Hosts.Bff.Blazor.PerComponent.Components -@using Hosts.Bff.Blazor.PerComponent.Client -@using Hosts.Bff.Blazor.PerComponent.Client.Components +@using static Microsoft.AspNetCore.Components.Web.RenderMode diff --git a/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Program.cs b/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Program.cs index 55929c493..e52dce2b0 100644 --- a/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Program.cs +++ b/bff/hosts/Blazor/PerComponent/Hosts.Bff.Blazor.PerComponent/Program.cs @@ -1,9 +1,9 @@ -using Hosts.Bff.Blazor.PerComponent.Components; using Duende.Bff; using Duende.Bff.Blazor; using Duende.Bff.Yarp; using Hosts.Bff.Blazor.PerComponent; using Hosts.Bff.Blazor.PerComponent.Client; +using Hosts.Bff.Blazor.PerComponent.Components; var builder = WebApplication.CreateBuilder(args); diff --git a/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly.Client/_Imports.razor b/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly.Client/_Imports.razor index 92e864b37..135640898 100644 --- a/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly.Client/_Imports.razor +++ b/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly.Client/_Imports.razor @@ -1,12 +1,12 @@ @using System.Net.Http @using System.Net.Http.Json +@using Hosts.Bff.Blazor.WebAssembly.Client +@using Hosts.Bff.Blazor.WebAssembly.Client.Components @using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web -@using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using Hosts.Bff.Blazor.WebAssembly.Client -@using Hosts.Bff.Blazor.WebAssembly.Client.Components +@using static Microsoft.AspNetCore.Components.Web.RenderMode diff --git a/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly/Components/_Imports.razor b/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly/Components/_Imports.razor index 763a7a33f..81c044265 100644 --- a/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly/Components/_Imports.razor +++ b/bff/hosts/Blazor/WebAssembly/Hosts.Bff.Blazor.WebAssembly/Components/_Imports.razor @@ -1,11 +1,11 @@ @using System.Net.Http @using System.Net.Http.Json -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using static Microsoft.AspNetCore.Components.Web.RenderMode -@using Microsoft.AspNetCore.Components.Web.Virtualization -@using Microsoft.JSInterop @using Hosts.Bff.Blazor.WebAssembly @using Hosts.Bff.Blazor.WebAssembly.Client @using Hosts.Bff.Blazor.WebAssembly.Components +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using static Microsoft.AspNetCore.Components.Web.RenderMode diff --git a/bff/hosts/Hosts.IdentityServer/Pages/Account/Logout/Index.cshtml.cs b/bff/hosts/Hosts.IdentityServer/Pages/Account/Logout/Index.cshtml.cs index 09a8d9c18..0b9d759e2 100644 --- a/bff/hosts/Hosts.IdentityServer/Pages/Account/Logout/Index.cshtml.cs +++ b/bff/hosts/Hosts.IdentityServer/Pages/Account/Logout/Index.cshtml.cs @@ -1,7 +1,7 @@ +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/bff/hosts/Hosts.IdentityServer/Pages/Consent/Index.cshtml.cs b/bff/hosts/Hosts.IdentityServer/Pages/Consent/Index.cshtml.cs index 1f6167bef..05d5f8685 100644 --- a/bff/hosts/Hosts.IdentityServer/Pages/Consent/Index.cshtml.cs +++ b/bff/hosts/Hosts.IdentityServer/Pages/Consent/Index.cshtml.cs @@ -1,9 +1,9 @@ +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/Index.cshtml.cs b/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/Index.cshtml.cs index 154db0010..9ebfb7401 100644 --- a/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/Index.cshtml.cs +++ b/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/Index.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics { diff --git a/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/ViewModel.cs b/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/ViewModel.cs index b349a08f5..b29b5bdc0 100644 --- a/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/ViewModel.cs +++ b/bff/hosts/Hosts.IdentityServer/Pages/Diagnostics/ViewModel.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics { diff --git a/bff/hosts/Hosts.IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs b/bff/hosts/Hosts.IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs index b9243bced..4b204407c 100644 --- a/bff/hosts/Hosts.IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs +++ b/bff/hosts/Hosts.IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs @@ -1,9 +1,9 @@ using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/bff/hosts/Hosts.IdentityServer/Pages/TestUsers.cs b/bff/hosts/Hosts.IdentityServer/Pages/TestUsers.cs index 798a3e661..8337d0152 100644 --- a/bff/hosts/Hosts.IdentityServer/Pages/TestUsers.cs +++ b/bff/hosts/Hosts.IdentityServer/Pages/TestUsers.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Test; diff --git a/bff/hosts/Hosts.IdentityServer/TokenExchangeGrantValidator.cs b/bff/hosts/Hosts.IdentityServer/TokenExchangeGrantValidator.cs index a86bb90fd..baf9a5a08 100644 --- a/bff/hosts/Hosts.IdentityServer/TokenExchangeGrantValidator.cs +++ b/bff/hosts/Hosts.IdentityServer/TokenExchangeGrantValidator.cs @@ -1,6 +1,6 @@ +using Duende.IdentityModel; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; namespace IdentityServerHost; diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/ConfigureJwtBearerOptions.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/ConfigureJwtBearerOptions.cs index 2ed9664f1..c3548a8b2 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/ConfigureJwtBearerOptions.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/ConfigureJwtBearerOptions.cs @@ -1,6 +1,6 @@ +using System; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; -using System; namespace Api.DPoP; diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPExtensions.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPExtensions.cs index ec7eaed14..75a51b408 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPExtensions.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPExtensions.cs @@ -1,10 +1,10 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.IdentityModel.Tokens; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json; namespace Api.DPoP; diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPJwtBearerEvents.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPJwtBearerEvents.cs index 0925758f5..573429bfd 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPJwtBearerEvents.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPJwtBearerEvents.cs @@ -1,10 +1,10 @@ +using System.Text; +using System.Threading.Tasks; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -using System.Text; -using System.Threading.Tasks; using static Duende.IdentityModel.OidcConstants; namespace Api.DPoP; diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPProofValidator.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPProofValidator.cs index eec53a553..c72f6f95a 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPProofValidator.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPProofValidator.cs @@ -1,9 +1,3 @@ -using Duende.IdentityModel; -using Microsoft.AspNetCore.DataProtection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Microsoft.IdentityModel.JsonWebTokens; -using Microsoft.IdentityModel.Tokens; using System; using System.Collections.Generic; using System.Linq; @@ -11,6 +5,12 @@ using System.Security.Cryptography; using System.Text; using System.Text.Json; using System.Threading.Tasks; +using Duende.IdentityModel; +using Microsoft.AspNetCore.DataProtection; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Microsoft.IdentityModel.JsonWebTokens; +using Microsoft.IdentityModel.Tokens; namespace Api.DPoP; diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPServiceCollectionExtensions.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPServiceCollectionExtensions.cs index 2e2a3980e..a8e27605f 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPServiceCollectionExtensions.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DPoPServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ +using System; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using System; namespace Api.DPoP; diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DefaultReplayCache.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DefaultReplayCache.cs index a8b0169be..e5bf47794 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DefaultReplayCache.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/DPoP/DefaultReplayCache.cs @@ -1,6 +1,6 @@ -using Microsoft.Extensions.Caching.Distributed; -using System; +using System; using System.Threading.Tasks; +using Microsoft.Extensions.Caching.Distributed; namespace Api.DPoP; diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/EchoController.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/EchoController.cs index 2a7703861..6df2cf7ae 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/EchoController.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/EchoController.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Mvc; using System; using System.Security.Claims; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace Api.DPoP { diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/ToDoController.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/ToDoController.cs index 72a23241a..73bfd7f06 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/ToDoController.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.DPoP/ToDoController.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; namespace Api.DPoP diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/EchoController.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/EchoController.cs index 182283764..d4d122c6f 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/EchoController.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/EchoController.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Mvc; using System; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace Api.Isolated { diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/ToDoController.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/ToDoController.cs index 148e5bca8..40ca1404c 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/ToDoController.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi.Isolated/ToDoController.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; namespace Api.Isolated diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi/EchoController.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi/EchoController.cs index e0fcc9f1d..b6875e02f 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi/EchoController.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi/EchoController.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Mvc; using System; -using Microsoft.AspNetCore.Authorization; using System.Security.Claims; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace Api { diff --git a/bff/hosts/RemoteApis/Hosts.RemoteApi/ToDoController.cs b/bff/hosts/RemoteApis/Hosts.RemoteApi/ToDoController.cs index 41a39cbb0..801fca1ab 100644 --- a/bff/hosts/RemoteApis/Hosts.RemoteApi/ToDoController.cs +++ b/bff/hosts/RemoteApis/Hosts.RemoteApi/ToDoController.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; namespace Api diff --git a/bff/src/Bff.Blazor.Client/BffClientAuthenticationStateProvider.cs b/bff/src/Bff.Blazor.Client/BffClientAuthenticationStateProvider.cs index 3e4b5b303..8f7c89f81 100644 --- a/bff/src/Bff.Blazor.Client/BffClientAuthenticationStateProvider.cs +++ b/bff/src/Bff.Blazor.Client/BffClientAuthenticationStateProvider.cs @@ -3,8 +3,8 @@ using System.Security.Claims; using Duende.Bff.Blazor.Client.Internals; -using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; namespace Duende.Bff.Blazor.Client; diff --git a/bff/src/Bff.Yarp/BffYarpEndpointRouteBuilderExtensions.cs b/bff/src/Bff.Yarp/BffYarpEndpointRouteBuilderExtensions.cs index 7f30689d1..a752cf7f0 100644 --- a/bff/src/Bff.Yarp/BffYarpEndpointRouteBuilderExtensions.cs +++ b/bff/src/Bff.Yarp/BffYarpEndpointRouteBuilderExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Duende.Bff; +using Duende.Bff.Yarp; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; -using Duende.Bff.Yarp; using Microsoft.Extensions.DependencyInjection; using Yarp.ReverseProxy.Transforms.Builder; diff --git a/bff/src/Bff/Configuration/BffEndpointRouteBuilderExtensions.cs b/bff/src/Bff/Configuration/BffEndpointRouteBuilderExtensions.cs index bb1adba80..c9c45b986 100644 --- a/bff/src/Bff/Configuration/BffEndpointRouteBuilderExtensions.cs +++ b/bff/src/Bff/Configuration/BffEndpointRouteBuilderExtensions.cs @@ -1,13 +1,13 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende; using Duende.Bff; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Duende; namespace Microsoft.AspNetCore.Builder; diff --git a/bff/src/Bff/Configuration/BffServiceCollectionExtensions.cs b/bff/src/Bff/Configuration/BffServiceCollectionExtensions.cs index 00063e64a..d3fadc003 100644 --- a/bff/src/Bff/Configuration/BffServiceCollectionExtensions.cs +++ b/bff/src/Bff/Configuration/BffServiceCollectionExtensions.cs @@ -1,14 +1,14 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.AccessTokenManagement.OpenIdConnect; using Duende.Bff; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.Extensions.Options; -using Microsoft.AspNetCore.Authentication.OpenIdConnect; -using Microsoft.AspNetCore.Authentication; -using Duende.AccessTokenManagement.OpenIdConnect; namespace Microsoft.AspNetCore.Builder; diff --git a/bff/src/Bff/ConfigureUserTokenManagmentOptions.cs b/bff/src/Bff/ConfigureUserTokenManagmentOptions.cs index 68cf4042e..f2e69a910 100644 --- a/bff/src/Bff/ConfigureUserTokenManagmentOptions.cs +++ b/bff/src/Bff/ConfigureUserTokenManagmentOptions.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.AccessTokenManagement.OpenIdConnect; using Duende.Bff; using Microsoft.Extensions.Options; -using Duende.AccessTokenManagement.OpenIdConnect; namespace Microsoft.AspNetCore.Builder; diff --git a/bff/src/Bff/EndpointProcessing/BffAuthenticationService.cs b/bff/src/Bff/EndpointProcessing/BffAuthenticationService.cs index dcaf9f200..8a336887e 100644 --- a/bff/src/Bff/EndpointProcessing/BffAuthenticationService.cs +++ b/bff/src/Bff/EndpointProcessing/BffAuthenticationService.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Http; using System.Security.Claims; -using Microsoft.Extensions.Logging; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.Bff; diff --git a/bff/src/Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs b/bff/src/Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs index 2e329315a..d0cfedec7 100644 --- a/bff/src/Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs +++ b/bff/src/Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs @@ -1,6 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Security.Claims; +using System.Text.Json; +using Duende.Bff.Logging; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; @@ -9,9 +12,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.JsonWebTokens; using Microsoft.IdentityModel.Tokens; -using System.Security.Claims; -using System.Text.Json; -using Duende.Bff.Logging; namespace Duende.Bff; diff --git a/bff/src/Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs b/bff/src/Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs index f5343cb91..e0036bf93 100644 --- a/bff/src/Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs +++ b/bff/src/Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Text; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using System.Text; namespace Duende.Bff; diff --git a/bff/src/Bff/EndpointServices/User/DefaultUserService.cs b/bff/src/Bff/EndpointServices/User/DefaultUserService.cs index 71fe5c8a0..1437fb65e 100644 --- a/bff/src/Bff/EndpointServices/User/DefaultUserService.cs +++ b/bff/src/Bff/EndpointServices/User/DefaultUserService.cs @@ -1,15 +1,15 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Text; +using System.Text.Json; +using Duende.Bff.Logging; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Protocols.OpenIdConnect; -using System.Text; -using System.Text.Json; -using Duende.Bff.Logging; using Microsoft.Extensions.Options; +using Microsoft.IdentityModel.Protocols.OpenIdConnect; namespace Duende.Bff; diff --git a/bff/src/Bff/Extensions/AuthenticationTicketExtensions.cs b/bff/src/Bff/Extensions/AuthenticationTicketExtensions.cs index 84859a50e..72c25c32d 100644 --- a/bff/src/Bff/Extensions/AuthenticationTicketExtensions.cs +++ b/bff/src/Bff/Extensions/AuthenticationTicketExtensions.cs @@ -1,13 +1,13 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Security.Claims; +using System.Text.Json; +using System.Text.Json.Serialization; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; -using System.Security.Claims; -using System.Text.Json; -using System.Text.Json.Serialization; namespace Duende.Bff; diff --git a/bff/src/Bff/Licensing/LicenseValidator.cs b/bff/src/Bff/Licensing/LicenseValidator.cs index af3a85e4e..32f59c5d7 100644 --- a/bff/src/Bff/Licensing/LicenseValidator.cs +++ b/bff/src/Bff/Licensing/LicenseValidator.cs @@ -3,11 +3,11 @@ #nullable disable -using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; using System.Security.Claims; using System.Security.Cryptography; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.JsonWebTokens; +using Microsoft.IdentityModel.Tokens; namespace Duende; diff --git a/bff/src/Bff/SessionManagement/Revocation/SessionRevocationService.cs b/bff/src/Bff/SessionManagement/Revocation/SessionRevocationService.cs index 8b1682d85..5fa9d5eec 100644 --- a/bff/src/Bff/SessionManagement/Revocation/SessionRevocationService.cs +++ b/bff/src/Bff/SessionManagement/Revocation/SessionRevocationService.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.AccessTokenManagement.OpenIdConnect; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; -using Duende.AccessTokenManagement.OpenIdConnect; using Microsoft.Extensions.Options; namespace Duende.Bff; diff --git a/bff/templates/src/BffRemoteApi/Program.cs b/bff/templates/src/BffRemoteApi/Program.cs index edfbebba8..f13f67854 100644 --- a/bff/templates/src/BffRemoteApi/Program.cs +++ b/bff/templates/src/BffRemoteApi/Program.cs @@ -1,5 +1,5 @@ -using Duende.Bff.Yarp; using BffRemoteApi; +using Duende.Bff.Yarp; var builder = WebApplication.CreateBuilder(args); diff --git a/bff/test/Bff.Tests/Endpoints/LocalEndpointTests.cs b/bff/test/Bff.Tests/Endpoints/LocalEndpointTests.cs index 99fa2cb66..b965fd02b 100644 --- a/bff/test/Bff.Tests/Endpoints/LocalEndpointTests.cs +++ b/bff/test/Bff.Tests/Endpoints/LocalEndpointTests.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; +using System.Net.Http.Json; using Duende.Bff.Tests.TestFramework; using Duende.Bff.Tests.TestHosts; using Microsoft.Extensions.DependencyInjection; -using System.Net; -using System.Net.Http.Json; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints diff --git a/bff/test/Bff.Tests/Endpoints/Management/BackchannelLogoutEndpointTests.cs b/bff/test/Bff.Tests/Endpoints/Management/BackchannelLogoutEndpointTests.cs index fadc6f01d..bc453bdaf 100644 --- a/bff/test/Bff.Tests/Endpoints/Management/BackchannelLogoutEndpointTests.cs +++ b/bff/test/Bff.Tests/Endpoints/Management/BackchannelLogoutEndpointTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; using Duende.Bff.Tests.TestHosts; using Microsoft.Extensions.DependencyInjection; -using System.Net; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints.Management diff --git a/bff/test/Bff.Tests/Endpoints/Management/LoginEndpointTests.cs b/bff/test/Bff.Tests/Endpoints/Management/LoginEndpointTests.cs index 1fab31ead..e64b776c3 100644 --- a/bff/test/Bff.Tests/Endpoints/Management/LoginEndpointTests.cs +++ b/bff/test/Bff.Tests/Endpoints/Management/LoginEndpointTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; using Duende.Bff.Tests.TestHosts; using Microsoft.Extensions.DependencyInjection; -using System.Net; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints.Management diff --git a/bff/test/Bff.Tests/Endpoints/Management/LogoutEndpointTests.cs b/bff/test/Bff.Tests/Endpoints/Management/LogoutEndpointTests.cs index 55801bea9..752292519 100644 --- a/bff/test/Bff.Tests/Endpoints/Management/LogoutEndpointTests.cs +++ b/bff/test/Bff.Tests/Endpoints/Management/LogoutEndpointTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; using Duende.Bff.Tests.TestHosts; using Microsoft.Extensions.DependencyInjection; -using System.Net; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints.Management diff --git a/bff/test/Bff.Tests/Endpoints/Management/ManagementBasePathTests.cs b/bff/test/Bff.Tests/Endpoints/Management/ManagementBasePathTests.cs index 0761dddeb..146af9daf 100644 --- a/bff/test/Bff.Tests/Endpoints/Management/ManagementBasePathTests.cs +++ b/bff/test/Bff.Tests/Endpoints/Management/ManagementBasePathTests.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; using Duende.Bff.Tests.TestHosts; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -using System.Net; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints.Management diff --git a/bff/test/Bff.Tests/Endpoints/Management/UserEndpointTests.cs b/bff/test/Bff.Tests/Endpoints/Management/UserEndpointTests.cs index 218ad495b..a860d6116 100644 --- a/bff/test/Bff.Tests/Endpoints/Management/UserEndpointTests.cs +++ b/bff/test/Bff.Tests/Endpoints/Management/UserEndpointTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.Bff.Tests.TestHosts; -using System.Security.Claims; using System.Net; +using System.Security.Claims; +using Duende.Bff.Tests.TestHosts; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints.Management diff --git a/bff/test/Bff.Tests/Endpoints/RemoteEndpointTests.cs b/bff/test/Bff.Tests/Endpoints/RemoteEndpointTests.cs index e3016dc2a..ba1435cb4 100644 --- a/bff/test/Bff.Tests/Endpoints/RemoteEndpointTests.cs +++ b/bff/test/Bff.Tests/Endpoints/RemoteEndpointTests.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.Bff.Tests.TestFramework; -using Duende.Bff.Tests.TestHosts; using System.Net; using System.Net.Http.Json; using System.Text.Json; +using Duende.Bff.Tests.TestFramework; +using Duende.Bff.Tests.TestHosts; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints diff --git a/bff/test/Bff.Tests/Endpoints/YarpRemoteEndpointTests.cs b/bff/test/Bff.Tests/Endpoints/YarpRemoteEndpointTests.cs index 3eb79e5c5..148792210 100644 --- a/bff/test/Bff.Tests/Endpoints/YarpRemoteEndpointTests.cs +++ b/bff/test/Bff.Tests/Endpoints/YarpRemoteEndpointTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.Bff.Tests.TestHosts; using System.Net; using Duende.Bff.Tests.TestFramework; +using Duende.Bff.Tests.TestHosts; using Xunit.Abstractions; namespace Duende.Bff.Tests.Endpoints diff --git a/bff/test/Bff.Tests/GenericHostTests.cs b/bff/test/Bff.Tests/GenericHostTests.cs index f2be92f05..fc50a502c 100644 --- a/bff/test/Bff.Tests/GenericHostTests.cs +++ b/bff/test/Bff.Tests/GenericHostTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; using Duende.Bff.Tests.TestFramework; using Microsoft.AspNetCore.Builder; -using System.Net; using Xunit.Abstractions; namespace Duende.Bff.Tests diff --git a/bff/test/Bff.Tests/IAccessTokenRetriever_Extensibility_tests.cs b/bff/test/Bff.Tests/IAccessTokenRetriever_Extensibility_tests.cs index 5b3a1f81d..823f9c05f 100644 --- a/bff/test/Bff.Tests/IAccessTokenRetriever_Extensibility_tests.cs +++ b/bff/test/Bff.Tests/IAccessTokenRetriever_Extensibility_tests.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. using Duende.Bff.Tests.TestHosts; -using Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit.Abstractions; using Microsoft.Extensions.Logging.Abstractions; +using Xunit.Abstractions; namespace Duende.Bff.Tests; diff --git a/bff/test/Bff.Tests/TestFramework/GenericHost.cs b/bff/test/Bff.Tests/TestFramework/GenericHost.cs index d0c47cbd6..2d5141ca7 100644 --- a/bff/test/Bff.Tests/TestFramework/GenericHost.cs +++ b/bff/test/Bff.Tests/TestFramework/GenericHost.cs @@ -1,16 +1,16 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; +using System.Security.Claims; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using System.Net; -using System.Security.Claims; -using Microsoft.AspNetCore.HttpOverrides; namespace Duende.Bff.Tests.TestFramework { diff --git a/bff/test/Bff.Tests/TestHosts/ApiHost.cs b/bff/test/Bff.Tests/TestHosts/ApiHost.cs index 54eb9f74c..675fcd713 100644 --- a/bff/test/Bff.Tests/TestHosts/ApiHost.cs +++ b/bff/test/Bff.Tests/TestHosts/ApiHost.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Text.Json; using Duende.Bff.Tests.TestFramework; using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -using System.Text.Json; namespace Duende.Bff.Tests.TestHosts { diff --git a/bff/test/Bff.Tests/TestHosts/BffHost.cs b/bff/test/Bff.Tests/TestHosts/BffHost.cs index 687f2a556..b622c3dcd 100644 --- a/bff/test/Bff.Tests/TestHosts/BffHost.cs +++ b/bff/test/Bff.Tests/TestHosts/BffHost.cs @@ -1,14 +1,14 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Net; +using System.Text.Json; using Duende.Bff.Tests.TestFramework; +using Duende.Bff.Yarp; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -using System.Net; -using System.Text.Json; -using Duende.Bff.Yarp; -using Microsoft.AspNetCore.Authentication; using Yarp.ReverseProxy.Forwarder; using Yarp.ReverseProxy.Transforms; using Yarp.ReverseProxy.Transforms.Builder; diff --git a/bff/test/Bff.Tests/TestHosts/BffHostUsingResourceNamedTokens.cs b/bff/test/Bff.Tests/TestHosts/BffHostUsingResourceNamedTokens.cs index 659b3f198..1e6f82a00 100644 --- a/bff/test/Bff.Tests/TestHosts/BffHostUsingResourceNamedTokens.cs +++ b/bff/test/Bff.Tests/TestHosts/BffHostUsingResourceNamedTokens.cs @@ -1,13 +1,13 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.Bff.Tests.TestFramework; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; using System.Net; +using Duende.Bff.Tests.TestFramework; using Duende.Bff.Yarp; -using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.HttpOverrides; +using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Yarp.ReverseProxy.Forwarder; diff --git a/bff/test/Bff.Tests/TestHosts/BffIntegrationTestBase.cs b/bff/test/Bff.Tests/TestHosts/BffIntegrationTestBase.cs index 45566c2d3..482cb50c3 100644 --- a/bff/test/Bff.Tests/TestHosts/BffIntegrationTestBase.cs +++ b/bff/test/Bff.Tests/TestHosts/BffIntegrationTestBase.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using System.Security.Claims; using Xunit.Abstractions; namespace Duende.Bff.Tests.TestHosts diff --git a/bff/test/Bff.Tests/TestHosts/IdentityServerHost.cs b/bff/test/Bff.Tests/TestHosts/IdentityServerHost.cs index e819dce05..4d5598f42 100644 --- a/bff/test/Bff.Tests/TestHosts/IdentityServerHost.cs +++ b/bff/test/Bff.Tests/TestHosts/IdentityServerHost.cs @@ -1,6 +1,7 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.Bff.Tests.TestFramework; using Duende.IdentityServer; using Duende.IdentityServer.Models; @@ -9,7 +10,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using System.Security.Claims; namespace Duende.Bff.Tests.TestHosts; diff --git a/bff/test/Bff.Tests/TestHosts/YarpBffIntegrationTestBase.cs b/bff/test/Bff.Tests/TestHosts/YarpBffIntegrationTestBase.cs index 73377e472..7e9377c4d 100644 --- a/bff/test/Bff.Tests/TestHosts/YarpBffIntegrationTestBase.cs +++ b/bff/test/Bff.Tests/TestHosts/YarpBffIntegrationTestBase.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using System.Security.Claims; using Xunit.Abstractions; namespace Duende.Bff.Tests.TestHosts diff --git a/bff/test/Hosts.Tests/PlaywrightTestBase.cs b/bff/test/Hosts.Tests/PlaywrightTestBase.cs index 39f6b6384..dce82a689 100644 --- a/bff/test/Hosts.Tests/PlaywrightTestBase.cs +++ b/bff/test/Hosts.Tests/PlaywrightTestBase.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Reflection; using Hosts.Tests.TestInfra; using Microsoft.Playwright; using Microsoft.Playwright.Xunit; -using System.Reflection; using Xunit.Abstractions; using Xunit.Sdk; diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoP/ConfigureJwtBearerOptions.cs b/identity-server/clients/src/APIs/DPoPApi/DPoP/ConfigureJwtBearerOptions.cs index dd5c80caf..27d4d8bdf 100644 --- a/identity-server/clients/src/APIs/DPoPApi/DPoP/ConfigureJwtBearerOptions.cs +++ b/identity-server/clients/src/APIs/DPoPApi/DPoP/ConfigureJwtBearerOptions.cs @@ -1,6 +1,6 @@ +using System; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; -using System; namespace DPoPApi; diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPExtensions.cs b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPExtensions.cs index 4766d2a0c..cfc071bf2 100644 --- a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPExtensions.cs +++ b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPExtensions.cs @@ -1,10 +1,10 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.IdentityModel.Tokens; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json; namespace DPoPApi; diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs index 8eb70654a..2b62e7e7c 100644 --- a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs +++ b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs @@ -1,10 +1,10 @@ +using System.Text; +using System.Threading.Tasks; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -using System.Text; -using System.Threading.Tasks; using static Duende.IdentityModel.OidcConstants; namespace DPoPApi; diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPProofValidator.cs b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPProofValidator.cs index d1fe027d1..ab40feac7 100644 --- a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPProofValidator.cs +++ b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPProofValidator.cs @@ -1,9 +1,3 @@ -using Duende.IdentityModel; -using Microsoft.AspNetCore.DataProtection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Microsoft.IdentityModel.JsonWebTokens; -using Microsoft.IdentityModel.Tokens; using System; using System.Collections.Generic; using System.Linq; @@ -11,6 +5,12 @@ using System.Security.Cryptography; using System.Text; using System.Text.Json; using System.Threading.Tasks; +using Duende.IdentityModel; +using Microsoft.AspNetCore.DataProtection; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Microsoft.IdentityModel.JsonWebTokens; +using Microsoft.IdentityModel.Tokens; namespace DPoPApi; diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPServiceCollectionExtensions.cs b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPServiceCollectionExtensions.cs index a0564dabd..1e2e8ebda 100644 --- a/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPServiceCollectionExtensions.cs +++ b/identity-server/clients/src/APIs/DPoPApi/DPoP/DPoPServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ +using System; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using System; namespace DPoPApi; diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoP/DefaultReplayCache.cs b/identity-server/clients/src/APIs/DPoPApi/DPoP/DefaultReplayCache.cs index 69961fb55..a756654b1 100644 --- a/identity-server/clients/src/APIs/DPoPApi/DPoP/DefaultReplayCache.cs +++ b/identity-server/clients/src/APIs/DPoPApi/DPoP/DefaultReplayCache.cs @@ -1,6 +1,6 @@ -using Microsoft.Extensions.Caching.Distributed; -using System; +using System; using System.Threading.Tasks; +using Microsoft.Extensions.Caching.Distributed; namespace DPoPApi; diff --git a/identity-server/clients/src/APIs/DPoPApi/IdentityController.cs b/identity-server/clients/src/APIs/DPoPApi/IdentityController.cs index 7cfce4e9a..fb9e5bd95 100644 --- a/identity-server/clients/src/APIs/DPoPApi/IdentityController.cs +++ b/identity-server/clients/src/APIs/DPoPApi/IdentityController.cs @@ -1,8 +1,8 @@ +using System.Linq; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using System.Linq; namespace DPoPApi.Controllers { diff --git a/identity-server/clients/src/APIs/ResourceBasedApi/IdentityController.cs b/identity-server/clients/src/APIs/ResourceBasedApi/IdentityController.cs index 8b8873744..2c3c6f24e 100644 --- a/identity-server/clients/src/APIs/ResourceBasedApi/IdentityController.cs +++ b/identity-server/clients/src/APIs/ResourceBasedApi/IdentityController.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Mvc; +using System.Linq; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using System.Linq; namespace ResourceBasedApi.Controllers { diff --git a/identity-server/clients/src/APIs/SimpleApi/IdentityController.cs b/identity-server/clients/src/APIs/SimpleApi/IdentityController.cs index ee8ecaa05..6986832b7 100644 --- a/identity-server/clients/src/APIs/SimpleApi/IdentityController.cs +++ b/identity-server/clients/src/APIs/SimpleApi/IdentityController.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Mvc; +using System.Linq; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using System.Linq; namespace SampleApi.Controllers { diff --git a/identity-server/clients/src/ConsoleCibaClient/Program.cs b/identity-server/clients/src/ConsoleCibaClient/Program.cs index e897a8670..678899439 100644 --- a/identity-server/clients/src/ConsoleCibaClient/Program.cs +++ b/identity-server/clients/src/ConsoleCibaClient/Program.cs @@ -1,7 +1,3 @@ -using Clients; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; -using Microsoft.IdentityModel.Tokens; using System; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; @@ -9,6 +5,10 @@ using System.Net.Http; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; +using Microsoft.IdentityModel.Tokens; namespace ConsoleCibaClient { diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlow/Program.cs b/identity-server/clients/src/ConsoleClientCredentialsFlow/Program.cs index 533f47b5e..37b0154d7 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlow/Program.cs +++ b/identity-server/clients/src/ConsoleClientCredentialsFlow/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleClientCredentialsFlow { diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/Program.cs b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/Program.cs index 80104d09a..e9e227843 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/Program.cs +++ b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleClientCredentialsFlowCallingIdentityServerApi { diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/Program.cs b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/Program.cs index 2c42e1acc..9d6e8fa63 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/Program.cs +++ b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/Program.cs @@ -1,12 +1,12 @@ -using Clients; -using Duende.IdentityModel.Client; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.IdentityModel.Tokens; using System; using System.Net.Http; using System.Security.Cryptography; using System.Text.Json; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; namespace ConsoleClientCredentialsFlowDPoP { diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/Program.cs b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/Program.cs index d563d75ce..bbeb2bf81 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/Program.cs +++ b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleClientCredentialsFlow { diff --git a/identity-server/clients/src/ConsoleCode/Program.cs b/identity-server/clients/src/ConsoleCode/Program.cs index adfe6f5a9..8249d4c4b 100644 --- a/identity-server/clients/src/ConsoleCode/Program.cs +++ b/identity-server/clients/src/ConsoleCode/Program.cs @@ -1,10 +1,10 @@ -using Clients; +using System; +using System.Net.Http; +using System.Threading.Tasks; +using Clients; using Duende.IdentityModel.Client; using Duende.IdentityModel.OidcClient; using Serilog; -using System; -using System.Net.Http; -using System.Threading.Tasks; namespace ConsoleResourceIndicators { diff --git a/identity-server/clients/src/ConsoleCode/SystemBrowser.cs b/identity-server/clients/src/ConsoleCode/SystemBrowser.cs index d25fa6b08..95288d859 100644 --- a/identity-server/clients/src/ConsoleCode/SystemBrowser.cs +++ b/identity-server/clients/src/ConsoleCode/SystemBrowser.cs @@ -1,7 +1,3 @@ -using Duende.IdentityModel.OidcClient.Browser; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using System; using System.Diagnostics; using System.IO; @@ -11,6 +7,10 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading; using System.Threading.Tasks; +using Duende.IdentityModel.OidcClient.Browser; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; namespace ConsoleResourceIndicators { diff --git a/identity-server/clients/src/ConsoleCustomGrant/Program.cs b/identity-server/clients/src/ConsoleCustomGrant/Program.cs index 8f9eb8d96..62d00965e 100644 --- a/identity-server/clients/src/ConsoleCustomGrant/Program.cs +++ b/identity-server/clients/src/ConsoleCustomGrant/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleCustomGrant { diff --git a/identity-server/clients/src/ConsoleDeviceFlow/Program.cs b/identity-server/clients/src/ConsoleDeviceFlow/Program.cs index c89a76602..1c5d78f9d 100644 --- a/identity-server/clients/src/ConsoleDeviceFlow/Program.cs +++ b/identity-server/clients/src/ConsoleDeviceFlow/Program.cs @@ -1,11 +1,11 @@ -using Clients; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; using System; using System.Diagnostics; using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; namespace ConsoleDeviceFlow { diff --git a/identity-server/clients/src/ConsoleIntrospectionClient/Program.cs b/identity-server/clients/src/ConsoleIntrospectionClient/Program.cs index 47e521b36..e0fa6fa08 100644 --- a/identity-server/clients/src/ConsoleIntrospectionClient/Program.cs +++ b/identity-server/clients/src/ConsoleIntrospectionClient/Program.cs @@ -1,9 +1,9 @@ -using Clients; -using Duende.IdentityModel.Client; using System; using System.Linq; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleIntrospectionClient { diff --git a/identity-server/clients/src/ConsoleMTLSClient/Program.cs b/identity-server/clients/src/ConsoleMTLSClient/Program.cs index 61a1e4df6..8820d10b1 100644 --- a/identity-server/clients/src/ConsoleMTLSClient/Program.cs +++ b/identity-server/clients/src/ConsoleMTLSClient/Program.cs @@ -1,9 +1,9 @@ -using Clients; -using Duende.IdentityModel.Client; using System; using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleMTLSClient { diff --git a/identity-server/clients/src/ConsolePrivateKeyJwtClient/Program.cs b/identity-server/clients/src/ConsolePrivateKeyJwtClient/Program.cs index 0d806d5ee..c5b1a2424 100644 --- a/identity-server/clients/src/ConsolePrivateKeyJwtClient/Program.cs +++ b/identity-server/clients/src/ConsolePrivateKeyJwtClient/Program.cs @@ -1,14 +1,14 @@ -using Clients; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; -using Microsoft.IdentityModel.Tokens; -using System; +using System; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; using System.Net.Http; using System.Security.Claims; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; +using Microsoft.IdentityModel.Tokens; namespace ConsolePrivateKeyJwtClient { diff --git a/identity-server/clients/src/ConsoleResourceIndicators/Program.cs b/identity-server/clients/src/ConsoleResourceIndicators/Program.cs index b9ffcf4d3..efc8b32a9 100644 --- a/identity-server/clients/src/ConsoleResourceIndicators/Program.cs +++ b/identity-server/clients/src/ConsoleResourceIndicators/Program.cs @@ -1,13 +1,13 @@ -using Clients; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; -using Duende.IdentityModel.OidcClient; -using Serilog; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; +using Duende.IdentityModel.OidcClient; +using Serilog; namespace ConsoleResourceIndicators { diff --git a/identity-server/clients/src/ConsoleResourceIndicators/SystemBrowser.cs b/identity-server/clients/src/ConsoleResourceIndicators/SystemBrowser.cs index 449010cec..233be17bb 100644 --- a/identity-server/clients/src/ConsoleResourceIndicators/SystemBrowser.cs +++ b/identity-server/clients/src/ConsoleResourceIndicators/SystemBrowser.cs @@ -1,11 +1,11 @@ -using Duende.IdentityModel.OidcClient.Browser; -using System; +using System; using System.Diagnostics; using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; +using Duende.IdentityModel.OidcClient.Browser; namespace ConsoleResourceIndicators { diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlow/Program.cs b/identity-server/clients/src/ConsoleResourceOwnerFlow/Program.cs index 8ecd2e696..12aa3c184 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlow/Program.cs +++ b/identity-server/clients/src/ConsoleResourceOwnerFlow/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleResourceOwnerFlow { diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/Program.cs b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/Program.cs index 03b620a20..de320f6f1 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/Program.cs +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleResourceOwnerFlowPublic { diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/Program.cs b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/Program.cs index a68c14463..946fd6cbe 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/Program.cs +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleResourceOwnerFlowReference { diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs index aad7163de..d0a8cd23b 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleResourceOwnerFlowRefreshToken { diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/Program.cs b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/Program.cs index 1c08b0f79..c300bdd25 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/Program.cs +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/Program.cs @@ -1,8 +1,8 @@ -using Clients; -using Duende.IdentityModel.Client; -using System; +using System; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; namespace ConsoleResourceOwnerFlowUserInfo { diff --git a/identity-server/clients/src/Constants/TokenResponseExtensions.cs b/identity-server/clients/src/Constants/TokenResponseExtensions.cs index abe24019b..33ea8e934 100644 --- a/identity-server/clients/src/Constants/TokenResponseExtensions.cs +++ b/identity-server/clients/src/Constants/TokenResponseExtensions.cs @@ -1,8 +1,8 @@ -using Duende.IdentityModel; -using Duende.IdentityModel.Client; -using System; +using System; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; namespace Clients { diff --git a/identity-server/clients/src/JsOidc/Startup.cs b/identity-server/clients/src/JsOidc/Startup.cs index 635a53d19..f283c95b3 100644 --- a/identity-server/clients/src/JsOidc/Startup.cs +++ b/identity-server/clients/src/JsOidc/Startup.cs @@ -1,5 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; namespace JsOidc { diff --git a/identity-server/clients/src/MvcAutomaticTokenManagement/Controllers/HomeController.cs b/identity-server/clients/src/MvcAutomaticTokenManagement/Controllers/HomeController.cs index 4781b9385..a13493cf4 100644 --- a/identity-server/clients/src/MvcAutomaticTokenManagement/Controllers/HomeController.cs +++ b/identity-server/clients/src/MvcAutomaticTokenManagement/Controllers/HomeController.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; using System.Net.Http; using System.Threading.Tasks; using Clients; -using Microsoft.AspNetCore.Authentication; using Duende.AccessTokenManagement.OpenIdConnect; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace MvcAutomaticTokenManagement.Controllers; diff --git a/identity-server/clients/src/MvcAutomaticTokenManagement/Program.cs b/identity-server/clients/src/MvcAutomaticTokenManagement/Program.cs index 3f679873e..cbe701df8 100644 --- a/identity-server/clients/src/MvcAutomaticTokenManagement/Program.cs +++ b/identity-server/clients/src/MvcAutomaticTokenManagement/Program.cs @@ -1,8 +1,8 @@ +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; -using System; namespace MvcAutomaticTokenManagement; diff --git a/identity-server/clients/src/MvcAutomaticTokenManagement/Startup.cs b/identity-server/clients/src/MvcAutomaticTokenManagement/Startup.cs index ccfd3c5fe..9d97b3055 100644 --- a/identity-server/clients/src/MvcAutomaticTokenManagement/Startup.cs +++ b/identity-server/clients/src/MvcAutomaticTokenManagement/Startup.cs @@ -1,10 +1,10 @@ +using System; +using System.IdentityModel.Tokens.Jwt; using Clients; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using System; -using System.IdentityModel.Tokens.Jwt; namespace MvcAutomaticTokenManagement; diff --git a/identity-server/clients/src/MvcCode/Program.cs b/identity-server/clients/src/MvcCode/Program.cs index a5b8fbe98..3383cbb1a 100644 --- a/identity-server/clients/src/MvcCode/Program.cs +++ b/identity-server/clients/src/MvcCode/Program.cs @@ -1,8 +1,8 @@ +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; -using System; namespace MvcCode; diff --git a/identity-server/clients/src/MvcCode/Startup.cs b/identity-server/clients/src/MvcCode/Startup.cs index 449389862..e97cf1bde 100644 --- a/identity-server/clients/src/MvcCode/Startup.cs +++ b/identity-server/clients/src/MvcCode/Startup.cs @@ -1,14 +1,14 @@ +using System.IdentityModel.Tokens.Jwt; +using System.Net.Http; using Clients; using Duende.IdentityModel; +using Duende.IdentityModel.Client; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using System.IdentityModel.Tokens.Jwt; -using System.Net.Http; -using Duende.IdentityModel.Client; -using Microsoft.Extensions.Configuration; namespace MvcCode; diff --git a/identity-server/clients/src/MvcDPoP/Controllers/HomeController.cs b/identity-server/clients/src/MvcDPoP/Controllers/HomeController.cs index d6572dc1d..ab9a32019 100644 --- a/identity-server/clients/src/MvcDPoP/Controllers/HomeController.cs +++ b/identity-server/clients/src/MvcDPoP/Controllers/HomeController.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; using System.Net.Http; using System.Threading.Tasks; using Clients; -using Microsoft.AspNetCore.Authentication; using Duende.AccessTokenManagement.OpenIdConnect; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace MvcDPoP.Controllers; diff --git a/identity-server/clients/src/MvcDPoP/CustomProofService.cs b/identity-server/clients/src/MvcDPoP/CustomProofService.cs index d65a01f26..338c5d5c9 100644 --- a/identity-server/clients/src/MvcDPoP/CustomProofService.cs +++ b/identity-server/clients/src/MvcDPoP/CustomProofService.cs @@ -1,6 +1,6 @@ +using System.Threading.Tasks; using Duende.AccessTokenManagement; using Microsoft.Extensions.Logging; -using System.Threading.Tasks; namespace MvcDPoP; diff --git a/identity-server/clients/src/MvcDPoP/Program.cs b/identity-server/clients/src/MvcDPoP/Program.cs index 6629bf571..bfee755dc 100644 --- a/identity-server/clients/src/MvcDPoP/Program.cs +++ b/identity-server/clients/src/MvcDPoP/Program.cs @@ -1,8 +1,8 @@ +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; -using System; namespace MvcDPoP; diff --git a/identity-server/clients/src/MvcDPoP/Startup.cs b/identity-server/clients/src/MvcDPoP/Startup.cs index b0b3b5387..e3674f2b9 100644 --- a/identity-server/clients/src/MvcDPoP/Startup.cs +++ b/identity-server/clients/src/MvcDPoP/Startup.cs @@ -1,13 +1,13 @@ +using System; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Cryptography; +using System.Text.Json; using Clients; using Duende.AccessTokenManagement; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using System; -using System.IdentityModel.Tokens.Jwt; -using System.Security.Cryptography; -using System.Text.Json; namespace MvcDPoP; diff --git a/identity-server/clients/src/MvcDPoP/TestHandler.cs b/identity-server/clients/src/MvcDPoP/TestHandler.cs index 0dc137663..ec14386f2 100644 --- a/identity-server/clients/src/MvcDPoP/TestHandler.cs +++ b/identity-server/clients/src/MvcDPoP/TestHandler.cs @@ -1,8 +1,8 @@ -using Microsoft.Extensions.Logging; using System.Linq; using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; namespace MvcDPoP; diff --git a/identity-server/clients/src/MvcHybridBackChannel/Controllers/HomeController.cs b/identity-server/clients/src/MvcHybridBackChannel/Controllers/HomeController.cs index af5143b82..732c88c18 100644 --- a/identity-server/clients/src/MvcHybridBackChannel/Controllers/HomeController.cs +++ b/identity-server/clients/src/MvcHybridBackChannel/Controllers/HomeController.cs @@ -1,12 +1,12 @@ using System; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authorization; +using System.Globalization; using System.Net.Http; +using System.Threading.Tasks; using Clients; using Duende.IdentityModel.Client; -using System.Globalization; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace MvcHybrid.Controllers { diff --git a/identity-server/clients/src/MvcHybridBackChannel/Controllers/LogoutController.cs b/identity-server/clients/src/MvcHybridBackChannel/Controllers/LogoutController.cs index 28806637b..3e5767857 100644 --- a/identity-server/clients/src/MvcHybridBackChannel/Controllers/LogoutController.cs +++ b/identity-server/clients/src/MvcHybridBackChannel/Controllers/LogoutController.cs @@ -1,10 +1,3 @@ -using Clients; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.IdentityModel.Tokens; using System; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; @@ -12,6 +5,13 @@ using System.Net.Http; using System.Security.Claims; using System.Text.Json; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.IdentityModel.Tokens; namespace MvcHybrid.Controllers { diff --git a/identity-server/clients/src/MvcHybridBackChannel/CookieEventHandler.cs b/identity-server/clients/src/MvcHybridBackChannel/CookieEventHandler.cs index 397c52c79..459b9b1f3 100644 --- a/identity-server/clients/src/MvcHybridBackChannel/CookieEventHandler.cs +++ b/identity-server/clients/src/MvcHybridBackChannel/CookieEventHandler.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Authentication.Cookies; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; namespace MvcHybrid { diff --git a/identity-server/clients/src/MvcHybridBackChannel/Startup.cs b/identity-server/clients/src/MvcHybridBackChannel/Startup.cs index c37f6fbe0..6eadd8c63 100644 --- a/identity-server/clients/src/MvcHybridBackChannel/Startup.cs +++ b/identity-server/clients/src/MvcHybridBackChannel/Startup.cs @@ -1,15 +1,15 @@ using System; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; using System.IdentityModel.Tokens.Jwt; -using Duende.IdentityModel; -using Clients; -using Microsoft.IdentityModel.Tokens; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Authentication; -using Duende.IdentityModel.Client; using System.Net.Http; +using Clients; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; namespace MvcHybrid { diff --git a/identity-server/clients/src/MvcJarJwt/ClientAssertionService.cs b/identity-server/clients/src/MvcJarJwt/ClientAssertionService.cs index 6c290a5f3..67408eb04 100644 --- a/identity-server/clients/src/MvcJarJwt/ClientAssertionService.cs +++ b/identity-server/clients/src/MvcJarJwt/ClientAssertionService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; +using Duende.AccessTokenManagement; using Duende.IdentityModel; using Duende.IdentityModel.Client; -using Duende.AccessTokenManagement; namespace MvcJarJwt; diff --git a/identity-server/clients/src/MvcJarJwt/Controllers/HomeController.cs b/identity-server/clients/src/MvcJarJwt/Controllers/HomeController.cs index 7625f2e2d..0c1b2d940 100644 --- a/identity-server/clients/src/MvcJarJwt/Controllers/HomeController.cs +++ b/identity-server/clients/src/MvcJarJwt/Controllers/HomeController.cs @@ -1,8 +1,8 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Clients; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace MvcJarJwt.Controllers; diff --git a/identity-server/clients/src/MvcJarJwt/Program.cs b/identity-server/clients/src/MvcJarJwt/Program.cs index 40e779056..86119a386 100644 --- a/identity-server/clients/src/MvcJarJwt/Program.cs +++ b/identity-server/clients/src/MvcJarJwt/Program.cs @@ -1,8 +1,8 @@ +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; -using System; namespace MvcJarJwt; diff --git a/identity-server/clients/src/MvcJarJwt/Startup.cs b/identity-server/clients/src/MvcJarJwt/Startup.cs index 647912166..656a7157a 100644 --- a/identity-server/clients/src/MvcJarJwt/Startup.cs +++ b/identity-server/clients/src/MvcJarJwt/Startup.cs @@ -1,11 +1,11 @@ +using System; using Clients; +using Duende.AccessTokenManagement; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using System; -using Microsoft.Extensions.Configuration; -using Duende.AccessTokenManagement; namespace MvcJarJwt; diff --git a/identity-server/clients/src/MvcJarUriJwt/ClientAssertionService.cs b/identity-server/clients/src/MvcJarUriJwt/ClientAssertionService.cs index e498ac11a..ea9eaef0a 100644 --- a/identity-server/clients/src/MvcJarUriJwt/ClientAssertionService.cs +++ b/identity-server/clients/src/MvcJarUriJwt/ClientAssertionService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; +using Duende.AccessTokenManagement; using Duende.IdentityModel; using Duende.IdentityModel.Client; -using Duende.AccessTokenManagement; namespace MvcJarUriJwt; diff --git a/identity-server/clients/src/MvcJarUriJwt/Controllers/HomeController.cs b/identity-server/clients/src/MvcJarUriJwt/Controllers/HomeController.cs index 5d53a9346..96850cbab 100644 --- a/identity-server/clients/src/MvcJarUriJwt/Controllers/HomeController.cs +++ b/identity-server/clients/src/MvcJarUriJwt/Controllers/HomeController.cs @@ -1,8 +1,8 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Clients; using System.Net.Http; using System.Threading.Tasks; +using Clients; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; namespace MvcJarUriJwt.Controllers; diff --git a/identity-server/clients/src/MvcJarUriJwt/Program.cs b/identity-server/clients/src/MvcJarUriJwt/Program.cs index fc1a0d383..0b0440ddb 100644 --- a/identity-server/clients/src/MvcJarUriJwt/Program.cs +++ b/identity-server/clients/src/MvcJarUriJwt/Program.cs @@ -1,8 +1,8 @@ +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; -using System; namespace MvcJarUriJwt; diff --git a/identity-server/clients/src/MvcJarUriJwt/Startup.cs b/identity-server/clients/src/MvcJarUriJwt/Startup.cs index c31e96eb4..5c382ee20 100644 --- a/identity-server/clients/src/MvcJarUriJwt/Startup.cs +++ b/identity-server/clients/src/MvcJarUriJwt/Startup.cs @@ -1,12 +1,12 @@ +using System; using Clients; +using Duende.AccessTokenManagement; using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using System; -using Microsoft.Extensions.Configuration; -using Duende.AccessTokenManagement; -using Microsoft.AspNetCore.Authentication.OpenIdConnect; namespace MvcJarUriJwt; diff --git a/identity-server/clients/src/WindowsConsoleSystemBrowser/Program.cs b/identity-server/clients/src/WindowsConsoleSystemBrowser/Program.cs index 848d84f11..115209a08 100644 --- a/identity-server/clients/src/WindowsConsoleSystemBrowser/Program.cs +++ b/identity-server/clients/src/WindowsConsoleSystemBrowser/Program.cs @@ -1,8 +1,3 @@ -using Clients; -using Duende.IdentityModel.Client; -using Duende.IdentityModel.OidcClient; -using Microsoft.IdentityModel.Logging; -using Serilog; using System; using System.Diagnostics; using System.Linq; @@ -10,6 +5,11 @@ using System.Net; using System.Runtime.InteropServices; using System.Runtime.Versioning; using System.Threading.Tasks; +using Clients; +using Duende.IdentityModel.Client; +using Duende.IdentityModel.OidcClient; +using Microsoft.IdentityModel.Logging; +using Serilog; namespace WindowsConsoleSystemBrowser { diff --git a/identity-server/hosts/AspNetIdentity/Pages/Account/Logout/Index.cshtml.cs b/identity-server/hosts/AspNetIdentity/Pages/Account/Logout/Index.cshtml.cs index 995b26f6b..44c64d408 100644 --- a/identity-server/hosts/AspNetIdentity/Pages/Account/Logout/Index.cshtml.cs +++ b/identity-server/hosts/AspNetIdentity/Pages/Account/Logout/Index.cshtml.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using IdentityServerHost.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; diff --git a/identity-server/hosts/AspNetIdentity/Pages/Consent/Index.cshtml.cs b/identity-server/hosts/AspNetIdentity/Pages/Consent/Index.cshtml.cs index 203d4e7dc..f6d541cdb 100644 --- a/identity-server/hosts/AspNetIdentity/Pages/Consent/Index.cshtml.cs +++ b/identity-server/hosts/AspNetIdentity/Pages/Consent/Index.cshtml.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/Index.cshtml.cs b/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/Index.cshtml.cs index 3b1d10b1b..3f22bf23a 100644 --- a/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/Index.cshtml.cs +++ b/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/Index.cshtml.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/ViewModel.cs b/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/ViewModel.cs index 1ec4f20eb..f15aa6a5b 100644 --- a/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/ViewModel.cs +++ b/identity-server/hosts/AspNetIdentity/Pages/Diagnostics/ViewModel.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/AspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs b/identity-server/hosts/AspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs index 0a5fde7a9..a1344288f 100644 --- a/identity-server/hosts/AspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs +++ b/identity-server/hosts/AspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using IdentityServerHost.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; diff --git a/identity-server/hosts/AspNetIdentity/Pages/Index.cshtml.cs b/identity-server/hosts/AspNetIdentity/Pages/Index.cshtml.cs index 4a6fabd88..d6cc24c26 100644 --- a/identity-server/hosts/AspNetIdentity/Pages/Index.cshtml.cs +++ b/identity-server/hosts/AspNetIdentity/Pages/Index.cshtml.cs @@ -1,8 +1,8 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityServer; using System.Reflection; +using Duende.IdentityServer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/hosts/AspNetIdentity/Program.cs b/identity-server/hosts/AspNetIdentity/Program.cs index 2a36cdaea..f8e092ca6 100644 --- a/identity-server/hosts/AspNetIdentity/Program.cs +++ b/identity-server/hosts/AspNetIdentity/Program.cs @@ -1,13 +1,13 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Globalization; +using System.Text; using Duende.IdentityServer.Licensing; using IdentityServerHost; using Serilog; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; -using System.Globalization; -using System.Text; Console.Title = "IdentityServer (AspNetIdentity)"; diff --git a/identity-server/hosts/Configuration/CustomClientRegistrationProcessor.cs b/identity-server/hosts/Configuration/CustomClientRegistrationProcessor.cs index a75e2ae70..404c694e1 100644 --- a/identity-server/hosts/Configuration/CustomClientRegistrationProcessor.cs +++ b/identity-server/hosts/Configuration/CustomClientRegistrationProcessor.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Configuration.RequestProcessing; using Duende.IdentityServer.Configuration.Configuration; -using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; using Duende.IdentityServer.Configuration.Models; +using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; +using Duende.IdentityServer.Configuration.RequestProcessing; +using Duende.IdentityServer.Models; namespace IdentityServerHost; diff --git a/identity-server/hosts/Configuration/IdentityServerExtensions.cs b/identity-server/hosts/Configuration/IdentityServerExtensions.cs index cc6e3c7d4..5efd5a802 100644 --- a/identity-server/hosts/Configuration/IdentityServerExtensions.cs +++ b/identity-server/hosts/Configuration/IdentityServerExtensions.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Configuration.RequestProcessing; -using Duende.IdentityModel; using IdentityServerHost.Configuration; using IdentityServerHost.Extensions; diff --git a/identity-server/hosts/Configuration/Pages/Account/Logout/Index.cshtml.cs b/identity-server/hosts/Configuration/Pages/Account/Logout/Index.cshtml.cs index 61cb4e6c4..76ac0dd6c 100644 --- a/identity-server/hosts/Configuration/Pages/Account/Logout/Index.cshtml.cs +++ b/identity-server/hosts/Configuration/Pages/Account/Logout/Index.cshtml.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/hosts/Configuration/Pages/Consent/Index.cshtml.cs b/identity-server/hosts/Configuration/Pages/Consent/Index.cshtml.cs index 203d4e7dc..f6d541cdb 100644 --- a/identity-server/hosts/Configuration/Pages/Consent/Index.cshtml.cs +++ b/identity-server/hosts/Configuration/Pages/Consent/Index.cshtml.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/hosts/Configuration/Pages/Diagnostics/Index.cshtml.cs b/identity-server/hosts/Configuration/Pages/Diagnostics/Index.cshtml.cs index 3b1d10b1b..3f22bf23a 100644 --- a/identity-server/hosts/Configuration/Pages/Diagnostics/Index.cshtml.cs +++ b/identity-server/hosts/Configuration/Pages/Diagnostics/Index.cshtml.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/Configuration/Pages/Diagnostics/ViewModel.cs b/identity-server/hosts/Configuration/Pages/Diagnostics/ViewModel.cs index 1ec4f20eb..f15aa6a5b 100644 --- a/identity-server/hosts/Configuration/Pages/Diagnostics/ViewModel.cs +++ b/identity-server/hosts/Configuration/Pages/Diagnostics/ViewModel.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/Configuration/Pages/ExternalLogin/Callback.cshtml.cs b/identity-server/hosts/Configuration/Pages/ExternalLogin/Callback.cshtml.cs index 9536cb45c..c49835781 100644 --- a/identity-server/hosts/Configuration/Pages/ExternalLogin/Callback.cshtml.cs +++ b/identity-server/hosts/Configuration/Pages/ExternalLogin/Callback.cshtml.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/hosts/Configuration/Pages/TestUsers.cs b/identity-server/hosts/Configuration/Pages/TestUsers.cs index 4fc69922b..b46f6b324 100644 --- a/identity-server/hosts/Configuration/Pages/TestUsers.cs +++ b/identity-server/hosts/Configuration/Pages/TestUsers.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Test; diff --git a/identity-server/hosts/Configuration/Program.cs b/identity-server/hosts/Configuration/Program.cs index 027dad49a..ad4a3b856 100644 --- a/identity-server/hosts/Configuration/Program.cs +++ b/identity-server/hosts/Configuration/Program.cs @@ -1,13 +1,13 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Globalization; +using System.Text; using Duende.IdentityServer.Licensing; using IdentityServerHost; using Serilog; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; -using System.Globalization; -using System.Text; Console.Title = "IdentityServer (Configuration)"; diff --git a/identity-server/hosts/EntityFramework/IdentityServerExtensions.cs b/identity-server/hosts/EntityFramework/IdentityServerExtensions.cs index cb439eb3c..76e508645 100644 --- a/identity-server/hosts/EntityFramework/IdentityServerExtensions.cs +++ b/identity-server/hosts/EntityFramework/IdentityServerExtensions.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Configuration.EntityFramework; -using Duende.IdentityModel; using IdentityServerHost.Extensions; using Microsoft.EntityFrameworkCore; diff --git a/identity-server/hosts/EntityFramework/Pages/Account/Logout/Index.cshtml.cs b/identity-server/hosts/EntityFramework/Pages/Account/Logout/Index.cshtml.cs index 61cb4e6c4..76ac0dd6c 100644 --- a/identity-server/hosts/EntityFramework/Pages/Account/Logout/Index.cshtml.cs +++ b/identity-server/hosts/EntityFramework/Pages/Account/Logout/Index.cshtml.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/hosts/EntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs b/identity-server/hosts/EntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs index 0879ec99e..d76ef884d 100644 --- a/identity-server/hosts/EntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs +++ b/identity-server/hosts/EntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.ComponentModel.DataAnnotations; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Mappers; using Microsoft.EntityFrameworkCore; -using System.ComponentModel.DataAnnotations; namespace IdentityServerHost.Pages.Admin.ApiScopes; diff --git a/identity-server/hosts/EntityFramework/Pages/Admin/Clients/ClientRepository.cs b/identity-server/hosts/EntityFramework/Pages/Admin/Clients/ClientRepository.cs index 80b075314..5ca7c7e65 100644 --- a/identity-server/hosts/EntityFramework/Pages/Admin/Clients/ClientRepository.cs +++ b/identity-server/hosts/EntityFramework/Pages/Admin/Clients/ClientRepository.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.ComponentModel.DataAnnotations; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Mappers; using Duende.IdentityServer.Models; using Microsoft.EntityFrameworkCore; -using System.ComponentModel.DataAnnotations; namespace IdentityServerHost.Pages.Admin.Clients; diff --git a/identity-server/hosts/EntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs b/identity-server/hosts/EntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs index 334656f34..b2aa1ef8a 100644 --- a/identity-server/hosts/EntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs +++ b/identity-server/hosts/EntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.ComponentModel.DataAnnotations; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Mappers; using Microsoft.EntityFrameworkCore; -using System.ComponentModel.DataAnnotations; namespace IdentityServerHost.Pages.Admin.IdentityScopes; diff --git a/identity-server/hosts/EntityFramework/Pages/Consent/Index.cshtml.cs b/identity-server/hosts/EntityFramework/Pages/Consent/Index.cshtml.cs index 203d4e7dc..f6d541cdb 100644 --- a/identity-server/hosts/EntityFramework/Pages/Consent/Index.cshtml.cs +++ b/identity-server/hosts/EntityFramework/Pages/Consent/Index.cshtml.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/hosts/EntityFramework/Pages/Diagnostics/Index.cshtml.cs b/identity-server/hosts/EntityFramework/Pages/Diagnostics/Index.cshtml.cs index 3b1d10b1b..3f22bf23a 100644 --- a/identity-server/hosts/EntityFramework/Pages/Diagnostics/Index.cshtml.cs +++ b/identity-server/hosts/EntityFramework/Pages/Diagnostics/Index.cshtml.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/EntityFramework/Pages/Diagnostics/ViewModel.cs b/identity-server/hosts/EntityFramework/Pages/Diagnostics/ViewModel.cs index 1ec4f20eb..f15aa6a5b 100644 --- a/identity-server/hosts/EntityFramework/Pages/Diagnostics/ViewModel.cs +++ b/identity-server/hosts/EntityFramework/Pages/Diagnostics/ViewModel.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/EntityFramework/Pages/ExternalLogin/Callback.cshtml.cs b/identity-server/hosts/EntityFramework/Pages/ExternalLogin/Callback.cshtml.cs index 9536cb45c..c49835781 100644 --- a/identity-server/hosts/EntityFramework/Pages/ExternalLogin/Callback.cshtml.cs +++ b/identity-server/hosts/EntityFramework/Pages/ExternalLogin/Callback.cshtml.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/hosts/EntityFramework/Pages/TestUsers.cs b/identity-server/hosts/EntityFramework/Pages/TestUsers.cs index 4fc69922b..b46f6b324 100644 --- a/identity-server/hosts/EntityFramework/Pages/TestUsers.cs +++ b/identity-server/hosts/EntityFramework/Pages/TestUsers.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Test; diff --git a/identity-server/hosts/EntityFramework/Program.cs b/identity-server/hosts/EntityFramework/Program.cs index e4fb0ec33..e392dff27 100644 --- a/identity-server/hosts/EntityFramework/Program.cs +++ b/identity-server/hosts/EntityFramework/Program.cs @@ -1,13 +1,13 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Globalization; +using System.Text; using Duende.IdentityServer.Licensing; using IdentityServerHost; using Serilog; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; -using System.Globalization; -using System.Text; Console.Title = "IdentityServer (EntityFramework)"; diff --git a/identity-server/hosts/main/IdentityServerExtensions.cs b/identity-server/hosts/main/IdentityServerExtensions.cs index 6411f1f21..4bf783854 100644 --- a/identity-server/hosts/main/IdentityServerExtensions.cs +++ b/identity-server/hosts/main/IdentityServerExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using System.Security.Cryptography.X509Certificates; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; -using Duende.IdentityModel; using IdentityServerHost.Configuration; using IdentityServerHost.Extensions; using Microsoft.IdentityModel.Tokens; diff --git a/identity-server/hosts/main/Pages/Account/Logout/Index.cshtml.cs b/identity-server/hosts/main/Pages/Account/Logout/Index.cshtml.cs index 61cb4e6c4..76ac0dd6c 100644 --- a/identity-server/hosts/main/Pages/Account/Logout/Index.cshtml.cs +++ b/identity-server/hosts/main/Pages/Account/Logout/Index.cshtml.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/hosts/main/Pages/Consent/Index.cshtml.cs b/identity-server/hosts/main/Pages/Consent/Index.cshtml.cs index 203d4e7dc..f6d541cdb 100644 --- a/identity-server/hosts/main/Pages/Consent/Index.cshtml.cs +++ b/identity-server/hosts/main/Pages/Consent/Index.cshtml.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/hosts/main/Pages/Diagnostics/Index.cshtml.cs b/identity-server/hosts/main/Pages/Diagnostics/Index.cshtml.cs index 3b1d10b1b..3f22bf23a 100644 --- a/identity-server/hosts/main/Pages/Diagnostics/Index.cshtml.cs +++ b/identity-server/hosts/main/Pages/Diagnostics/Index.cshtml.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/main/Pages/Diagnostics/ViewModel.cs b/identity-server/hosts/main/Pages/Diagnostics/ViewModel.cs index 1ec4f20eb..f15aa6a5b 100644 --- a/identity-server/hosts/main/Pages/Diagnostics/ViewModel.cs +++ b/identity-server/hosts/main/Pages/Diagnostics/ViewModel.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/hosts/main/Pages/ExternalLogin/Callback.cshtml.cs b/identity-server/hosts/main/Pages/ExternalLogin/Callback.cshtml.cs index 9635416d1..d8722e91c 100644 --- a/identity-server/hosts/main/Pages/ExternalLogin/Callback.cshtml.cs +++ b/identity-server/hosts/main/Pages/ExternalLogin/Callback.cshtml.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/hosts/main/Pages/Index.cshtml.cs b/identity-server/hosts/main/Pages/Index.cshtml.cs index 4a6fabd88..d6cc24c26 100644 --- a/identity-server/hosts/main/Pages/Index.cshtml.cs +++ b/identity-server/hosts/main/Pages/Index.cshtml.cs @@ -1,8 +1,8 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityServer; using System.Reflection; +using Duende.IdentityServer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/hosts/main/Pages/TestUsers.cs b/identity-server/hosts/main/Pages/TestUsers.cs index 4fc69922b..b46f6b324 100644 --- a/identity-server/hosts/main/Pages/TestUsers.cs +++ b/identity-server/hosts/main/Pages/TestUsers.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Test; diff --git a/identity-server/hosts/main/Program.cs b/identity-server/hosts/main/Program.cs index 4645ee5ae..3528ffb4d 100644 --- a/identity-server/hosts/main/Program.cs +++ b/identity-server/hosts/main/Program.cs @@ -1,13 +1,13 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.Globalization; +using System.Text; using Duende.IdentityServer.Licensing; using IdentityServerHost; using Serilog; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; -using System.Globalization; -using System.Text; Console.Title = "IdentityServer (Main)"; diff --git a/identity-server/migrations/AspNetIdentityDb/SeedData.cs b/identity-server/migrations/AspNetIdentityDb/SeedData.cs index dff6c5bed..05e661f8c 100644 --- a/identity-server/migrations/AspNetIdentityDb/SeedData.cs +++ b/identity-server/migrations/AspNetIdentityDb/SeedData.cs @@ -2,12 +2,12 @@ using System; using System.Linq; using System.Security.Claims; -using IdentityServerHost.Data; using Duende.IdentityModel; +using IdentityServerHost.Data; +using IdentityServerHost.Models; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -using IdentityServerHost.Models; namespace IdentityServerHost; diff --git a/identity-server/migrations/AspNetIdentityDb/Startup.cs b/identity-server/migrations/AspNetIdentityDb/Startup.cs index cd182d169..ac1bb1a68 100644 --- a/identity-server/migrations/AspNetIdentityDb/Startup.cs +++ b/identity-server/migrations/AspNetIdentityDb/Startup.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Configuration; -using Microsoft.EntityFrameworkCore; using IdentityServerHost.Data; -using Microsoft.AspNetCore.Identity; using IdentityServerHost.Models; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Identity; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; namespace SqlServer; diff --git a/identity-server/migrations/IdentityServerDb/Startup.cs b/identity-server/migrations/IdentityServerDb/Startup.cs index 84b22e7d7..c42254102 100644 --- a/identity-server/migrations/IdentityServerDb/Startup.cs +++ b/identity-server/migrations/IdentityServerDb/Startup.cs @@ -5,8 +5,8 @@ using Duende.IdentityServer.EntityFramework.Storage; using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; namespace SqlServer; diff --git a/identity-server/perf/IdentityServer.PerfTests/Infrastructure/IdentityServerContainer.cs b/identity-server/perf/IdentityServer.PerfTests/Infrastructure/IdentityServerContainer.cs index 8cd102468..1a05595ab 100644 --- a/identity-server/perf/IdentityServer.PerfTests/Infrastructure/IdentityServerContainer.cs +++ b/identity-server/perf/IdentityServer.PerfTests/Infrastructure/IdentityServerContainer.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.Net.Http; +using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Hosting; -using System.Threading.Tasks; +using Microsoft.Extensions.Logging; namespace IdentityServer.PerfTest.Infrastructure { diff --git a/identity-server/perf/IdentityServer.PerfTests/Infrastructure/TestBase.cs b/identity-server/perf/IdentityServer.PerfTests/Infrastructure/TestBase.cs index b3eca9c61..92c83a149 100644 --- a/identity-server/perf/IdentityServer.PerfTests/Infrastructure/TestBase.cs +++ b/identity-server/perf/IdentityServer.PerfTests/Infrastructure/TestBase.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using BenchmarkDotNet.Attributes; using System.IO; using System.Security.Cryptography.X509Certificates; +using BenchmarkDotNet.Attributes; namespace IdentityServer.PerfTest.Infrastructure { diff --git a/identity-server/perf/IdentityServer.PerfTests/Services/DefaultTokenServiceTest.cs b/identity-server/perf/IdentityServer.PerfTests/Services/DefaultTokenServiceTest.cs index 7a20c8014..b6dfb26d0 100644 --- a/identity-server/perf/IdentityServer.PerfTests/Services/DefaultTokenServiceTest.cs +++ b/identity-server/perf/IdentityServer.PerfTests/Services/DefaultTokenServiceTest.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; +using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; using IdentityServer.PerfTest.Infrastructure; -using System.Security.Claims; -using System.Threading.Tasks; namespace IdentityServer.PerfTests.Services { diff --git a/identity-server/src/AspNetIdentity/IdentityServerBuilderExtensions.cs b/identity-server/src/AspNetIdentity/IdentityServerBuilderExtensions.cs index 9264eb8e6..d70295b48 100644 --- a/identity-server/src/AspNetIdentity/IdentityServerBuilderExtensions.cs +++ b/identity-server/src/AspNetIdentity/IdentityServerBuilderExtensions.cs @@ -4,13 +4,13 @@ #nullable enable -using Duende.IdentityServer; using Duende.IdentityModel; +using Duende.IdentityServer; using Duende.IdentityServer.AspNetIdentity; +using Duende.IdentityServer.Configuration; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; -using Duende.IdentityServer.Configuration; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/AspNetIdentity/ProfileService.cs b/identity-server/src/AspNetIdentity/ProfileService.cs index 783f277ff..a0ce9d895 100644 --- a/identity-server/src/AspNetIdentity/ProfileService.cs +++ b/identity-server/src/AspNetIdentity/ProfileService.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Identity; -using Microsoft.Extensions.Logging; using System.Security.Claims; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.AspNetIdentity; diff --git a/identity-server/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs b/identity-server/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs index 8146cc7db..b87a1289b 100644 --- a/identity-server/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs +++ b/identity-server/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Identity; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; +using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Logging; using static Duende.IdentityModel.OidcConstants; namespace Duende.IdentityServer.AspNetIdentity; diff --git a/identity-server/src/AspNetIdentity/UserClaimsFactory.cs b/identity-server/src/AspNetIdentity/UserClaimsFactory.cs index dd5fd1a62..05a8929c1 100644 --- a/identity-server/src/AspNetIdentity/UserClaimsFactory.cs +++ b/identity-server/src/AspNetIdentity/UserClaimsFactory.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Identity; using System.Security.Claims; using Duende.IdentityModel; +using Microsoft.AspNetCore.Identity; namespace Duende.IdentityServer.AspNetIdentity; diff --git a/identity-server/src/Configuration/Extensions/ConfigurationEndpointExtensions.cs b/identity-server/src/Configuration/Extensions/ConfigurationEndpointExtensions.cs index 275fac788..ab816de0f 100644 --- a/identity-server/src/Configuration/Extensions/ConfigurationEndpointExtensions.cs +++ b/identity-server/src/Configuration/Extensions/ConfigurationEndpointExtensions.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Configuration.Configuration; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Duende.IdentityServer.Configuration.Configuration; namespace Duende.IdentityServer.Configuration; diff --git a/identity-server/src/Configuration/Licensing/LicenseValidator.cs b/identity-server/src/Configuration/Licensing/LicenseValidator.cs index 3a0fa4a54..7216900d5 100644 --- a/identity-server/src/Configuration/Licensing/LicenseValidator.cs +++ b/identity-server/src/Configuration/Licensing/LicenseValidator.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; using System.Security.Claims; using System.Security.Cryptography; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.JsonWebTokens; +using Microsoft.IdentityModel.Tokens; namespace Duende; diff --git a/identity-server/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationResponse.cs b/identity-server/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationResponse.cs index 81fc07420..d3f6744bb 100644 --- a/identity-server/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationResponse.cs +++ b/identity-server/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationResponse.cs @@ -3,8 +3,8 @@ using System.Text.Json.Serialization; -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; diff --git a/identity-server/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs b/identity-server/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs index 53f1d41b1..fa0efd23a 100644 --- a/identity-server/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs +++ b/identity-server/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Configuration.Configuration; using Duende.IdentityServer.Configuration.Models; using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; using Duende.IdentityServer.Models; -using Duende.IdentityModel; namespace Duende.IdentityServer.Configuration.RequestProcessing; diff --git a/identity-server/src/Configuration/Validation/DynamicClientRegistration/DynamicClientRegistrationValidator.cs b/identity-server/src/Configuration/Validation/DynamicClientRegistration/DynamicClientRegistrationValidator.cs index 95a1348d4..270ebc96f 100644 --- a/identity-server/src/Configuration/Validation/DynamicClientRegistration/DynamicClientRegistrationValidator.cs +++ b/identity-server/src/Configuration/Validation/DynamicClientRegistration/DynamicClientRegistrationValidator.cs @@ -4,10 +4,10 @@ using System.Text.Json; using System.Text.Json.Serialization; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration.Models; using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; using Duende.IdentityServer.Models; -using Duende.IdentityModel; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Configuration.Validation.DynamicClientRegistration; diff --git a/identity-server/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs b/identity-server/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs index 920ee4645..41b751269 100644 --- a/identity-server/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs +++ b/identity-server/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs @@ -6,11 +6,11 @@ using Duende.IdentityModel; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Interfaces; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Stores.Serialization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Services; namespace Duende.IdentityServer.EntityFramework.Stores; diff --git a/identity-server/src/EntityFramework.Storage/Stores/PersistedGrantStore.cs b/identity-server/src/EntityFramework.Storage/Stores/PersistedGrantStore.cs index 007bc448d..3d353b5f3 100644 --- a/identity-server/src/EntityFramework.Storage/Stores/PersistedGrantStore.cs +++ b/identity-server/src/EntityFramework.Storage/Stores/PersistedGrantStore.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; -using Microsoft.EntityFrameworkCore; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Interfaces; using Duende.IdentityServer.EntityFramework.Mappers; using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Stores; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.EntityFramework.Stores; diff --git a/identity-server/src/EntityFramework.Storage/Stores/PushedAuthorizationRequestStore.cs b/identity-server/src/EntityFramework.Storage/Stores/PushedAuthorizationRequestStore.cs index 7dda064ed..856d95b9a 100644 --- a/identity-server/src/EntityFramework.Storage/Stores/PushedAuthorizationRequestStore.cs +++ b/identity-server/src/EntityFramework.Storage/Stores/PushedAuthorizationRequestStore.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; -using Microsoft.EntityFrameworkCore; using Duende.IdentityServer.EntityFramework.Interfaces; using Duende.IdentityServer.EntityFramework.Mappers; -using Duende.IdentityServer.Stores; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.EntityFramework.Stores; diff --git a/identity-server/src/EntityFramework/TokenCleanupHost.cs b/identity-server/src/EntityFramework/TokenCleanupHost.cs index fa9395184..01b2c88b7 100644 --- a/identity-server/src/EntityFramework/TokenCleanupHost.cs +++ b/identity-server/src/EntityFramework/TokenCleanupHost.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Hosting; using Duende.IdentityServer.EntityFramework; using Duende.IdentityServer.EntityFramework.Options; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/Configuration/CryptoHelper.cs b/identity-server/src/IdentityServer/Configuration/CryptoHelper.cs index a58d2fc46..e2dbc9628 100644 --- a/identity-server/src/IdentityServer/Configuration/CryptoHelper.cs +++ b/identity-server/src/IdentityServer/Configuration/CryptoHelper.cs @@ -4,11 +4,11 @@ #nullable enable -using Duende.IdentityModel; -using Microsoft.IdentityModel.Tokens; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; +using Duende.IdentityModel; +using Microsoft.IdentityModel.Tokens; namespace Duende.IdentityServer.Configuration; diff --git a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs index f877add4b..8a9194c64 100644 --- a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs +++ b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs @@ -4,15 +4,15 @@ #nullable enable +using Duende.IdentityServer; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Hosting.DynamicProviders; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; using Microsoft.Extensions.DependencyInjection.Extensions; -using Duende.IdentityServer; -using Duende.IdentityServer.Configuration; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Hosting.DynamicProviders; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs index a7bb678ea..effab0c89 100644 --- a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs +++ b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs @@ -8,32 +8,32 @@ using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Configuration.DependencyInjection; using Duende.IdentityServer.Endpoints; +using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; +using Duende.IdentityServer.Hosting.DynamicProviders; +using Duende.IdentityServer.Hosting.FederatedSignOut; +using Duende.IdentityServer.Internal; +using Duende.IdentityServer.Licensing; +using Duende.IdentityServer.Licensing.V2; +using Duende.IdentityServer.Models; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Services.Default; +using Duende.IdentityServer.Services.KeyManagement; using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Stores.Empty; using Duende.IdentityServer.Stores.Serialization; using Duende.IdentityServer.Validation; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Cors.Infrastructure; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Options; -using Duende.IdentityServer.Models; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Authentication; -using static Duende.IdentityServer.IdentityServerConstants; -using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Hosting.FederatedSignOut; -using Duende.IdentityServer.Services.Default; -using Duende.IdentityServer.Services.KeyManagement; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Hosting.DynamicProviders; -using Duende.IdentityServer.Internal; -using Duende.IdentityServer.Stores.Empty; -using Duende.IdentityServer.Endpoints.Results; -using Duende.IdentityServer.Licensing; -using Duende.IdentityServer.Licensing.V2; +using Microsoft.Extensions.Options; +using static Duende.IdentityServer.IdentityServerConstants; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs index a33159cde..b44a26a1e 100644 --- a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs +++ b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs @@ -4,12 +4,12 @@ #nullable enable +using System.Security.Cryptography.X509Certificates; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Microsoft.IdentityModel.Tokens; -using System.Security.Cryptography.X509Certificates; using JsonWebKey = Microsoft.IdentityModel.Tokens.JsonWebKey; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs index fde05dc65..7298d0b73 100644 --- a/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs +++ b/identity-server/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs @@ -8,8 +8,8 @@ using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Microsoft.Extensions.Caching.Memory; -using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection.Extensions; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs b/identity-server/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs index e9464a0ca..1aaefaafb 100644 --- a/identity-server/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs +++ b/identity-server/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs @@ -4,20 +4,20 @@ #nullable enable +using System.Reflection; +using System.Runtime.InteropServices; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Hosting.DynamicProviders; +using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Stores; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using System.Reflection; -using System.Runtime.InteropServices; -using Duende.IdentityServer.Licensing.V2; namespace Microsoft.AspNetCore.Builder; diff --git a/identity-server/src/IdentityServer/Endpoints/AuthorizeCallbackEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/AuthorizeCallbackEndpoint.cs index 77ba261ea..4180b499c 100644 --- a/identity-server/src/IdentityServer/Endpoints/AuthorizeCallbackEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/AuthorizeCallbackEndpoint.cs @@ -5,12 +5,12 @@ using System.Net; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpoint.cs index e75e4b709..7805bb32e 100644 --- a/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpoint.cs @@ -6,14 +6,14 @@ using System.Collections.Specialized; using System.Net; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Stores; namespace Duende.IdentityServer.Endpoints; diff --git a/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs b/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs index abda27bcc..a17653908 100644 --- a/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs +++ b/identity-server/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs @@ -4,6 +4,7 @@ using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Events; @@ -15,7 +16,6 @@ using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Endpoints/BackchannelAuthenticationEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/BackchannelAuthenticationEndpoint.cs index 2776fc0a9..0804d64aa 100644 --- a/identity-server/src/IdentityServer/Endpoints/BackchannelAuthenticationEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/BackchannelAuthenticationEndpoint.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Events; -using Duende.IdentityModel; namespace Duende.IdentityServer.Endpoints; diff --git a/identity-server/src/IdentityServer/Endpoints/CheckSessionEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/CheckSessionEndpoint.cs index 9e24c42be..3543ff6b7 100644 --- a/identity-server/src/IdentityServer/Endpoints/CheckSessionEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/CheckSessionEndpoint.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; using System.Net; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Endpoints; diff --git a/identity-server/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs index 8f3e4c903..30f2600f6 100644 --- a/identity-server/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Endpoints/EndSessionCallbackEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/EndSessionCallbackEndpoint.cs index 83611e442..e71306c5f 100644 --- a/identity-server/src/IdentityServer/Endpoints/EndSessionCallbackEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/EndSessionCallbackEndpoint.cs @@ -4,9 +4,9 @@ using System.Net; using Duende.IdentityServer.Endpoints.Results; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Endpoints/EndSessionEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/EndSessionEndpoint.cs index a27d32737..83afbe612 100644 --- a/identity-server/src/IdentityServer/Endpoints/EndSessionEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/EndSessionEndpoint.cs @@ -5,10 +5,10 @@ using System.Collections.Specialized; using System.Net; using Duende.IdentityServer.Endpoints.Results; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs index 4a055b676..00b10d963 100644 --- a/identity-server/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Http; using System.Net; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; +using Duende.IdentityServer.Models; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Models; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Endpoints; diff --git a/identity-server/src/IdentityServer/Endpoints/PushedAuthorizationEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/PushedAuthorizationEndpoint.cs index 2ec57c06c..42db37a35 100644 --- a/identity-server/src/IdentityServer/Endpoints/PushedAuthorizationEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/PushedAuthorizationEndpoint.cs @@ -2,19 +2,19 @@ // See LICENSE in the project root for license information. +using System.Collections.Specialized; +using System.Net; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; +using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Logging.Models; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using System.Collections.Specialized; -using System.Net; -using Duende.IdentityServer.Licensing.V2; namespace Duende.IdentityServer.Endpoints; internal class PushedAuthorizationEndpoint : IEndpointHandler diff --git a/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeInteractionPageResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeInteractionPageResult.cs index fc9c0ac22..6734f5fef 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeInteractionPageResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeInteractionPageResult.cs @@ -2,15 +2,15 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Services; using static Duende.IdentityServer.IdentityServerConstants; -using Duende.IdentityModel; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs index f614c53d0..fcc513167 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs @@ -2,16 +2,16 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Duende.IdentityModel; -using Microsoft.AspNetCore.Http; using System.Text.Encodings.Web; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Models; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/BackchannelAuthenticationResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/BackchannelAuthenticationResult.cs index bc69d33bd..73bd06c0b 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/BackchannelAuthenticationResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/BackchannelAuthenticationResult.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; using System.Text.Json.Serialization; +using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; -using Duende.IdentityModel; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/BadRequestResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/BadRequestResult.cs index 092cdad6f..ff3287527 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/BadRequestResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/BadRequestResult.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs index 4fe8cfa12..16f3d9d8b 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs @@ -3,9 +3,9 @@ using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/DeviceAuthorizationResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/DeviceAuthorizationResult.cs index 945db6449..22ef566b6 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/DeviceAuthorizationResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/DeviceAuthorizationResult.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; -using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/DiscoveryDocumentResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/DiscoveryDocumentResult.cs index aabb1c58c..1c5028875 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/DiscoveryDocumentResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/DiscoveryDocumentResult.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; using Duende.IdentityServer.Hosting; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/EndPointResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/EndPointResult.cs index 685130f9a..33d5ffdb7 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/EndPointResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/EndPointResult.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -using Duende.IdentityServer.Hosting; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs index 4e4f5a373..dcf6539a6 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Http; using System.Net; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; -using System.Text.Encodings.Web; using System.Text; +using System.Text.Encodings.Web; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; +using Duende.IdentityServer.Validation; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/EndSessionResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/EndSessionResult.cs index 729adb4a1..be4a15491 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/EndSessionResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/EndSessionResult.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Services; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/IntrospectionResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/IntrospectionResult.cs index cacbbd3a8..6df5ee45d 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/IntrospectionResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/IntrospectionResult.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Hosting; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/JsonWebKeysResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/JsonWebKeysResult.cs index 454fe7bf9..27e6c839b 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/JsonWebKeysResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/JsonWebKeysResult.cs @@ -3,9 +3,9 @@ using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Models; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/ProtectedResourceErrorResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/ProtectedResourceErrorResult.cs index 9c0316f7a..7ddd5297b 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/ProtectedResourceErrorResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/ProtectedResourceErrorResult.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Hosting; -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Primitives; -using Microsoft.AspNetCore.Http; -using Microsoft.Net.Http.Headers; using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Primitives; +using Microsoft.Net.Http.Headers; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationErrorResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationErrorResult.cs index 2a1e18d84..2407e2b8e 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationErrorResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationErrorResult.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using System.Net; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Microsoft.AspNetCore.Http; -using System.Net; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationResult.cs index 1ecbcdc7f..db8be123b 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/PushedAuthorizationResult.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using System.Net; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Microsoft.AspNetCore.Http; -using System.Net; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/TokenErrorResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/TokenErrorResult.cs index f1fe3dd5c..0f0af5db8 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/TokenErrorResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/TokenErrorResult.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Extensions; using System.Text.Json.Serialization; +using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; -using Duende.IdentityModel; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/TokenResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/TokenResult.cs index 2504325fa..64ee4a1bf 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/TokenResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/TokenResult.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. +using System.Text.Json.Serialization; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; -using System.Text.Json.Serialization; -using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Hosting; +using Duende.IdentityServer.ResponseHandling; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/TokenRevocationErrorResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/TokenRevocationErrorResult.cs index 13ec00e09..7cdc0be2d 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/TokenRevocationErrorResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/TokenRevocationErrorResult.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; using System.Net; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/Results/UserInfoResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/UserInfoResult.cs index 3f385e23e..156640469 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/UserInfoResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/UserInfoResult.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Hosting; using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Endpoints.Results; diff --git a/identity-server/src/IdentityServer/Endpoints/TokenEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/TokenEndpoint.cs index e4a701c50..61f8a7fca 100644 --- a/identity-server/src/IdentityServer/Endpoints/TokenEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/TokenEndpoint.cs @@ -3,16 +3,16 @@ using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Configuration; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Endpoints; diff --git a/identity-server/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs index 4f884a326..e1edf26d9 100644 --- a/identity-server/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.Extensions.Logging; using System.Net; +using Duende.IdentityModel; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Extensions; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Endpoints; diff --git a/identity-server/src/IdentityServer/Endpoints/UserInfoEndpoint.cs b/identity-server/src/IdentityServer/Endpoints/UserInfoEndpoint.cs index 6eb1f8a8e..89c2be2e1 100644 --- a/identity-server/src/IdentityServer/Endpoints/UserInfoEndpoint.cs +++ b/identity-server/src/IdentityServer/Endpoints/UserInfoEndpoint.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; -using Duende.IdentityModel; -using Microsoft.AspNetCore.Http; using System.Net; +using Duende.IdentityModel; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Validation; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Endpoints; diff --git a/identity-server/src/IdentityServer/Events/BackchannelAuthenticationFailureEvent.cs b/identity-server/src/IdentityServer/Events/BackchannelAuthenticationFailureEvent.cs index 001f0f5d5..e09bfd918 100644 --- a/identity-server/src/IdentityServer/Events/BackchannelAuthenticationFailureEvent.cs +++ b/identity-server/src/IdentityServer/Events/BackchannelAuthenticationFailureEvent.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Events; diff --git a/identity-server/src/IdentityServer/Events/DeviceAuthorizationFailureEvent.cs b/identity-server/src/IdentityServer/Events/DeviceAuthorizationFailureEvent.cs index b6fd488ab..32505622b 100644 --- a/identity-server/src/IdentityServer/Events/DeviceAuthorizationFailureEvent.cs +++ b/identity-server/src/IdentityServer/Events/DeviceAuthorizationFailureEvent.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Events; diff --git a/identity-server/src/IdentityServer/Events/DeviceAuthorizationSuccessEvent.cs b/identity-server/src/IdentityServer/Events/DeviceAuthorizationSuccessEvent.cs index b4eda6076..431897d7f 100644 --- a/identity-server/src/IdentityServer/Events/DeviceAuthorizationSuccessEvent.cs +++ b/identity-server/src/IdentityServer/Events/DeviceAuthorizationSuccessEvent.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Events; diff --git a/identity-server/src/IdentityServer/Events/TokenIssuedFailureEvent.cs b/identity-server/src/IdentityServer/Events/TokenIssuedFailureEvent.cs index ed90aec06..c28b11c90 100644 --- a/identity-server/src/IdentityServer/Events/TokenIssuedFailureEvent.cs +++ b/identity-server/src/IdentityServer/Events/TokenIssuedFailureEvent.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Events; diff --git a/identity-server/src/IdentityServer/Events/TokenRevokedSuccessEvent.cs b/identity-server/src/IdentityServer/Events/TokenRevokedSuccessEvent.cs index 4369c071d..11b2820ab 100644 --- a/identity-server/src/IdentityServer/Events/TokenRevokedSuccessEvent.cs +++ b/identity-server/src/IdentityServer/Events/TokenRevokedSuccessEvent.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Events; diff --git a/identity-server/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs b/identity-server/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs index c5f20c2ce..4401f44cf 100644 --- a/identity-server/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using System.Text; using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; -using System.Text; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/IdentityServer/Extensions/AuthenticationTicketExtensions.cs b/identity-server/src/IdentityServer/Extensions/AuthenticationTicketExtensions.cs index df8d47bab..01ba123a0 100644 --- a/identity-server/src/IdentityServer/Extensions/AuthenticationTicketExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/AuthenticationTicketExtensions.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. +using System.Text.Json; +using System.Text.Json.Serialization; +using Duende.IdentityModel; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores.Serialization; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; -using System.Text.Json; -using System.Text.Json.Serialization; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/IdentityServer/Extensions/AuthorizeResponseExtensions.cs b/identity-server/src/IdentityServer/Extensions/AuthorizeResponseExtensions.cs index cba84188a..0931c9ada 100644 --- a/identity-server/src/IdentityServer/Extensions/AuthorizeResponseExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/AuthorizeResponseExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; using System.Collections.Specialized; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.ResponseHandling; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Extensions/ClaimsExtensions.cs b/identity-server/src/IdentityServer/Extensions/ClaimsExtensions.cs index dfb03f356..e6c4a34d5 100644 --- a/identity-server/src/IdentityServer/Extensions/ClaimsExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/ClaimsExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/IdentityServer/Extensions/ClientExtensions.cs b/identity-server/src/IdentityServer/Extensions/ClientExtensions.cs index f0711fd03..5871234a2 100644 --- a/identity-server/src/IdentityServer/Extensions/ClientExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/ClientExtensions.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Microsoft.IdentityModel.Tokens; using System.Security.Cryptography.X509Certificates; +using Microsoft.IdentityModel.Tokens; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Extensions/HashExtensions.cs b/identity-server/src/IdentityServer/Extensions/HashExtensions.cs index 89a7d31d9..fc26fdb0f 100644 --- a/identity-server/src/IdentityServer/Extensions/HashExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/HashExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; using System.Security.Cryptography; using System.Text; +using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Extensions/HttpContextExtensions.cs b/identity-server/src/IdentityServer/Extensions/HttpContextExtensions.cs index 590cae915..a6f871721 100644 --- a/identity-server/src/IdentityServer/Extensions/HttpContextExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/HttpContextExtensions.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; using static Duende.IdentityServer.IdentityServerConstants; #pragma warning disable 1591 diff --git a/identity-server/src/IdentityServer/Extensions/HttpResponseExtensions.cs b/identity-server/src/IdentityServer/Extensions/HttpResponseExtensions.cs index e14358449..6008b040f 100644 --- a/identity-server/src/IdentityServer/Extensions/HttpResponseExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/HttpResponseExtensions.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; -using Microsoft.AspNetCore.Http; using System.Text; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Models; +using Microsoft.AspNetCore.Http; #pragma warning disable 1591 diff --git a/identity-server/src/IdentityServer/Extensions/IReadableStringCollectionExtensions.cs b/identity-server/src/IdentityServer/Extensions/IReadableStringCollectionExtensions.cs index 7ec100006..9d33488e7 100644 --- a/identity-server/src/IdentityServer/Extensions/IReadableStringCollectionExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/IReadableStringCollectionExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Primitives; using System.Collections.Specialized; using System.Diagnostics; +using Microsoft.Extensions.Primitives; #pragma warning disable 1591 diff --git a/identity-server/src/IdentityServer/Extensions/PrincipalExtensions.cs b/identity-server/src/IdentityServer/Extensions/PrincipalExtensions.cs index 047bf1f58..5f5f7170d 100644 --- a/identity-server/src/IdentityServer/Extensions/PrincipalExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/PrincipalExtensions.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Diagnostics; using System.Security.Claims; using System.Security.Principal; +using Duende.IdentityModel; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs b/identity-server/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs index 25cf42217..4e6b32f6d 100644 --- a/identity-server/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityServer.Extensions; using Microsoft.Extensions.Logging; -using System.Security.Claims; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Extensions/ResourceExtensions.cs b/identity-server/src/IdentityServer/Extensions/ResourceExtensions.cs index 36587440e..c1ffe65f8 100644 --- a/identity-server/src/IdentityServer/Extensions/ResourceExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/ResourceExtensions.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Extensions/ServerSideSessionExtensions.cs b/identity-server/src/IdentityServer/Extensions/ServerSideSessionExtensions.cs index 2fd0a95bc..93ffadf91 100644 --- a/identity-server/src/IdentityServer/Extensions/ServerSideSessionExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/ServerSideSessionExtensions.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using System.Diagnostics; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/IdentityServer/Extensions/StringsExtensions.cs b/identity-server/src/IdentityServer/Extensions/StringsExtensions.cs index 7e8ae6bb9..e265477d5 100644 --- a/identity-server/src/IdentityServer/Extensions/StringsExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/StringsExtensions.cs @@ -3,11 +3,11 @@ #nullable enable -using Microsoft.AspNetCore.WebUtilities; using System.Collections.Specialized; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Text.Encodings.Web; +using Microsoft.AspNetCore.WebUtilities; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/IdentityServer/Extensions/TokenExtensions.cs b/identity-server/src/IdentityServer/Extensions/TokenExtensions.cs index f6f635e9e..b28954800 100644 --- a/identity-server/src/IdentityServer/Extensions/TokenExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/TokenExtensions.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Models; -using Microsoft.Extensions.Logging; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/IdentityServer/Extensions/ValidatedAuthorizeRequestExtensions.cs b/identity-server/src/IdentityServer/Extensions/ValidatedAuthorizeRequestExtensions.cs index e3eab4694..579825087 100644 --- a/identity-server/src/IdentityServer/Extensions/ValidatedAuthorizeRequestExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/ValidatedAuthorizeRequestExtensions.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using System.Security.Cryptography; -using System.Text; using System.Collections.Specialized; using System.Globalization; +using System.Security.Cryptography; +using System.Text; +using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; #pragma warning disable 1591 diff --git a/identity-server/src/IdentityServer/Hosting/BaseUrlMiddleware.cs b/identity-server/src/IdentityServer/Hosting/BaseUrlMiddleware.cs index 54b533b55..d6752eda0 100644 --- a/identity-server/src/IdentityServer/Hosting/BaseUrlMiddleware.cs +++ b/identity-server/src/IdentityServer/Hosting/BaseUrlMiddleware.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Services; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -using Duende.IdentityServer.Services; #pragma warning disable 1591 diff --git a/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs b/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs index 5bb18e568..2e20fea9f 100644 --- a/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs +++ b/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using System.Collections.Concurrent; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Hosting.DynamicProviders; // this is designed as a per-request cache is to ensure that a scheme loaded from the cache is still available later in the diff --git a/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeProvider.cs b/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeProvider.cs index 55e55c56f..cda36f9f2 100644 --- a/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeProvider.cs +++ b/identity-server/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeProvider.cs @@ -4,12 +4,12 @@ using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Configuration.DependencyInjection; +using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Licensing.V2; namespace Duende.IdentityServer.Hosting.DynamicProviders; diff --git a/identity-server/src/IdentityServer/Hosting/DynamicProviders/Oidc/OidcConfigureOptions.cs b/identity-server/src/IdentityServer/Hosting/DynamicProviders/Oidc/OidcConfigureOptions.cs index 906689ab8..4394d66b7 100644 --- a/identity-server/src/IdentityServer/Hosting/DynamicProviders/Oidc/OidcConfigureOptions.cs +++ b/identity-server/src/IdentityServer/Hosting/DynamicProviders/Oidc/OidcConfigureOptions.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Hosting/EndpointRouter.cs b/identity-server/src/IdentityServer/Hosting/EndpointRouter.cs index 87b7359cf..f4eb1b898 100644 --- a/identity-server/src/IdentityServer/Hosting/EndpointRouter.cs +++ b/identity-server/src/IdentityServer/Hosting/EndpointRouter.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Licensing.V2; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Licensing.V2; namespace Duende.IdentityServer.Hosting; diff --git a/identity-server/src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs b/identity-server/src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs index eead5b58e..513b65bca 100644 --- a/identity-server/src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs +++ b/identity-server/src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs @@ -5,8 +5,8 @@ using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Hosting.FederatedSignOut; diff --git a/identity-server/src/IdentityServer/Hosting/IdentityServerAuthenticationService.cs b/identity-server/src/IdentityServer/Hosting/IdentityServerAuthenticationService.cs index b3b2088eb..72d3c1071 100644 --- a/identity-server/src/IdentityServer/Hosting/IdentityServerAuthenticationService.cs +++ b/identity-server/src/IdentityServer/Hosting/IdentityServerAuthenticationService.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Http; using System.Security.Claims; -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Extensions; using Duende.IdentityModel; using Duende.IdentityServer.Configuration.DependencyInjection; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Hosting; diff --git a/identity-server/src/IdentityServer/Hosting/IdentityServerMiddleware.cs b/identity-server/src/IdentityServer/Hosting/IdentityServerMiddleware.cs index 7ab581100..69986139c 100644 --- a/identity-server/src/IdentityServer/Hosting/IdentityServerMiddleware.cs +++ b/identity-server/src/IdentityServer/Hosting/IdentityServerMiddleware.cs @@ -2,15 +2,15 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Events; -using Duende.IdentityServer.Services; -using Duende.IdentityServer.Models; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Licensing.V2; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Hosting; diff --git a/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs b/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs index 5c41904c6..e4c7272ab 100644 --- a/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs +++ b/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs @@ -4,8 +4,8 @@ #nullable enable -using Microsoft.AspNetCore.Http; using System.Security.Claims; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Hosting.LocalApiAuthentication; diff --git a/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs b/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs index 30f14fda8..c9b462134 100644 --- a/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs +++ b/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs @@ -4,10 +4,10 @@ #nullable enable +using System.Security.Claims; using Duende.IdentityServer; using Duende.IdentityServer.Hosting.LocalApiAuthentication; using Microsoft.AspNetCore.Authentication; -using System.Security.Claims; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs b/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs index eb33e52e0..cee265fc2 100644 --- a/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs +++ b/identity-server/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs @@ -2,16 +2,16 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; +using System.Text; +using System.Text.Encodings.Web; using Duende.IdentityModel; +using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using System.Security.Claims; -using System.Text.Encodings.Web; -using Duende.IdentityServer.Validation; using Microsoft.Net.Http.Headers; -using System.Text; -using Duende.IdentityServer.Stores; using static Duende.IdentityModel.OidcConstants; namespace Duende.IdentityServer.Hosting.LocalApiAuthentication; diff --git a/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs b/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs index 19726d6d2..0cf77bcd0 100644 --- a/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs +++ b/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/IdentityServerTools.cs b/identity-server/src/IdentityServer/IdentityServerTools.cs index efc2d6371..0177bcff5 100644 --- a/identity-server/src/IdentityServer/IdentityServerTools.cs +++ b/identity-server/src/IdentityServer/IdentityServerTools.cs @@ -4,13 +4,13 @@ #nullable enable +using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Http; -using System.Security.Claims; namespace Duende.IdentityServer; diff --git a/identity-server/src/IdentityServer/IdentityServerUser.cs b/identity-server/src/IdentityServer/IdentityServerUser.cs index 76d7f1106..9201faa1a 100644 --- a/identity-server/src/IdentityServer/IdentityServerUser.cs +++ b/identity-server/src/IdentityServer/IdentityServerUser.cs @@ -4,9 +4,9 @@ #nullable enable +using System.Security.Claims; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using System.Security.Claims; namespace Duende.IdentityServer; diff --git a/identity-server/src/IdentityServer/Infrastructure/MessageCookie.cs b/identity-server/src/IdentityServer/Infrastructure/MessageCookie.cs index 756fd88dd..0d27154f3 100644 --- a/identity-server/src/IdentityServer/Infrastructure/MessageCookie.cs +++ b/identity-server/src/IdentityServer/Infrastructure/MessageCookie.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. +using System.Security.Cryptography; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using System.Security.Cryptography; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Services; namespace Duende.IdentityServer; diff --git a/identity-server/src/IdentityServer/Licensing/LicenseValidator.cs b/identity-server/src/IdentityServer/Licensing/LicenseValidator.cs index a89d3abc8..50d309292 100644 --- a/identity-server/src/IdentityServer/Licensing/LicenseValidator.cs +++ b/identity-server/src/IdentityServer/Licensing/LicenseValidator.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; using System.Security.Claims; using System.Security.Cryptography; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.JsonWebTokens; +using Microsoft.IdentityModel.Tokens; namespace Duende; diff --git a/identity-server/src/IdentityServer/Logging/Models/AuthorizeRequestValidationLog.cs b/identity-server/src/IdentityServer/Logging/Models/AuthorizeRequestValidationLog.cs index 999370be9..db6e0636f 100644 --- a/identity-server/src/IdentityServer/Logging/Models/AuthorizeRequestValidationLog.cs +++ b/identity-server/src/IdentityServer/Logging/Models/AuthorizeRequestValidationLog.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Logging.Models; diff --git a/identity-server/src/IdentityServer/Logging/Models/AuthorizeResponseLog.cs b/identity-server/src/IdentityServer/Logging/Models/AuthorizeResponseLog.cs index bc21ed2d8..368dbd311 100644 --- a/identity-server/src/IdentityServer/Logging/Models/AuthorizeResponseLog.cs +++ b/identity-server/src/IdentityServer/Logging/Models/AuthorizeResponseLog.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.ResponseHandling; namespace Duende.IdentityServer.Logging.Models; diff --git a/identity-server/src/IdentityServer/Logging/Models/BackchannelAuthenticationRequestValidationLog.cs b/identity-server/src/IdentityServer/Logging/Models/BackchannelAuthenticationRequestValidationLog.cs index f83b21af5..c55512641 100644 --- a/identity-server/src/IdentityServer/Logging/Models/BackchannelAuthenticationRequestValidationLog.cs +++ b/identity-server/src/IdentityServer/Logging/Models/BackchannelAuthenticationRequestValidationLog.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Logging.Models; diff --git a/identity-server/src/IdentityServer/Logging/Models/DeviceAuthorizationRequestValidationLog.cs b/identity-server/src/IdentityServer/Logging/Models/DeviceAuthorizationRequestValidationLog.cs index 945d1dbb7..64c5e3369 100644 --- a/identity-server/src/IdentityServer/Logging/Models/DeviceAuthorizationRequestValidationLog.cs +++ b/identity-server/src/IdentityServer/Logging/Models/DeviceAuthorizationRequestValidationLog.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Logging; diff --git a/identity-server/src/IdentityServer/Logging/Models/EndSessionRequestValidationLog.cs b/identity-server/src/IdentityServer/Logging/Models/EndSessionRequestValidationLog.cs index 687a52417..79c8ee51a 100644 --- a/identity-server/src/IdentityServer/Logging/Models/EndSessionRequestValidationLog.cs +++ b/identity-server/src/IdentityServer/Logging/Models/EndSessionRequestValidationLog.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Logging.Models; diff --git a/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs b/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs index 0de95dff5..b554bb43a 100644 --- a/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs +++ b/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Extensions; using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Logging.Models; diff --git a/identity-server/src/IdentityServer/Models/BackchannelUserLoginRequest.cs b/identity-server/src/IdentityServer/Models/BackchannelUserLoginRequest.cs index 56803946d..86b7b54a0 100644 --- a/identity-server/src/IdentityServer/Models/BackchannelUserLoginRequest.cs +++ b/identity-server/src/IdentityServer/Models/BackchannelUserLoginRequest.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Validation; using System.Security.Claims; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Models/Contexts/IsActiveContext.cs b/identity-server/src/IdentityServer/Models/Contexts/IsActiveContext.cs index d1197e35f..07d4faf30 100644 --- a/identity-server/src/IdentityServer/Models/Contexts/IsActiveContext.cs +++ b/identity-server/src/IdentityServer/Models/Contexts/IsActiveContext.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Extensions; using System.Security.Claims; +using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Models/Messages/ConsentRequest.cs b/identity-server/src/IdentityServer/Models/Messages/ConsentRequest.cs index 54b5239a1..cf625c66e 100644 --- a/identity-server/src/IdentityServer/Models/Messages/ConsentRequest.cs +++ b/identity-server/src/IdentityServer/Models/Messages/ConsentRequest.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; using System.Collections.Specialized; using System.Security.Cryptography; using System.Text; +using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/Models/Messages/LogoutRequest.cs b/identity-server/src/IdentityServer/Models/Messages/LogoutRequest.cs index 0119d234f..617de9ee5 100644 --- a/identity-server/src/IdentityServer/Models/Messages/LogoutRequest.cs +++ b/identity-server/src/IdentityServer/Models/Messages/LogoutRequest.cs @@ -4,9 +4,9 @@ #nullable enable +using System.Collections.Specialized; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using System.Collections.Specialized; using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs index 00723dddd..5b1924bd7 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs @@ -3,12 +3,12 @@ using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Configuration; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs index b863385a2..23d7adcf6 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs @@ -3,13 +3,13 @@ using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Stores; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/BackchannelAuthenticationResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/BackchannelAuthenticationResponseGenerator.cs index 5ddb2de7d..74433be19 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/BackchannelAuthenticationResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/BackchannelAuthenticationResponseGenerator.cs @@ -3,11 +3,11 @@ using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Models; -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Stores; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs index 1ba85748f..79dc44367 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs @@ -3,10 +3,10 @@ using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Services; -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Validation; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/DiscoveryResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/DiscoveryResponseGenerator.cs index 13882d06d..97549e21b 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/DiscoveryResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/DiscoveryResponseGenerator.cs @@ -2,15 +2,15 @@ // See LICENSE in the project root for license information. +using System.Security.Cryptography; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Tokens; -using System.Security.Cryptography; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Services; -using Duende.IdentityServer.Validation; using static Duende.IdentityServer.IdentityServerConstants; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs index b44359b80..9a91068f6 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs @@ -3,11 +3,11 @@ using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs index e7fa2187a..e75548702 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs @@ -4,11 +4,11 @@ using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Stores; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs index 4fe8b9d2b..5bafd4684 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs b/identity-server/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs index c7bf81f47..35eb901f8 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Stores; -using Microsoft.Extensions.Logging; -using System.Security.Claims; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.ResponseHandling; diff --git a/identity-server/src/IdentityServer/ResponseHandling/Models/AuthorizeResponse.cs b/identity-server/src/IdentityServer/ResponseHandling/Models/AuthorizeResponse.cs index b33c7b69b..b56cda656 100644 --- a/identity-server/src/IdentityServer/ResponseHandling/Models/AuthorizeResponse.cs +++ b/identity-server/src/IdentityServer/ResponseHandling/Models/AuthorizeResponse.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Validation; #pragma warning disable 1591 diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs index 80cf323bd..d3e81e034 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs @@ -3,8 +3,8 @@ using System.Security.Claims; -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultBackchannelAuthenticationInteractionService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultBackchannelAuthenticationInteractionService.cs index 4e8c178b9..1c53774d4 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultBackchannelAuthenticationInteractionService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultBackchannelAuthenticationInteractionService.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.Extensions.Logging; -using System.Security.Claims; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultCache.cs b/identity-server/src/IdentityServer/Services/Default/DefaultCache.cs index 1a9a7d86c..37a899bd3 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultCache.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultCache.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Internal; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Internal; -using Duende.IdentityServer.Configuration; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultClaimsService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultClaimsService.cs index 575c7c793..9ce1fa24b 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultClaimsService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultClaimsService.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; -using System.Security.Claims; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultConsentService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultConsentService.cs index e228e2806..497b48b9e 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultConsentService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultConsentService.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; -using System.Security.Claims; using Duende.IdentityServer.Validation; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultDeviceFlowInteractionService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultDeviceFlowInteractionService.cs index a010e3f94..f13e76d4b 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultDeviceFlowInteractionService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultDeviceFlowInteractionService.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.Models; -using Duende.IdentityServer.Validation; using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Validation; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultEventService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultEventService.cs index 348a03153..87ec00513 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultEventService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultEventService.cs @@ -3,9 +3,9 @@ using System.Diagnostics; -using Microsoft.AspNetCore.Http; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Services; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Events; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultEventSink.cs b/identity-server/src/IdentityServer/Services/Default/DefaultEventSink.cs index e1baa8a8b..1b969661e 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultEventSink.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultEventSink.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Events; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultIdentityServerInteractionService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultIdentityServerInteractionService.cs index d9baf6963..2bbb7e7ec 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultIdentityServerInteractionService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultIdentityServerInteractionService.cs @@ -3,10 +3,10 @@ using Duende.IdentityServer.Extensions; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultJwtRequestUriHttpClient.cs b/identity-server/src/IdentityServer/Services/Default/DefaultJwtRequestUriHttpClient.cs index b689aa6d2..37adaf180 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultJwtRequestUriHttpClient.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultJwtRequestUriHttpClient.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Configuration; -using Duende.IdentityModel; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs index ce9336be6..f3b584472 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Microsoft.IdentityModel.Tokens; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Stores; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Services.KeyManagement; +using Duende.IdentityServer.Stores; +using Microsoft.IdentityModel.Tokens; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultPersistedGrantService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultPersistedGrantService.cs index 2665f6c3d..aaf2294f3 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultPersistedGrantService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultPersistedGrantService.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Stores.Serialization; -using Duende.IdentityServer.Models; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs index 5714812d2..47b295b27 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Stores; -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Validation; using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Stores; using Duende.IdentityServer.Stores.Serialization; +using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs index 30b340bf5..a57c7fe6c 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs @@ -2,12 +2,11 @@ // See LICENSE in the project root for license information. +using System.Text.Json; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; -using System.Text.Json; -using Duende.IdentityServer.Configuration; - using Microsoft.IdentityModel.JsonWebTokens; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultTokenService.cs b/identity-server/src/IdentityServer/Services/Default/DefaultTokenService.cs index 94458dd4c..5368e4ea0 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultTokenService.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultTokenService.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Microsoft.Extensions.Logging; -using System.Security.Claims; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/DefaultUserSession.cs b/identity-server/src/IdentityServer/Services/Default/DefaultUserSession.cs index 5c00763b2..420e3e7c6 100644 --- a/identity-server/src/IdentityServer/Services/Default/DefaultUserSession.cs +++ b/identity-server/src/IdentityServer/Services/Default/DefaultUserSession.cs @@ -3,12 +3,12 @@ using System.Security.Claims; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Authentication; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs b/identity-server/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs index 497442e36..c42bb0d80 100644 --- a/identity-server/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs +++ b/identity-server/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. +using System.Text; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Microsoft.Extensions.Logging; -using System.Text; namespace Duende.IdentityServer.Services.KeyManagement; diff --git a/identity-server/src/IdentityServer/Services/Default/KeyManagement/KeyManager.cs b/identity-server/src/IdentityServer/Services/Default/KeyManagement/KeyManager.cs index 70841ace2..e4b9f50f0 100644 --- a/identity-server/src/IdentityServer/Services/Default/KeyManagement/KeyManager.cs +++ b/identity-server/src/IdentityServer/Services/Default/KeyManagement/KeyManager.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Stores; +using System.Security.Cryptography; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Internal; -using System.Security.Cryptography; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Stores; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Services.KeyManagement; diff --git a/identity-server/src/IdentityServer/Services/Default/LogoutNotificationService.cs b/identity-server/src/IdentityServer/Services/Default/LogoutNotificationService.cs index ca4e787f7..b8ada6268 100644 --- a/identity-server/src/IdentityServer/Services/Default/LogoutNotificationService.cs +++ b/identity-server/src/IdentityServer/Services/Default/LogoutNotificationService.cs @@ -4,9 +4,9 @@ using Duende.IdentityModel; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/OidcReturnUrlParser.cs b/identity-server/src/IdentityServer/Services/Default/OidcReturnUrlParser.cs index 7dad6cf4e..8ed6c5511 100644 --- a/identity-server/src/IdentityServer/Services/Default/OidcReturnUrlParser.cs +++ b/identity-server/src/IdentityServer/Services/Default/OidcReturnUrlParser.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using System.Collections.Specialized; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Configuration; +using Microsoft.Extensions.Logging; using static Duende.IdentityServer.IdentityServerConstants; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/PushedAuthorizationService.cs b/identity-server/src/IdentityServer/Services/Default/PushedAuthorizationService.cs index 9c4bdb8b9..cc7ac6b42 100644 --- a/identity-server/src/IdentityServer/Services/Default/PushedAuthorizationService.cs +++ b/identity-server/src/IdentityServer/Services/Default/PushedAuthorizationService.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Stores; using Duende.IdentityModel; +using Duende.IdentityServer.Stores; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/Default/ServerSideSessionRefreshTokenService.cs b/identity-server/src/IdentityServer/Services/Default/ServerSideSessionRefreshTokenService.cs index 84f476da5..09f3c8f81 100644 --- a/identity-server/src/IdentityServer/Services/Default/ServerSideSessionRefreshTokenService.cs +++ b/identity-server/src/IdentityServer/Services/Default/ServerSideSessionRefreshTokenService.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; +using Duende.IdentityServer.Configuration.DependencyInjection; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Configuration.DependencyInjection; -using Duende.IdentityModel; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/IBackchannelAuthenticationInteractionService.cs b/identity-server/src/IdentityServer/Services/IBackchannelAuthenticationInteractionService.cs index 0544b68dd..be1e9b188 100644 --- a/identity-server/src/IdentityServer/Services/IBackchannelAuthenticationInteractionService.cs +++ b/identity-server/src/IdentityServer/Services/IBackchannelAuthenticationInteractionService.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Security.Claims; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/IConsentService.cs b/identity-server/src/IdentityServer/Services/IConsentService.cs index c1074dab2..b01057fe2 100644 --- a/identity-server/src/IdentityServer/Services/IConsentService.cs +++ b/identity-server/src/IdentityServer/Services/IConsentService.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Security.Claims; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/IKeyMaterialService.cs b/identity-server/src/IdentityServer/Services/IKeyMaterialService.cs index cb762e5f9..198aa9b38 100644 --- a/identity-server/src/IdentityServer/Services/IKeyMaterialService.cs +++ b/identity-server/src/IdentityServer/Services/IKeyMaterialService.cs @@ -4,8 +4,8 @@ #nullable enable -using Microsoft.IdentityModel.Tokens; using Duende.IdentityServer.Models; +using Microsoft.IdentityModel.Tokens; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Services/IUserSession.cs b/identity-server/src/IdentityServer/Services/IUserSession.cs index fe41212ee..e6a16a018 100644 --- a/identity-server/src/IdentityServer/Services/IUserSession.cs +++ b/identity-server/src/IdentityServer/Services/IUserSession.cs @@ -4,8 +4,8 @@ #nullable enable -using Microsoft.AspNetCore.Authentication; using System.Security.Claims; +using Microsoft.AspNetCore.Authentication; namespace Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Stores/Caching/CachingClientStore.cs b/identity-server/src/IdentityServer/Stores/Caching/CachingClientStore.cs index fa2ce78d5..bb31db7f8 100644 --- a/identity-server/src/IdentityServer/Stores/Caching/CachingClientStore.cs +++ b/identity-server/src/IdentityServer/Stores/Caching/CachingClientStore.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/Caching/CachingResourceStore.cs b/identity-server/src/IdentityServer/Stores/Caching/CachingResourceStore.cs index 7dd6c5661..1b56b1375 100644 --- a/identity-server/src/IdentityServer/Stores/Caching/CachingResourceStore.cs +++ b/identity-server/src/IdentityServer/Stores/Caching/CachingResourceStore.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Services; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs b/identity-server/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs index bf298f456..86121f95f 100644 --- a/identity-server/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Services; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores.Serialization; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/Default/DefaultBackChannelAuthenticationRequestStore.cs b/identity-server/src/IdentityServer/Stores/Default/DefaultBackChannelAuthenticationRequestStore.cs index cd05ddead..5820260a9 100644 --- a/identity-server/src/IdentityServer/Stores/Default/DefaultBackChannelAuthenticationRequestStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/DefaultBackChannelAuthenticationRequestStore.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Services; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores.Serialization; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/Default/DefaultGrantStore.cs b/identity-server/src/IdentityServer/Stores/Default/DefaultGrantStore.cs index 24b8cb091..71345b386 100644 --- a/identity-server/src/IdentityServer/Stores/Default/DefaultGrantStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/DefaultGrantStore.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. +using System.Security.Cryptography; +using System.Text; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores.Serialization; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Services; -using System.Text; -using System.Security.Cryptography; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/Default/DefaultReferenceTokenStore.cs b/identity-server/src/IdentityServer/Stores/Default/DefaultReferenceTokenStore.cs index 1d7043b2d..83f0620da 100644 --- a/identity-server/src/IdentityServer/Stores/Default/DefaultReferenceTokenStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/DefaultReferenceTokenStore.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Services; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores.Serialization; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs b/identity-server/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs index 9fe913a7c..404a9a0a3 100644 --- a/identity-server/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Services; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores.Serialization; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs b/identity-server/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs index 95ba7ba1c..d076d17ee 100644 --- a/identity-server/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Services; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores.Serialization; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs b/identity-server/src/IdentityServer/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs index 20d8ea6db..bc362c4cd 100644 --- a/identity-server/src/IdentityServer/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.Extensions.Caching.Distributed; namespace Duende.IdentityServer.Stores.Default; diff --git a/identity-server/src/IdentityServer/Stores/Default/ProtectedDataMessageStore.cs b/identity-server/src/IdentityServer/Stores/Default/ProtectedDataMessageStore.cs index 14ea024fd..512833e73 100644 --- a/identity-server/src/IdentityServer/Stores/Default/ProtectedDataMessageStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/ProtectedDataMessageStore.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Microsoft.AspNetCore.DataProtection; -using Duende.IdentityModel; using System.Text; +using Duende.IdentityModel; using Duende.IdentityServer.Models; +using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs b/identity-server/src/IdentityServer/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs index 903f6b6f0..f46652adc 100644 --- a/identity-server/src/IdentityServer/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/Default/ServerSideTicketStore.cs b/identity-server/src/IdentityServer/Stores/Default/ServerSideTicketStore.cs index 6ac07c887..dd04e6fe8 100644 --- a/identity-server/src/IdentityServer/Stores/Default/ServerSideTicketStore.cs +++ b/identity-server/src/IdentityServer/Stores/Default/ServerSideTicketStore.cs @@ -2,15 +2,15 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; -using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPersistedGrantStore.cs b/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPersistedGrantStore.cs index 0026213a8..e5acc092e 100644 --- a/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPersistedGrantStore.cs +++ b/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPersistedGrantStore.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using System.Collections.Concurrent; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; -using System.Collections.Concurrent; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPushedAuthorizationRequestStore.cs b/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPushedAuthorizationRequestStore.cs index 55271dee3..20129a42a 100644 --- a/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPushedAuthorizationRequestStore.cs +++ b/identity-server/src/IdentityServer/Stores/InMemory/InMemoryPushedAuthorizationRequestStore.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Collections.Concurrent; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/InMemory/InMemoryServerSideSessionStore.cs b/identity-server/src/IdentityServer/Stores/InMemory/InMemoryServerSideSessionStore.cs index 189ec73f8..37577b3ea 100644 --- a/identity-server/src/IdentityServer/Stores/InMemory/InMemoryServerSideSessionStore.cs +++ b/identity-server/src/IdentityServer/Stores/InMemory/InMemoryServerSideSessionStore.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using System.Collections.Concurrent; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; -using System.Collections.Concurrent; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Stores/ValidatingClientStore.cs b/identity-server/src/IdentityServer/Stores/ValidatingClientStore.cs index 86fc446a9..c5c8667d5 100644 --- a/identity-server/src/IdentityServer/Stores/ValidatingClientStore.cs +++ b/identity-server/src/IdentityServer/Stores/ValidatingClientStore.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Stores; diff --git a/identity-server/src/IdentityServer/Test/TestBackchannelLoginUserValidator.cs b/identity-server/src/IdentityServer/Test/TestBackchannelLoginUserValidator.cs index f7538b739..c843960e9 100644 --- a/identity-server/src/IdentityServer/Test/TestBackchannelLoginUserValidator.cs +++ b/identity-server/src/IdentityServer/Test/TestBackchannelLoginUserValidator.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Test; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; -using System.Security.Claims; namespace Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/src/IdentityServer/Test/TestUser.cs b/identity-server/src/IdentityServer/Test/TestUser.cs index 17bbcc960..acf4ad268 100644 --- a/identity-server/src/IdentityServer/Test/TestUser.cs +++ b/identity-server/src/IdentityServer/Test/TestUser.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; +using Duende.IdentityModel; namespace Duende.IdentityServer.Test; diff --git a/identity-server/src/IdentityServer/Test/TestUserProfileService.cs b/identity-server/src/IdentityServer/Test/TestUserProfileService.cs index 79147964c..118fcc75e 100644 --- a/identity-server/src/IdentityServer/Test/TestUserProfileService.cs +++ b/identity-server/src/IdentityServer/Test/TestUserProfileService.cs @@ -3,9 +3,9 @@ using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Test; diff --git a/identity-server/src/IdentityServer/Test/TestUserStore.cs b/identity-server/src/IdentityServer/Test/TestUserStore.cs index bf5ea26bf..e6bab3d5d 100644 --- a/identity-server/src/IdentityServer/Test/TestUserStore.cs +++ b/identity-server/src/IdentityServer/Test/TestUserStore.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; +using Duende.IdentityModel; namespace Duende.IdentityServer.Test; diff --git a/identity-server/src/IdentityServer/Validation/Contexts/DPoPProofValidatonContext.cs b/identity-server/src/IdentityServer/Validation/Contexts/DPoPProofValidatonContext.cs index deb7e9dc8..9348beda9 100644 --- a/identity-server/src/IdentityServer/Validation/Contexts/DPoPProofValidatonContext.cs +++ b/identity-server/src/IdentityServer/Validation/Contexts/DPoPProofValidatonContext.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Security.Claims; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Contexts/IntrospectionRequestValidationContext.cs b/identity-server/src/IdentityServer/Validation/Contexts/IntrospectionRequestValidationContext.cs index d7ce99976..cc6c133dc 100644 --- a/identity-server/src/IdentityServer/Validation/Contexts/IntrospectionRequestValidationContext.cs +++ b/identity-server/src/IdentityServer/Validation/Contexts/IntrospectionRequestValidationContext.cs @@ -5,8 +5,8 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Collections.Specialized; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/ApiSecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/ApiSecretValidator.cs index b173fa69c..09313a4f0 100644 --- a/identity-server/src/IdentityServer/Validation/Default/ApiSecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/ApiSecretValidator.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Events; -using Duende.IdentityServer.Services; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs index 4fbab0dfd..c82882796 100644 --- a/identity-server/src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Stores; -using Microsoft.Extensions.Logging; using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Logging.Models; +using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Microsoft.Extensions.Logging; using static Duende.IdentityServer.IdentityServerConstants; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestIdValidator.cs b/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestIdValidator.cs index 3331a9906..e24115df6 100644 --- a/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestIdValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestIdValidator.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; -using Duende.IdentityModel; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestValidator.cs index 9bfa8429b..09a9f342d 100644 --- a/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/BackchannelAuthenticationRequestValidator.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Logging.Models; using Duende.IdentityServer.Models; +using Microsoft.Extensions.Logging; using static Duende.IdentityServer.Constants; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/BasicAuthenticationSecretParser.cs b/identity-server/src/IdentityServer/Validation/Default/BasicAuthenticationSecretParser.cs index 50dc389f3..554681531 100644 --- a/identity-server/src/IdentityServer/Validation/Default/BasicAuthenticationSecretParser.cs +++ b/identity-server/src/IdentityServer/Validation/Default/BasicAuthenticationSecretParser.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using System.Text; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/ClientSecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/ClientSecretValidator.cs index d87480606..09ee2d185 100644 --- a/identity-server/src/IdentityServer/Validation/Default/ClientSecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/ClientSecretValidator.cs @@ -3,11 +3,11 @@ using Duende.IdentityServer.Events; -using Duende.IdentityServer.Services; -using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Http; -using Duende.IdentityServer.Stores; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs b/identity-server/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs index 5983c757f..34e27830c 100644 --- a/identity-server/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/DefaultCustomTokenValidator.cs b/identity-server/src/IdentityServer/Validation/Default/DefaultCustomTokenValidator.cs index d9418f5de..e26e4d5da 100644 --- a/identity-server/src/IdentityServer/Validation/Default/DefaultCustomTokenValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/DefaultCustomTokenValidator.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Services; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs b/identity-server/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs index 776d2cc14..30f77f181 100644 --- a/identity-server/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Configuration; -using Microsoft.IdentityModel.JsonWebTokens; -using Duende.IdentityServer.Extensions; -using System.Text.Json; -using Duende.IdentityModel; -using Duende.IdentityServer.Services; -using Duende.IdentityServer.Models; -using Microsoft.AspNetCore.DataProtection; using System.Security.Cryptography; using System.Text; +using System.Text.Json; +using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Microsoft.AspNetCore.DataProtection; +using Microsoft.Extensions.Logging; +using Microsoft.IdentityModel.JsonWebTokens; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs b/identity-server/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs index d58601cb8..7e34893ec 100644 --- a/identity-server/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/DefaultScopeParser.cs b/identity-server/src/IdentityServer/Validation/Default/DefaultScopeParser.cs index c4eacab3a..775ee64d5 100644 --- a/identity-server/src/IdentityServer/Validation/Default/DefaultScopeParser.cs +++ b/identity-server/src/IdentityServer/Validation/Default/DefaultScopeParser.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Extensions; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/DeviceAuthorizationRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/DeviceAuthorizationRequestValidator.cs index 4e9e3a58a..3b317b8e2 100644 --- a/identity-server/src/IdentityServer/Validation/Default/DeviceAuthorizationRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/DeviceAuthorizationRequestValidator.cs @@ -3,10 +3,10 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Logging; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Logging; using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs b/identity-server/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs index fa491b8dc..2da2a0a4d 100644 --- a/identity-server/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Services; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs index 9379bf663..6def7d922 100644 --- a/identity-server/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs @@ -2,16 +2,16 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Logging.Models; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs b/identity-server/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs index 8d2331b40..b03e222a1 100644 --- a/identity-server/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/HashedSharedSecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/HashedSharedSecretValidator.cs index 5c96113bd..18a364fee 100644 --- a/identity-server/src/IdentityServer/Validation/Default/HashedSharedSecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/HashedSharedSecretValidator.cs @@ -4,8 +4,8 @@ using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/IntrospectionRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/IntrospectionRequestValidator.cs index c39d209db..5164c935b 100644 --- a/identity-server/src/IdentityServer/Validation/Default/IntrospectionRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/IntrospectionRequestValidator.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.Extensions.Logging; -using System.Security.Claims; using static Duende.IdentityServer.Constants; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs b/identity-server/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs index 51e8a9ee6..4f1e5b14d 100644 --- a/identity-server/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs +++ b/identity-server/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs @@ -3,10 +3,10 @@ using System.IdentityModel.Tokens.Jwt; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Validation/Default/JwtRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/JwtRequestValidator.cs index f423bdb26..a7fca66a1 100644 --- a/identity-server/src/IdentityServer/Validation/Default/JwtRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/JwtRequestValidator.cs @@ -3,8 +3,8 @@ using System.Security.Claims; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; diff --git a/identity-server/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs b/identity-server/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs index 30f43ac76..ee0de8b21 100644 --- a/identity-server/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs +++ b/identity-server/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Models; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/identity-server/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs b/identity-server/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs index 76c69ce1b..cffff06aa 100644 --- a/identity-server/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/PlainTextSharedSecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/PlainTextSharedSecretValidator.cs index 6cd02705a..a23c7000d 100644 --- a/identity-server/src/IdentityServer/Validation/Default/PlainTextSharedSecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/PlainTextSharedSecretValidator.cs @@ -4,8 +4,8 @@ using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/PostBodySecretParser.cs b/identity-server/src/IdentityServer/Validation/Default/PostBodySecretParser.cs index 7882b8cb1..272803c09 100644 --- a/identity-server/src/IdentityServer/Validation/Default/PostBodySecretParser.cs +++ b/identity-server/src/IdentityServer/Validation/Default/PostBodySecretParser.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/PrivateKeyJwtSecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/PrivateKeyJwtSecretValidator.cs index 69b1dd972..2c83b1f07 100644 --- a/identity-server/src/IdentityServer/Validation/Default/PrivateKeyJwtSecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/PrivateKeyJwtSecretValidator.cs @@ -3,9 +3,9 @@ using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityServer.Extensions; using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.JsonWebTokens; using Microsoft.IdentityModel.Tokens; diff --git a/identity-server/src/IdentityServer/Validation/Default/PushedAuthorizationRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/PushedAuthorizationRequestValidator.cs index 3ca079322..633bf52ef 100644 --- a/identity-server/src/IdentityServer/Validation/Default/PushedAuthorizationRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/PushedAuthorizationRequestValidator.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Extensions; using Duende.IdentityModel; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Licensing.V2; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/RequestObjectValidator.cs b/identity-server/src/IdentityServer/Validation/Default/RequestObjectValidator.cs index db3933017..7f97ecf7c 100644 --- a/identity-server/src/IdentityServer/Validation/Default/RequestObjectValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/RequestObjectValidator.cs @@ -4,11 +4,11 @@ #nullable enable +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Logging.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/SecretParser.cs b/identity-server/src/IdentityServer/Validation/Default/SecretParser.cs index 0485e4942..87c114e5e 100644 --- a/identity-server/src/IdentityServer/Validation/Default/SecretParser.cs +++ b/identity-server/src/IdentityServer/Validation/Default/SecretParser.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/SecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/SecretValidator.cs index b61b58b76..f335ca5ba 100644 --- a/identity-server/src/IdentityServer/Validation/Default/SecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/SecretValidator.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/TokenRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/TokenRequestValidator.cs index 4fbaf3806..aa648344b 100644 --- a/identity-server/src/IdentityServer/Validation/Default/TokenRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/TokenRequestValidator.cs @@ -2,18 +2,18 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Duende.IdentityServer.Stores; -using Microsoft.Extensions.Logging; using System.Collections.Specialized; using System.Text; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Logging.Models; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Microsoft.Extensions.Logging; using static Duende.IdentityServer.IdentityServerConstants; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs index 9992c22c9..3b2b2f3d6 100644 --- a/identity-server/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using System.Collections.Specialized; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; -using System.Collections.Specialized; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/TokenValidator.cs b/identity-server/src/IdentityServer/Validation/Default/TokenValidator.cs index 8d96f3a20..b3a5b24a7 100644 --- a/identity-server/src/IdentityServer/Validation/Default/TokenValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/TokenValidator.cs @@ -2,18 +2,18 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; -using System.Security.Claims; using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Logging.Models; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Microsoft.IdentityModel.Tokens; using Duende.IdentityServer.Stores; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.JsonWebTokens; +using Microsoft.IdentityModel.Tokens; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs b/identity-server/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs index 93f0546c8..780bb7624 100644 --- a/identity-server/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.Logging; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; -using System.Security.Claims; +using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/X509NameSecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/X509NameSecretValidator.cs index b1adb742b..c6c86387a 100644 --- a/identity-server/src/IdentityServer/Validation/Default/X509NameSecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/X509NameSecretValidator.cs @@ -3,8 +3,8 @@ using System.Security.Cryptography.X509Certificates; -using Duende.IdentityServer.Models; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Default/X509ThumbprintSecretValidator.cs b/identity-server/src/IdentityServer/Validation/Default/X509ThumbprintSecretValidator.cs index 5e7dda05c..dc54037d4 100644 --- a/identity-server/src/IdentityServer/Validation/Default/X509ThumbprintSecretValidator.cs +++ b/identity-server/src/IdentityServer/Validation/Default/X509ThumbprintSecretValidator.cs @@ -3,8 +3,8 @@ using System.Security.Cryptography.X509Certificates; -using Duende.IdentityServer.Models; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; using Microsoft.Extensions.Logging; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/IRedirectUriValidator.cs b/identity-server/src/IdentityServer/Validation/IRedirectUriValidator.cs index 246741920..312445f31 100644 --- a/identity-server/src/IdentityServer/Validation/IRedirectUriValidator.cs +++ b/identity-server/src/IdentityServer/Validation/IRedirectUriValidator.cs @@ -4,9 +4,9 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/ISecretParser.cs b/identity-server/src/IdentityServer/Validation/ISecretParser.cs index e1baa62a0..8a5abedd0 100644 --- a/identity-server/src/IdentityServer/Validation/ISecretParser.cs +++ b/identity-server/src/IdentityServer/Validation/ISecretParser.cs @@ -4,8 +4,8 @@ #nullable enable -using Microsoft.AspNetCore.Http; using Duende.IdentityServer.Models; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/ISecretsListParser.cs b/identity-server/src/IdentityServer/Validation/ISecretsListParser.cs index 41d239ad0..f6adf3463 100644 --- a/identity-server/src/IdentityServer/Validation/ISecretsListParser.cs +++ b/identity-server/src/IdentityServer/Validation/ISecretsListParser.cs @@ -4,8 +4,8 @@ #nullable enable -using Microsoft.AspNetCore.Http; using Duende.IdentityServer.Models; +using Microsoft.AspNetCore.Http; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Models/BackchannelAuthenticationUserValidatorContext.cs b/identity-server/src/IdentityServer/Validation/Models/BackchannelAuthenticationUserValidatorContext.cs index 28f3af76b..04ce0e4b1 100644 --- a/identity-server/src/IdentityServer/Validation/Models/BackchannelAuthenticationUserValidatorContext.cs +++ b/identity-server/src/IdentityServer/Validation/Models/BackchannelAuthenticationUserValidatorContext.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Security.Claims; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Models/GrantValidationResult.cs b/identity-server/src/IdentityServer/Validation/Models/GrantValidationResult.cs index 8fae118da..f18443ebb 100644 --- a/identity-server/src/IdentityServer/Validation/Models/GrantValidationResult.cs +++ b/identity-server/src/IdentityServer/Validation/Models/GrantValidationResult.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using System.Security.Claims; using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Models/IntrospectionRequestValidationResult.cs b/identity-server/src/IdentityServer/Validation/Models/IntrospectionRequestValidationResult.cs index 9707522bb..51ae61685 100644 --- a/identity-server/src/IdentityServer/Validation/Models/IntrospectionRequestValidationResult.cs +++ b/identity-server/src/IdentityServer/Validation/Models/IntrospectionRequestValidationResult.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Models/TokenValidationResult.cs b/identity-server/src/IdentityServer/Validation/Models/TokenValidationResult.cs index fbb6d1da7..911295570 100644 --- a/identity-server/src/IdentityServer/Validation/Models/TokenValidationResult.cs +++ b/identity-server/src/IdentityServer/Validation/Models/TokenValidationResult.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Models; using System.Security.Claims; +using Duende.IdentityServer.Models; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs b/identity-server/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs index 5d94a22c9..75ee8ce0b 100644 --- a/identity-server/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs +++ b/identity-server/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityModel; using System.Security.Claims; +using Duende.IdentityModel; namespace Duende.IdentityServer.Validation; diff --git a/identity-server/src/Storage/Extensions/ClaimsPrincipalLiteExtensions.cs b/identity-server/src/Storage/Extensions/ClaimsPrincipalLiteExtensions.cs index d9ccf1f05..bfd364a36 100644 --- a/identity-server/src/Storage/Extensions/ClaimsPrincipalLiteExtensions.cs +++ b/identity-server/src/Storage/Extensions/ClaimsPrincipalLiteExtensions.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Stores.Serialization; -using Duende.IdentityModel; using System.Security.Claims; +using Duende.IdentityModel; +using Duende.IdentityServer.Stores.Serialization; namespace Duende.IdentityServer.Extensions; diff --git a/identity-server/src/Storage/IdentityServerUser.cs b/identity-server/src/Storage/IdentityServerUser.cs index d746cc266..9094ec541 100644 --- a/identity-server/src/Storage/IdentityServerUser.cs +++ b/identity-server/src/Storage/IdentityServerUser.cs @@ -4,9 +4,9 @@ #nullable enable +using System.Security.Claims; using Duende.IdentityModel; using Duende.IdentityServer.Extensions; -using System.Security.Claims; namespace Duende.IdentityServer; diff --git a/identity-server/src/Storage/Models/ApiResource.cs b/identity-server/src/Storage/Models/ApiResource.cs index 2e9ae461d..33af2b37d 100644 --- a/identity-server/src/Storage/Models/ApiResource.cs +++ b/identity-server/src/Storage/Models/ApiResource.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Extensions; using System.Diagnostics; +using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/Storage/Models/ApiScope.cs b/identity-server/src/Storage/Models/ApiScope.cs index 5e9ba9d7b..855d58ec3 100644 --- a/identity-server/src/Storage/Models/ApiScope.cs +++ b/identity-server/src/Storage/Models/ApiScope.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Extensions; using System.Diagnostics; +using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/Storage/Models/IdentityResource.cs b/identity-server/src/Storage/Models/IdentityResource.cs index f09e11e83..79a5d45fa 100644 --- a/identity-server/src/Storage/Models/IdentityResource.cs +++ b/identity-server/src/Storage/Models/IdentityResource.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityServer.Extensions; using System.Diagnostics; +using Duende.IdentityServer.Extensions; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/Storage/Models/RefreshToken.cs b/identity-server/src/Storage/Models/RefreshToken.cs index 385f1e024..3c84b031f 100644 --- a/identity-server/src/Storage/Models/RefreshToken.cs +++ b/identity-server/src/Storage/Models/RefreshToken.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityModel; using System.Security.Claims; +using Duende.IdentityModel; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/Storage/Models/Token.cs b/identity-server/src/Storage/Models/Token.cs index 3e5020518..02c40355b 100644 --- a/identity-server/src/Storage/Models/Token.cs +++ b/identity-server/src/Storage/Models/Token.cs @@ -4,8 +4,8 @@ #nullable enable -using Duende.IdentityModel; using System.Security.Claims; +using Duende.IdentityModel; namespace Duende.IdentityServer.Models; diff --git a/identity-server/src/Storage/Stores/Serialization/ClaimsPrincipalConverter.cs b/identity-server/src/Storage/Stores/Serialization/ClaimsPrincipalConverter.cs index 4235fd6e0..3b2c822ba 100644 --- a/identity-server/src/Storage/Stores/Serialization/ClaimsPrincipalConverter.cs +++ b/identity-server/src/Storage/Stores/Serialization/ClaimsPrincipalConverter.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Extensions; using System.Security.Claims; using System.Text.Json; using System.Text.Json.Serialization; +using Duende.IdentityServer.Extensions; #pragma warning disable 1591 diff --git a/identity-server/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs b/identity-server/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs index 6e4e97160..fdebd1b8a 100644 --- a/identity-server/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs +++ b/identity-server/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; -using Microsoft.AspNetCore.DataProtection; using System.Text.Json; using System.Text.Json.Serialization; +using Duende.IdentityServer.Models; +using Microsoft.AspNetCore.DataProtection; namespace Duende.IdentityServer.Stores.Serialization; diff --git a/identity-server/src/Telemetry/Telemetry.cs b/identity-server/src/Telemetry/Telemetry.cs index 48b4bc618..3efecca6a 100644 --- a/identity-server/src/Telemetry/Telemetry.cs +++ b/identity-server/src/Telemetry/Telemetry.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using System.Diagnostics.Metrics; +using Duende.IdentityServer.Validation; namespace Duende.IdentityServer; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Data/ApplicationDbContext.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Data/ApplicationDbContext.cs index 46de7665f..04b47a7fa 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Data/ApplicationDbContext.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Data/ApplicationDbContext.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using IdentityServerHost.Models; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -using IdentityServerHost.Models; namespace IdentityServerAspNetIdentity.Data; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Account/Logout/Index.cshtml.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Account/Logout/Index.cshtml.cs index 995b26f6b..44c64d408 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Account/Logout/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Account/Logout/Index.cshtml.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using IdentityServerHost.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Consent/Index.cshtml.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Consent/Index.cshtml.cs index 203d4e7dc..f6d541cdb 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Consent/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Consent/Index.cshtml.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/Index.cshtml.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/Index.cshtml.cs index 3b1d10b1b..3f22bf23a 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/Index.cshtml.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs index 1ec4f20eb..f15aa6a5b 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs index 0a5fde7a9..a1344288f 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using IdentityServerHost.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Index.cshtml.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Index.cshtml.cs index 4a6fabd88..d6cc24c26 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Pages/Index.cshtml.cs @@ -1,8 +1,8 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityServer; using System.Reflection; +using Duende.IdentityServer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/Program.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/Program.cs index 4b7f936a7..99734add6 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/Program.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/Program.cs @@ -1,8 +1,8 @@ -using Duende.IdentityServer.Licensing; +using System.Globalization; +using System.Text; +using Duende.IdentityServer.Licensing; using IdentityServerAspNetIdentity; using Serilog; -using System.Globalization; -using System.Text; Log.Logger = new LoggerConfiguration() .WriteTo.Console() diff --git a/identity-server/templates/src/IdentityServerEmpty/Program.cs b/identity-server/templates/src/IdentityServerEmpty/Program.cs index f8a2a4504..7225fbcfb 100644 --- a/identity-server/templates/src/IdentityServerEmpty/Program.cs +++ b/identity-server/templates/src/IdentityServerEmpty/Program.cs @@ -1,8 +1,8 @@ -using Duende.IdentityServer.Licensing; +using System.Globalization; +using System.Text; +using Duende.IdentityServer.Licensing; using IdentityServerEmpty; using Serilog; -using System.Globalization; -using System.Text; Log.Logger = new LoggerConfiguration() .WriteTo.Console() diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Account/Logout/Index.cshtml.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Account/Logout/Index.cshtml.cs index 61cb4e6c4..76ac0dd6c 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Account/Logout/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Account/Logout/Index.cshtml.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs index 0879ec99e..d76ef884d 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/ApiScopes/ApiScopeRepository.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.ComponentModel.DataAnnotations; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Mappers; using Microsoft.EntityFrameworkCore; -using System.ComponentModel.DataAnnotations; namespace IdentityServerHost.Pages.Admin.ApiScopes; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/Clients/ClientRepository.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/Clients/ClientRepository.cs index 6ebf78eec..65c278311 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/Clients/ClientRepository.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/Clients/ClientRepository.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.ComponentModel.DataAnnotations; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Mappers; using Duende.IdentityServer.Models; using Microsoft.EntityFrameworkCore; -using System.ComponentModel.DataAnnotations; namespace IdentityServerHost.Pages.Admin.Clients; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs index 334656f34..b2aa1ef8a 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Admin/IdentityScopes/IdentityScopeRepository.cs @@ -1,11 +1,11 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using System.ComponentModel.DataAnnotations; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Mappers; using Microsoft.EntityFrameworkCore; -using System.ComponentModel.DataAnnotations; namespace IdentityServerHost.Pages.Admin.IdentityScopes; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Consent/Index.cshtml.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Consent/Index.cshtml.cs index 203d4e7dc..f6d541cdb 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Consent/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Consent/Index.cshtml.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/Index.cshtml.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/Index.cshtml.cs index 3b1d10b1b..3f22bf23a 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/Index.cshtml.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/ViewModel.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/ViewModel.cs index 1ec4f20eb..f15aa6a5b 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/ViewModel.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Diagnostics/ViewModel.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/ExternalLogin/Callback.cshtml.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/ExternalLogin/Callback.cshtml.cs index 9635416d1..d8722e91c 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/ExternalLogin/Callback.cshtml.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/ExternalLogin/Callback.cshtml.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Index.cshtml.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Index.cshtml.cs index 4a6fabd88..d6cc24c26 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/Index.cshtml.cs @@ -1,8 +1,8 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityServer; using System.Reflection; +using Duende.IdentityServer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Pages/TestUsers.cs b/identity-server/templates/src/IdentityServerEntityFramework/Pages/TestUsers.cs index 4fc69922b..b46f6b324 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Pages/TestUsers.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Pages/TestUsers.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Test; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/Program.cs b/identity-server/templates/src/IdentityServerEntityFramework/Program.cs index f6005b22c..40859d99e 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/Program.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/Program.cs @@ -1,8 +1,8 @@ -using Duende.IdentityServer.Licensing; +using System.Globalization; +using System.Text; +using Duende.IdentityServer.Licensing; using IdentityServerEntityFramework; using Serilog; -using System.Globalization; -using System.Text; Log.Logger = new LoggerConfiguration() .WriteTo.Console() diff --git a/identity-server/templates/src/IdentityServerEntityFramework/SeedData.cs b/identity-server/templates/src/IdentityServerEntityFramework/SeedData.cs index 868a17afa..4c00fafbd 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/SeedData.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/SeedData.cs @@ -1,8 +1,8 @@ -using Microsoft.EntityFrameworkCore; -using Serilog; -using Duende.IdentityServer.EntityFramework.DbContexts; +using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Mappers; using Duende.IdentityServer.Models; +using Microsoft.EntityFrameworkCore; +using Serilog; namespace IdentityServerEntityFramework; diff --git a/identity-server/templates/src/IdentityServerInMem/Pages/Account/Logout/Index.cshtml.cs b/identity-server/templates/src/IdentityServerInMem/Pages/Account/Logout/Index.cshtml.cs index 61cb4e6c4..76ac0dd6c 100644 --- a/identity-server/templates/src/IdentityServerInMem/Pages/Account/Logout/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerInMem/Pages/Account/Logout/Index.cshtml.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/templates/src/IdentityServerInMem/Pages/Consent/Index.cshtml.cs b/identity-server/templates/src/IdentityServerInMem/Pages/Consent/Index.cshtml.cs index 203d4e7dc..f6d541cdb 100644 --- a/identity-server/templates/src/IdentityServerInMem/Pages/Consent/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerInMem/Pages/Consent/Index.cshtml.cs @@ -1,12 +1,12 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/Index.cshtml.cs b/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/Index.cshtml.cs index 3b1d10b1b..3f22bf23a 100644 --- a/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/Index.cshtml.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Authorization; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/ViewModel.cs b/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/ViewModel.cs index 1ec4f20eb..f15aa6a5b 100644 --- a/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/ViewModel.cs +++ b/identity-server/templates/src/IdentityServerInMem/Pages/Diagnostics/ViewModel.cs @@ -1,10 +1,10 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using Microsoft.AspNetCore.Authentication; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Microsoft.AspNetCore.Authentication; namespace IdentityServerHost.Pages.Diagnostics; diff --git a/identity-server/templates/src/IdentityServerInMem/Pages/ExternalLogin/Callback.cshtml.cs b/identity-server/templates/src/IdentityServerInMem/Pages/ExternalLogin/Callback.cshtml.cs index 9635416d1..d8722e91c 100644 --- a/identity-server/templates/src/IdentityServerInMem/Pages/ExternalLogin/Callback.cshtml.cs +++ b/identity-server/templates/src/IdentityServerInMem/Pages/ExternalLogin/Callback.cshtml.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/identity-server/templates/src/IdentityServerInMem/Pages/Index.cshtml.cs b/identity-server/templates/src/IdentityServerInMem/Pages/Index.cshtml.cs index 4a6fabd88..d6cc24c26 100644 --- a/identity-server/templates/src/IdentityServerInMem/Pages/Index.cshtml.cs +++ b/identity-server/templates/src/IdentityServerInMem/Pages/Index.cshtml.cs @@ -1,8 +1,8 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityServer; using System.Reflection; +using Duende.IdentityServer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/identity-server/templates/src/IdentityServerInMem/Pages/TestUsers.cs b/identity-server/templates/src/IdentityServerInMem/Pages/TestUsers.cs index 4fc69922b..b46f6b324 100644 --- a/identity-server/templates/src/IdentityServerInMem/Pages/TestUsers.cs +++ b/identity-server/templates/src/IdentityServerInMem/Pages/TestUsers.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityModel; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Test; diff --git a/identity-server/templates/src/IdentityServerInMem/Program.cs b/identity-server/templates/src/IdentityServerInMem/Program.cs index 7a4e47324..4befdf46f 100644 --- a/identity-server/templates/src/IdentityServerInMem/Program.cs +++ b/identity-server/templates/src/IdentityServerInMem/Program.cs @@ -1,8 +1,8 @@ -using Duende.IdentityServer.Licensing; +using System.Globalization; +using System.Text; +using Duende.IdentityServer.Licensing; using IdentityServerInMem; using Serilog; -using System.Globalization; -using System.Text; Log.Logger = new LoggerConfiguration() .WriteTo.Console() diff --git a/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationTests.cs b/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationTests.cs index 7c5a26a58..1956a043c 100644 --- a/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationTests.cs +++ b/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationTests.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using IntegrationTests.TestHosts; -using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; using System.Net.Http.Json; +using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; using Duende.IdentityServer.Models; +using IntegrationTests.TestHosts; namespace IntegrationTests; diff --git a/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationValidationTests.cs b/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationValidationTests.cs index 1d3539653..b58636b74 100644 --- a/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationValidationTests.cs +++ b/identity-server/test/Configuration.IntegrationTests/DynamicClientRegistrationValidationTests.cs @@ -3,10 +3,10 @@ using System.Net; -using IntegrationTests.TestHosts; -using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; using System.Net.Http.Json; using Duende.IdentityServer.Configuration.Models; +using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration; +using IntegrationTests.TestHosts; namespace IntegrationTests; diff --git a/identity-server/test/Configuration.IntegrationTests/TestFramework/GenericHost.cs b/identity-server/test/Configuration.IntegrationTests/TestFramework/GenericHost.cs index ce1255efc..eb09d2498 100644 --- a/identity-server/test/Configuration.IntegrationTests/TestFramework/GenericHost.cs +++ b/identity-server/test/Configuration.IntegrationTests/TestFramework/GenericHost.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using System.Reflection; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using System.Reflection; namespace IntegrationTests.TestFramework; diff --git a/identity-server/test/Configuration.IntegrationTests/TestHosts/ConfigurationHost.cs b/identity-server/test/Configuration.IntegrationTests/TestHosts/ConfigurationHost.cs index ad8aa5963..590d1ab1d 100644 --- a/identity-server/test/Configuration.IntegrationTests/TestHosts/ConfigurationHost.cs +++ b/identity-server/test/Configuration.IntegrationTests/TestHosts/ConfigurationHost.cs @@ -2,16 +2,16 @@ // See LICENSE in the project root for license information. -using IntegrationTests.TestFramework; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Configuration.EntityFramework; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Storage; -using Duende.IdentityServer.Services; using Duende.IdentityServer.EntityFramework.Options; using Duende.IdentityServer.EntityFramework.Storage; +using Duende.IdentityServer.Services; +using IntegrationTests.TestFramework; +using Microsoft.AspNetCore.Builder; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Storage; +using Microsoft.Extensions.DependencyInjection; namespace IntegrationTests.TestHosts; diff --git a/identity-server/test/EntityFramework.Storage.IntegrationTests/DbContexts/ClientDbContextTests.cs b/identity-server/test/EntityFramework.Storage.IntegrationTests/DbContexts/ClientDbContextTests.cs index 45a159054..4060ab571 100644 --- a/identity-server/test/EntityFramework.Storage.IntegrationTests/DbContexts/ClientDbContextTests.cs +++ b/identity-server/test/EntityFramework.Storage.IntegrationTests/DbContexts/ClientDbContextTests.cs @@ -2,10 +2,10 @@ // See LICENSE in the project root for license information. -using Microsoft.EntityFrameworkCore; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Options; +using Microsoft.EntityFrameworkCore; namespace EntityFramework.Storage.IntegrationTests.DbContexts; diff --git a/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/DeviceFlowStoreTests.cs b/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/DeviceFlowStoreTests.cs index 7f82de7bb..7617b8c46 100644 --- a/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/DeviceFlowStoreTests.cs +++ b/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/DeviceFlowStoreTests.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. -using Microsoft.EntityFrameworkCore; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.EntityFramework.Options; using Duende.IdentityServer.EntityFramework.Stores; using Duende.IdentityServer.Models; -using Duende.IdentityServer.Stores.Serialization; -using Duende.IdentityModel; -using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores.Serialization; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal; namespace EntityFramework.Storage.IntegrationTests.Stores; diff --git a/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/ResourceStoreTests.cs b/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/ResourceStoreTests.cs index 1f9b2ca34..ea567e12c 100644 --- a/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/ResourceStoreTests.cs +++ b/identity-server/test/EntityFramework.Storage.IntegrationTests/Stores/ResourceStoreTests.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer.EntityFramework.DbContexts; using Duende.IdentityServer.EntityFramework.Mappers; using Duende.IdentityServer.EntityFramework.Options; using Duende.IdentityServer.EntityFramework.Stores; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.EntityFrameworkCore; namespace EntityFramework.Storage.IntegrationTests.Stores; diff --git a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ApiResourceMappersTests.cs b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ApiResourceMappersTests.cs index f4b164b16..cbdcb1de7 100644 --- a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ApiResourceMappersTests.cs +++ b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ApiResourceMappersTests.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.EntityFramework.Mappers; -using Models = Duende.IdentityServer.Models; using Entities = Duende.IdentityServer.EntityFramework.Entities; +using Models = Duende.IdentityServer.Models; namespace EntityFramework.Storage.UnitTests.Mappers; diff --git a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ClientMappersTests.cs b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ClientMappersTests.cs index 387dd2131..a930bf6f0 100644 --- a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ClientMappersTests.cs +++ b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ClientMappersTests.cs @@ -3,9 +3,9 @@ using Duende.IdentityServer.EntityFramework.Mappers; -using Models = Duende.IdentityServer.Models; -using Entities = Duende.IdentityServer.EntityFramework.Entities; using Duende.IdentityServer.Models; +using Entities = Duende.IdentityServer.EntityFramework.Entities; +using Models = Duende.IdentityServer.Models; namespace EntityFramework.Storage.UnitTests.Mappers; diff --git a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityProviderMappersTests.cs b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityProviderMappersTests.cs index 18eb3f674..33e2857da 100644 --- a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityProviderMappersTests.cs +++ b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityProviderMappersTests.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.EntityFramework.Mappers; -using Models = Duende.IdentityServer.Models; using Entities = Duende.IdentityServer.EntityFramework.Entities; +using Models = Duende.IdentityServer.Models; namespace EntityFramework.Storage.UnitTests.Mappers; diff --git a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityResourcesMappersTests.cs b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityResourcesMappersTests.cs index dfd2ef0c6..ae57997a8 100644 --- a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityResourcesMappersTests.cs +++ b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/IdentityResourcesMappersTests.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.EntityFramework.Mappers; -using Models = Duende.IdentityServer.Models; using Entities = Duende.IdentityServer.EntityFramework.Entities; +using Models = Duende.IdentityServer.Models; namespace EntityFramework.Storage.UnitTests.Mappers; diff --git a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PersistedGrantMappersTests.cs b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PersistedGrantMappersTests.cs index 60b26edbc..d9556f10b 100644 --- a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PersistedGrantMappersTests.cs +++ b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PersistedGrantMappersTests.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.EntityFramework.Mappers; -using Models = Duende.IdentityServer.Models; using Entities = Duende.IdentityServer.EntityFramework.Entities; +using Models = Duende.IdentityServer.Models; namespace EntityFramework.Storage.UnitTests.Mappers; diff --git a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PushedAuthorizationRequestMappersTests.cs b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PushedAuthorizationRequestMappersTests.cs index e7d2fa5f5..db5f35723 100644 --- a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PushedAuthorizationRequestMappersTests.cs +++ b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/PushedAuthorizationRequestMappersTests.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.EntityFramework.Mappers; -using Models = Duende.IdentityServer.Models; using Entities = Duende.IdentityServer.EntityFramework.Entities; +using Models = Duende.IdentityServer.Models; namespace EntityFramework.Storage.UnitTests.Mappers; diff --git a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ScopeMappersTests.cs b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ScopeMappersTests.cs index 6ef0c072e..3adf32258 100644 --- a/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ScopeMappersTests.cs +++ b/identity-server/test/EntityFramework.Storage.UnitTests/Mappers/ScopeMappersTests.cs @@ -3,8 +3,8 @@ using Duende.IdentityServer.EntityFramework.Mappers; -using Models = Duende.IdentityServer.Models; using Entities = Duende.IdentityServer.EntityFramework.Entities; +using Models = Duende.IdentityServer.Models; namespace EntityFramework.Storage.UnitTests.Mappers; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Clients/ClientAssertionClient.cs b/identity-server/test/IdentityServer.IntegrationTests/Clients/ClientAssertionClient.cs index 18a266800..4100cc4ab 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Clients/ClientAssertionClient.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Clients/ClientAssertionClient.cs @@ -8,8 +8,8 @@ using System.Text; using System.Text.Json; using Duende.IdentityModel; using Duende.IdentityModel.Client; -using IntegrationTests.Common; using IntegrationTests.Clients.Setup; +using IntegrationTests.Common; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.IdentityModel.Tokens; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Clients/DiscoveryClient.cs b/identity-server/test/IdentityServer.IntegrationTests/Clients/DiscoveryClient.cs index 235990aee..0ad4ffa5f 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Clients/DiscoveryClient.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Clients/DiscoveryClient.cs @@ -3,9 +3,9 @@ using Duende.IdentityModel.Client; +using IntegrationTests.Clients.Setup; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; -using IntegrationTests.Clients.Setup; namespace IntegrationTests.Clients; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Clients/Setup/Users.cs b/identity-server/test/IdentityServer.IntegrationTests/Clients/Setup/Users.cs index 6202240b3..61725f78a 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Clients/Setup/Users.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Clients/Setup/Users.cs @@ -3,9 +3,9 @@ using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Test; -using Duende.IdentityModel; namespace IntegrationTests.Clients.Setup; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs b/identity-server/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs index 096d9b2b2..eb8ec4135 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs @@ -5,13 +5,13 @@ using System.Net; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel.Client; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; -using Duende.IdentityModel.Client; using IdentityServer.IntegrationTests.Common; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs index 2fda181f0..83a488848 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs @@ -3,9 +3,9 @@ using System.Security.Claims; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel.Client; using IntegrationTests.Common; namespace IntegrationTests.Conformance.Basic; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/CodeFlowTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/CodeFlowTests.cs index f5bb483f9..9e02109ba 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/CodeFlowTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/CodeFlowTests.cs @@ -4,10 +4,10 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel.Client; using IntegrationTests.Common; namespace IntegrationTests.Conformance.Basic; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs index 4941e92dd..110e27b64 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs @@ -4,10 +4,10 @@ using System.Net; using System.Security.Claims; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Test; using Duende.IdentityModel; using Duende.IdentityModel.Client; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Test; using IntegrationTests.Common; namespace IntegrationTests.Conformance.Basic; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Pkce/PkceTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Pkce/PkceTests.cs index 7797b286e..9c27899a1 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Conformance/Pkce/PkceTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Conformance/Pkce/PkceTests.cs @@ -4,11 +4,11 @@ using System.Security.Claims; using System.Text; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; using IntegrationTests.Common; namespace IntegrationTests.Conformance.Pkce; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs index 321f3ccff..c1da571d8 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs @@ -4,6 +4,7 @@ using System.Net; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; @@ -12,7 +13,6 @@ using Duende.IdentityServer.Stores; using Duende.IdentityServer.Stores.Default; using Duende.IdentityServer.Test; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using IntegrationTests.Common; using Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs index 4e4f55d11..7a685fd79 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs @@ -8,13 +8,13 @@ using System.Net.Http.Headers; using System.Security.Claims; using System.Security.Cryptography.X509Certificates; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Stores.Default; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using IntegrationTests.Common; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Logging; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs index 7279fefea..1fc5e5138 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Test; -using Duende.IdentityModel; -using IntegrationTests.Common; using System.Net; using System.Security.Claims; +using Duende.IdentityModel; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Test; +using IntegrationTests.Common; namespace IntegrationTests.Endpoints.Authorize; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/ResourceTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/ResourceTests.cs index 565fb93d6..e2839c524 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/ResourceTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/ResourceTests.cs @@ -5,9 +5,9 @@ using System.IdentityModel.Tokens.Jwt; using System.Net; using System.Security.Claims; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel.Client; using IntegrationTests.Common; namespace IntegrationTests.Endpoints.Authorize; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Ciba/CibaTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Ciba/CibaTests.cs index 88e62d560..5895539a5 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Ciba/CibaTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Ciba/CibaTests.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Test; -using IntegrationTests.Common; +using System.IdentityModel.Tokens.Jwt; using System.Net; using System.Security.Claims; -using Microsoft.Extensions.DependencyInjection; -using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Services; using System.Text.Json; -using System.IdentityModel.Tokens.Jwt; +using Duende.IdentityServer; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Test; +using Duende.IdentityServer.Validation; +using IntegrationTests.Common; +using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; using static Duende.IdentityServer.IdentityServerConstants; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs index bb23319f3..89cab0eca 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs @@ -5,8 +5,8 @@ using System.Net; using System.Text; using System.Text.Json; -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Models; using IntegrationTests.Common; namespace IntegrationTests.Endpoints.DeviceAuthorization; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs index 6e559cebd..7494eb654 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel.Client; -using IntegrationTests.Common; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.IdentityModel.Tokens; using System.Text.Json; +using Duende.IdentityModel.Client; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; +using IntegrationTests.Common; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; using JsonWebKey = Microsoft.IdentityModel.Tokens.JsonWebKey; namespace IntegrationTests.Endpoints.Discovery; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/EndSession/EndSessionTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/EndSession/EndSessionTests.cs index 3d503ede9..0c7f72eb6 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/EndSession/EndSessionTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/EndSession/EndSessionTests.cs @@ -7,10 +7,10 @@ using System.Security.Claims; using System.Text; using System.Text.Encodings.Web; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using IntegrationTests.Common; using Microsoft.AspNetCore.WebUtilities; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs index 87b5fb8c8..cf373d49b 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs @@ -5,8 +5,8 @@ using System.Net; using System.Text; using System.Text.Json; -using Duende.IdentityServer; using Duende.IdentityModel.Client; +using Duende.IdentityServer; using IntegrationTests.Endpoints.Introspection.Setup; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs index 5343919d7..30838ef6b 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs @@ -4,9 +4,9 @@ using System.Net; using System.Security.Claims; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel.Client; using IntegrationTests.Common; namespace IntegrationTests.Endpoints.Revocation; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/CibaTokenEndpointTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/CibaTokenEndpointTests.cs index a54bca32b..7987ca54e 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/CibaTokenEndpointTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/CibaTokenEndpointTests.cs @@ -5,13 +5,13 @@ using System.Net; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityServer; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Test; +using Duende.IdentityServer.Validation; using IntegrationTests.Common; using Microsoft.Extensions.DependencyInjection; -using Duende.IdentityServer.Services; -using Duende.IdentityServer.Validation; -using Duende.IdentityServer; namespace IntegrationTests.Endpoints.Token; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/DPoPTokenEndpointTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/DPoPTokenEndpointTests.cs index 492444ca1..3b215113f 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/DPoPTokenEndpointTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/DPoPTokenEndpointTests.cs @@ -2,25 +2,25 @@ // See LICENSE in the project root for license information. +using System.IdentityModel.Tokens.Jwt; +using System.Net; using System.Security.Claims; using System.Text.Json; -using Duende.IdentityServer.Models; -using Duende.IdentityServer.Test; -using IntegrationTests.Common; +using Duende.IdentityModel; using Duende.IdentityModel.Client; +using Duende.IdentityServer; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Test; +using Duende.IdentityServer.Validation; +using IntegrationTests.Common; using Microsoft.AspNetCore.Authentication; -using System.IdentityModel.Tokens.Jwt; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.JsonWebTokens; using Microsoft.IdentityModel.Tokens; -using System.Net; -using Duende.IdentityModel; -using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Validation; -using Duende.IdentityServer.Services; -using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Extensions; -using Microsoft.Extensions.DependencyInjection; -using Duende.IdentityServer; namespace IntegrationTests.Endpoints.Token; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/RefreshTokenTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/RefreshTokenTests.cs index 7dc6a941e..2732b2044 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/RefreshTokenTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/RefreshTokenTests.cs @@ -4,11 +4,11 @@ using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; using IntegrationTests.Common; -using Duende.IdentityModel.Client; -using Duende.IdentityModel; namespace IntegrationTests.Endpoints.Token; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/ResourceTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/ResourceTests.cs index 6af98ba8c..6be55d5d5 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/ResourceTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/ResourceTests.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. +using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; using IntegrationTests.Common; -using System.IdentityModel.Tokens.Jwt; -using Duende.IdentityModel.Client; namespace IntegrationTests.Endpoints.Token; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/TokenEndpointTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/TokenEndpointTests.cs index 3d9ffa804..7d0058003 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/TokenEndpointTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Token/TokenEndpointTests.cs @@ -4,11 +4,11 @@ using System.Net; using System.Security.Claims; +using System.Text; using System.Text.Json; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; using IntegrationTests.Common; -using System.Text; namespace IntegrationTests.Endpoints.Token; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomClaimsServiceTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomClaimsServiceTests.cs index c0fc2880a..952820601 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomClaimsServiceTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomClaimsServiceTests.cs @@ -5,11 +5,11 @@ using System.Security.Claims; using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; using IntegrationTests.Common; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomProfileServiceTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomProfileServiceTests.cs index a19515afe..fb671240d 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomProfileServiceTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomProfileServiceTests.cs @@ -6,9 +6,9 @@ using System.Net; using System.Security.Claims; using System.Text; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using IntegrationTests.Common; using Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomTokenCreationServiceTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomTokenCreationServiceTests.cs index 3a920c119..69bb6cfeb 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomTokenCreationServiceTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Extensibility/CustomTokenCreationServiceTests.cs @@ -4,12 +4,12 @@ using System.Text; using System.Text.Json; +using Duende.IdentityModel; +using Duende.IdentityModel.Client; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using Duende.IdentityModel; -using Duende.IdentityModel.Client; using IntegrationTests.Common; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Hosting/DynamicProvidersTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Hosting/DynamicProvidersTests.cs index bb1c1e5b5..6a0834985 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Hosting/DynamicProvidersTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Hosting/DynamicProvidersTests.cs @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. +using System.Net; using Duende.IdentityServer; using Duende.IdentityServer.Hosting.DynamicProviders; using Duende.IdentityServer.IntegrationTests.TestFramework; @@ -13,7 +14,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using System.Net; namespace IdentityServer.IntegrationTests.Hosting; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Hosting/FederatedSignoutTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Hosting/FederatedSignoutTests.cs index 5289bfdd5..9d4426d24 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Hosting/FederatedSignoutTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Hosting/FederatedSignoutTests.cs @@ -4,10 +4,10 @@ using System.Net; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel; using IntegrationTests.Common; using Microsoft.AspNetCore.Authentication; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Hosting/LocalApiAuthentication/LocalApiAuthenticationTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Hosting/LocalApiAuthentication/LocalApiAuthenticationTests.cs index 49810d612..cd96ad932 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Hosting/LocalApiAuthentication/LocalApiAuthenticationTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Hosting/LocalApiAuthentication/LocalApiAuthenticationTests.cs @@ -9,10 +9,10 @@ using System.Security.Claims; using System.Security.Cryptography; using System.Text; using System.Text.Json; -using Duende.IdentityServer.Hosting.LocalApiAuthentication; -using Duende.IdentityServer.Models; using Duende.IdentityModel; using Duende.IdentityModel.Client; +using Duende.IdentityServer.Hosting.LocalApiAuthentication; +using Duende.IdentityServer.Models; using IntegrationTests.Common; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Hosting/ServerSideSessionTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Hosting/ServerSideSessionTests.cs index 181c38868..c8f89f5ea 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Hosting/ServerSideSessionTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Hosting/ServerSideSessionTests.cs @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; using Duende.IdentityModel.Client; using Duende.IdentityServer; using Duende.IdentityServer.Extensions; @@ -16,7 +17,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.JsonWebTokens; -using System.Security.Claims; namespace IntegrationTests.Hosting; diff --git a/identity-server/test/IdentityServer.IntegrationTests/Hosting/SubpathHosting.cs b/identity-server/test/IdentityServer.IntegrationTests/Hosting/SubpathHosting.cs index 12e087ae9..9bdaecbba 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Hosting/SubpathHosting.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Hosting/SubpathHosting.cs @@ -3,9 +3,9 @@ using System.Security.Claims; +using Duende.IdentityModel.Client; using Duende.IdentityServer.Models; using Duende.IdentityServer.Test; -using Duende.IdentityModel.Client; using IntegrationTests.Common; namespace IntegrationTests.Hosting; diff --git a/identity-server/test/IdentityServer.IntegrationTests/TestFramework/GenericHost.cs b/identity-server/test/IdentityServer.IntegrationTests/TestFramework/GenericHost.cs index 9a981c852..5c62a00d4 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/TestFramework/GenericHost.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/TestFramework/GenericHost.cs @@ -2,6 +2,9 @@ // See LICENSE in the project root for license information. +using System.Net; +using System.Reflection; +using System.Security.Claims; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -9,9 +12,6 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using System.Net; -using System.Reflection; -using System.Security.Claims; namespace Duende.IdentityServer.IntegrationTests.TestFramework; diff --git a/identity-server/test/IdentityServer.IntegrationTests/TestFramework/MockExternalAuthenticationHandler.cs b/identity-server/test/IdentityServer.IntegrationTests/TestFramework/MockExternalAuthenticationHandler.cs index 0694dc1a8..2b8892d67 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/TestFramework/MockExternalAuthenticationHandler.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/TestFramework/MockExternalAuthenticationHandler.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using System.Text.Encodings.Web; using Duende.IdentityServer.IntegrationTests.TestFramework; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using System.Text.Encodings.Web; namespace Duende.IdentityServer.IntegrationTests.TestFramework { diff --git a/identity-server/test/IdentityServer.IntegrationTests/TestFramework/TestBrowserClient.cs b/identity-server/test/IdentityServer.IntegrationTests/TestFramework/TestBrowserClient.cs index 809fa5c2d..e09e6e3a1 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/TestFramework/TestBrowserClient.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/TestFramework/TestBrowserClient.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using System.Diagnostics; +using System.Net; using AngleSharp.Dom; using AngleSharp.Html.Dom; using AngleSharp.Html.Parser; -using System.Diagnostics; -using System.Net; namespace Duende.IdentityServer.IntegrationTests.TestFramework; diff --git a/identity-server/test/IdentityServer.UnitTests/Common/MockKeyMaterialService.cs b/identity-server/test/IdentityServer.UnitTests/Common/MockKeyMaterialService.cs index 66493e26e..0a424e5e9 100644 --- a/identity-server/test/IdentityServer.UnitTests/Common/MockKeyMaterialService.cs +++ b/identity-server/test/IdentityServer.UnitTests/Common/MockKeyMaterialService.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using Microsoft.IdentityModel.Tokens; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; +using Microsoft.IdentityModel.Tokens; namespace UnitTests.Common; diff --git a/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs b/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs index 3b919ce1e..524a9415f 100644 --- a/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs @@ -11,9 +11,9 @@ using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; +using UnitTests.Common; namespace UnitTests.Endpoints.Authorize; diff --git a/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs b/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs index 4ccd429e5..2e1af5216 100644 --- a/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs @@ -12,11 +12,11 @@ using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Models; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Stores; +using UnitTests.Common; namespace UnitTests.Endpoints.Authorize; diff --git a/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs b/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs index 5634f829a..44a43ce4a 100644 --- a/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs @@ -10,9 +10,9 @@ using Duende.IdentityServer.Endpoints; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; +using UnitTests.Common; namespace UnitTests.Endpoints.Authorize; diff --git a/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/AuthorizeResultTests.cs b/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/AuthorizeResultTests.cs index 52605f0d9..57cb814c8 100644 --- a/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/AuthorizeResultTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/AuthorizeResultTests.cs @@ -2,17 +2,17 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; +using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Models; using Duende.IdentityServer.ResponseHandling; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.WebUtilities; -using Duende.IdentityServer.Services; -using Duende.IdentityServer; +using UnitTests.Common; using UnitTests.Validation.Setup; namespace UnitTests.Endpoints.Results; diff --git a/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs b/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs index efbff232b..6f2652456 100644 --- a/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs @@ -6,8 +6,8 @@ using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; +using UnitTests.Common; namespace UnitTests.Endpoints.Results; diff --git a/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionResultTests.cs b/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionResultTests.cs index f606e632c..79af8a837 100644 --- a/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionResultTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionResultTests.cs @@ -5,11 +5,11 @@ using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Endpoints.Results; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.WebUtilities; -using Duende.IdentityServer.Services; +using UnitTests.Common; namespace UnitTests.Endpoints.Results; diff --git a/identity-server/test/IdentityServer.UnitTests/Extensions/EndpointOptionsExtensionsTests.cs b/identity-server/test/IdentityServer.UnitTests/Extensions/EndpointOptionsExtensionsTests.cs index 99592bc44..c90cd3349 100644 --- a/identity-server/test/IdentityServer.UnitTests/Extensions/EndpointOptionsExtensionsTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Extensions/EndpointOptionsExtensionsTests.cs @@ -4,8 +4,8 @@ using Duende.IdentityServer; using Duende.IdentityServer.Configuration; -using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Hosting; namespace UnitTests.Extensions; diff --git a/identity-server/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs b/identity-server/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs index 234ed95ab..4192a02b8 100644 --- a/identity-server/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. -using Microsoft.Extensions.DependencyInjection; -using Microsoft.IdentityModel.Tokens; using System.Security.Cryptography; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; namespace UnitTests.Extensions; diff --git a/identity-server/test/IdentityServer.UnitTests/Extensions/TokenExtensionsTests.cs b/identity-server/test/IdentityServer.UnitTests/Extensions/TokenExtensionsTests.cs index c3b5a0a86..fc5f20c32 100644 --- a/identity-server/test/IdentityServer.UnitTests/Extensions/TokenExtensionsTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Extensions/TokenExtensionsTests.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; +using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; -using Duende.IdentityModel; -using System.Security.Claims; -using System.Text.Json; using UnitTests.Common; namespace UnitTests.Extensions; diff --git a/identity-server/test/IdentityServer.UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs b/identity-server/test/IdentityServer.UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs index 4fced2063..a96e18044 100644 --- a/identity-server/test/IdentityServer.UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using Duende.IdentityModel; +using Duende.IdentityServer.Validation; namespace UnitTests.Extensions; diff --git a/identity-server/test/IdentityServer.UnitTests/Hosting/EndpointRouterTests.cs b/identity-server/test/IdentityServer.UnitTests/Hosting/EndpointRouterTests.cs index eadcbe877..d260eca62 100644 --- a/identity-server/test/IdentityServer.UnitTests/Hosting/EndpointRouterTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Hosting/EndpointRouterTests.cs @@ -6,9 +6,9 @@ using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Licensing.V2; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging.Abstractions; +using UnitTests.Common; namespace UnitTests.Hosting; diff --git a/identity-server/test/IdentityServer.UnitTests/Licensing/v2/LicenseAccessorTests.cs b/identity-server/test/IdentityServer.UnitTests/Licensing/v2/LicenseAccessorTests.cs index 4f49dadd5..bd07ce79e 100644 --- a/identity-server/test/IdentityServer.UnitTests/Licensing/v2/LicenseAccessorTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Licensing/v2/LicenseAccessorTests.cs @@ -1,8 +1,8 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Licensing.V2; using Microsoft.Extensions.Logging.Testing; namespace IdentityServer.UnitTests.Licensing.V2; diff --git a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs index 48250c0ed..f24937d0b 100644 --- a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs +++ b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs @@ -3,10 +3,10 @@ using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; namespace UnitTests.ResponseHandling.AuthorizeInteractionResponseGenerator; diff --git a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs index 4a666e9b8..89af3e9b9 100644 --- a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs +++ b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs @@ -8,8 +8,8 @@ using Duende.IdentityServer.Models; using Duende.IdentityServer.ResponseHandling; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.Extensions.Logging; +using UnitTests.Common; using static Duende.IdentityModel.OidcConstants; namespace UnitTests.ResponseHandling.AuthorizeInteractionResponseGenerator; diff --git a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs index 4eef34ea0..de78380c2 100644 --- a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs +++ b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs @@ -3,11 +3,11 @@ using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; namespace UnitTests.ResponseHandling.AuthorizeInteractionResponseGenerator; diff --git a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs index 41c5a7b9b..3c2400406 100644 --- a/identity-server/test/IdentityServer.UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs @@ -9,8 +9,8 @@ using Duende.IdentityServer.Services; using Duende.IdentityServer.Services.Default; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.Extensions.Logging.Abstractions; +using UnitTests.Common; namespace UnitTests.ResponseHandling; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultBackChannelLogoutServiceTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultBackChannelLogoutServiceTests.cs index 1753f6459..c8005e9d1 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultBackChannelLogoutServiceTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultBackChannelLogoutServiceTests.cs @@ -3,10 +3,10 @@ using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Services; -using Duende.IdentityModel; using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Tokens; using UnitTests.Common; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultClaimsServiceTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultClaimsServiceTests.cs index b011b9e2f..da8c740b0 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultClaimsServiceTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultClaimsServiceTests.cs @@ -3,12 +3,12 @@ using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; namespace UnitTests.Services.Default; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultConsentServiceTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultConsentServiceTests.cs index ee013ec01..b42c38676 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultConsentServiceTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultConsentServiceTests.cs @@ -3,12 +3,12 @@ using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; namespace UnitTests.Services.Default; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs index 217d8fe3b..5bb1f0506 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs @@ -2,13 +2,13 @@ // See LICENSE in the project root for license information. -using UnitTests.Common; using System.Security.Claims; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Stores.Serialization; +using UnitTests.Common; using UnitTests.Validation.Setup; namespace UnitTests.Services.Default; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultTokenServiceTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultTokenServiceTests.cs index 785586d40..8af5f340e 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultTokenServiceTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultTokenServiceTests.cs @@ -2,14 +2,14 @@ // See LICENSE in the project root for license information. +using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; -using UnitTests.Common; using Microsoft.Extensions.DependencyInjection; -using System.Security.Claims; +using UnitTests.Common; namespace UnitTests.Services.Default; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultUserSessionTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultUserSessionTests.cs index abf5da735..8b7e96bbc 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultUserSessionTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/DefaultUserSessionTests.cs @@ -8,9 +8,9 @@ using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; -using UnitTests.Common; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; +using UnitTests.Common; namespace UnitTests.Services.Default; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs index 579286655..aec8a1edf 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs @@ -6,9 +6,9 @@ using System.Text; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; -using UnitTests.Common; -using Microsoft.Extensions.Caching.Distributed; using Duende.IdentityServer.Stores; +using Microsoft.Extensions.Caching.Distributed; +using UnitTests.Common; namespace UnitTests.Services.Default; diff --git a/identity-server/test/IdentityServer.UnitTests/Services/Default/ParRedirectUriValidatorTests.cs b/identity-server/test/IdentityServer.UnitTests/Services/Default/ParRedirectUriValidatorTests.cs index ce0bbd2fa..a0e162637 100644 --- a/identity-server/test/IdentityServer.UnitTests/Services/Default/ParRedirectUriValidatorTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Services/Default/ParRedirectUriValidatorTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Duende Software. All rights reserved. // See LICENSE in the project root for license information. -using Duende.IdentityServer.Validation; using System.Collections.Specialized; using Duende.IdentityServer.Models; +using Duende.IdentityServer.Validation; using UnitTests.Common; namespace UnitTests.Services.Default; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AccessTokenValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AccessTokenValidation.cs index 48166dc27..a9d966eaf 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AccessTokenValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AccessTokenValidation.cs @@ -3,10 +3,10 @@ using System.IdentityModel.Tokens.Jwt; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; -using Duende.IdentityModel; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs index 8a1d10ec6..856a93496 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs index cb7454aa5..a0069e41e 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs index 218aafbbb..bb5ba556b 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs index 9fc20b9e3..d151cfcf7 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs index 6465c543e..e23047185 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs index 6feceaa46..a6ef906c4 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Validation; using Duende.IdentityModel; +using Duende.IdentityServer.Validation; using UnitTests.Validation.Setup; namespace UnitTests.Validation.AuthorizeRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs index a999965e0..fd39522dc 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer; using Duende.IdentityModel; +using Duende.IdentityServer; using UnitTests.Validation.Setup; namespace UnitTests.Validation.AuthorizeRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PAR.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PAR.cs index e6483dc78..a937999c1 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PAR.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PAR.cs @@ -3,9 +3,9 @@ using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Validation.Setup; namespace UnitTests.Validation.AuthorizeRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs index d9fb8403b..1f1dee858 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Configuration; using Duende.IdentityModel; +using Duende.IdentityServer.Configuration; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Resources.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Resources.cs index b543bdb9e..ed55e8d55 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Resources.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Resources.cs @@ -3,12 +3,12 @@ using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; -using Duende.IdentityServer.Licensing.V2; using Microsoft.Extensions.Logging.Abstractions; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs index 935be3d4c..106e3ddef 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer; using Duende.IdentityModel; +using Duende.IdentityServer; using UnitTests.Validation.Setup; namespace UnitTests.Validation.AuthorizeRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/BearerTokenUsageValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/BearerTokenUsageValidation.cs index 4b72ae55d..4c7be4b34 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/BearerTokenUsageValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/BearerTokenUsageValidation.cs @@ -4,8 +4,8 @@ using System.Text; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; +using UnitTests.Common; namespace UnitTests.Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/DPoPProofValidatorTests.cs b/identity-server/test/IdentityServer.UnitTests/Validation/DPoPProofValidatorTests.cs index 7d27e4d8e..cd3d38671 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/DPoPProofValidatorTests.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/DPoPProofValidatorTests.cs @@ -5,11 +5,11 @@ using System.Security.Claims; using System.Security.Cryptography; using System.Text; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.JsonWebTokens; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/DeviceAuthorizationRequestValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/DeviceAuthorizationRequestValidation.cs index 1156ed69e..1aff62a52 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/DeviceAuthorizationRequestValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/DeviceAuthorizationRequestValidation.cs @@ -3,10 +3,10 @@ using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Validation.Setup; namespace UnitTests.Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/DeviceCodeValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/DeviceCodeValidation.cs index c170916db..64080632e 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/DeviceCodeValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/DeviceCodeValidation.cs @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Validation.Setup; namespace UnitTests.Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/RevocationRequestValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/RevocationRequestValidation.cs index 0b0927ff9..36c22e2fa 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/RevocationRequestValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/RevocationRequestValidation.cs @@ -3,10 +3,10 @@ using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; namespace UnitTests.Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs index 17209098e..f9b035234 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs @@ -7,9 +7,9 @@ using Duende.IdentityModel.Client; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; +using UnitTests.Common; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs index 9f7247bdc..a2546a89a 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs @@ -8,9 +8,9 @@ using System.Text; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; +using UnitTests.Common; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientSecretValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientSecretValidation.cs index 6e7575329..e13d40d7d 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientSecretValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/ClientSecretValidation.cs @@ -3,8 +3,8 @@ using System.Text; -using UnitTests.Validation.Setup; using Microsoft.AspNetCore.Http; +using UnitTests.Validation.Setup; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/FormPostCredentialParsing.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/FormPostCredentialParsing.cs index 1f1ee8a03..656d50265 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/FormPostCredentialParsing.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/FormPostCredentialParsing.cs @@ -6,9 +6,9 @@ using System.Text; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; +using UnitTests.Common; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs index 26804ea57..15bf790de 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs @@ -6,8 +6,8 @@ using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using UnitTests.Validation.Setup; using Microsoft.Extensions.Logging; +using UnitTests.Validation.Setup; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs index 9e94b32ed..45aea1e64 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs @@ -6,9 +6,9 @@ using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; using UnitTests.Common; using UnitTests.Validation.Setup; -using Microsoft.Extensions.Logging; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs index c8a6c2f0b..a58f11ba2 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs @@ -6,8 +6,8 @@ using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using UnitTests.Validation.Setup; using Microsoft.Extensions.Logging; +using UnitTests.Validation.Setup; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs index a04261e1f..2c49958c2 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs @@ -5,18 +5,18 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Text.Json; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; +using Microsoft.Extensions.Logging; +using Microsoft.IdentityModel.Tokens; using UnitTests.Common; using UnitTests.Services.Default; using UnitTests.Validation.Setup; -using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/SecretValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/SecretValidation.cs index 7ca61c748..60c107ac3 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/SecretValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Secrets/SecretValidation.cs @@ -7,9 +7,9 @@ using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; +using Microsoft.Extensions.Logging; using UnitTests.Common; using UnitTests.Validation.Setup; -using Microsoft.Extensions.Logging; namespace UnitTests.Validation.Secrets; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Setup/Factory.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Setup/Factory.cs index 03968c465..d5038ae4a 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Setup/Factory.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Setup/Factory.cs @@ -2,19 +2,19 @@ // See LICENSE in the project root for license information. +using Duende.IdentityServer; using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Licensing.V2; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Services.Default; +using Duende.IdentityServer.Services.KeyManagement; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Stores.Serialization; using Duende.IdentityServer.Validation; -using UnitTests.Common; using Microsoft.Extensions.Logging; -using Duende.IdentityServer.Services.KeyManagement; -using Duende.IdentityServer; -using Duende.IdentityServer.Licensing.V2; using Microsoft.Extensions.Logging.Abstractions; +using UnitTests.Common; namespace UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/Setup/TokenFactory.cs b/identity-server/test/IdentityServer.UnitTests/Validation/Setup/TokenFactory.cs index 2603bdfe7..2d3847b64 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/Setup/TokenFactory.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/Setup/TokenFactory.cs @@ -3,8 +3,8 @@ using System.Security.Claims; -using Duende.IdentityServer.Models; using Duende.IdentityModel; +using Duende.IdentityServer.Models; using UnitTests.Common; namespace UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs index 5f01f832d..5f11fef0b 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. -using UnitTests.Common; using Duende.IdentityServer.Models; using Duende.IdentityServer.Validation; +using UnitTests.Common; namespace UnitTests.Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs index 2869aec5d..e90af9fbd 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Stores; using Duende.IdentityModel; +using Duende.IdentityServer.Stores; using UnitTests.Validation.Setup; namespace UnitTests.Validation.TokenRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs index a6a2929bd..7909f380c 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs @@ -4,12 +4,12 @@ using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs index f012b1be6..1531a9ef2 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs @@ -3,11 +3,11 @@ using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; -using Duende.IdentityModel; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs index 5d9491c1d..6e0ac6d5a 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs @@ -3,8 +3,8 @@ using System.Collections.Specialized; -using Duende.IdentityServer.Stores; using Duende.IdentityModel; +using Duende.IdentityServer.Stores; using UnitTests.Validation.Setup; namespace UnitTests.Validation.TokenRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs index 2e745bdcc..bca0daa47 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs @@ -4,10 +4,10 @@ using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; -using Duende.IdentityModel; using UnitTests.Validation.Setup; namespace UnitTests.Validation.TokenRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs index 09c35fd84..ccd65300a 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs @@ -4,11 +4,11 @@ using System.Collections.Specialized; using System.Text; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; -using Duende.IdentityModel; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs index 1b6b9d91a..f2fc1b5fc 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs @@ -4,12 +4,12 @@ using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Configuration; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs index d5b8f7c29..22c9eda5b 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs @@ -3,10 +3,10 @@ using System.Collections.Specialized; +using Duende.IdentityModel; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; -using Duende.IdentityModel; using UnitTests.Common; using UnitTests.Validation.Setup; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs index 64d5fe99d..c2e7a16d8 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs @@ -4,10 +4,10 @@ using System.Collections.Specialized; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer; using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; -using Duende.IdentityModel; using UnitTests.Validation.Setup; namespace UnitTests.Validation.TokenRequest_Validation; diff --git a/identity-server/test/IdentityServer.UnitTests/Validation/UserInfoRequestValidation.cs b/identity-server/test/IdentityServer.UnitTests/Validation/UserInfoRequestValidation.cs index 25040eb51..7ad31edef 100644 --- a/identity-server/test/IdentityServer.UnitTests/Validation/UserInfoRequestValidation.cs +++ b/identity-server/test/IdentityServer.UnitTests/Validation/UserInfoRequestValidation.cs @@ -2,12 +2,12 @@ // See LICENSE in the project root for license information. -using Duende.IdentityModel; -using UnitTests.Validation.Setup; using System.Security.Claims; +using Duende.IdentityModel; using Duende.IdentityServer.Stores; using Duende.IdentityServer.Validation; using UnitTests.Common; +using UnitTests.Validation.Setup; namespace UnitTests.Validation;