namespace cleanup/refactor in host (to support templates) (#4439)

IdentityServer · May 26, 2020 · 803d9f0 · 803d9f0
1 parent 6d18e30
commit 803d9f0
Show file tree

Hide file tree

Showing 40 changed files with 34 additions and 44 deletions.
diff --git a/src/IdentityServer4/host/Quickstart/Account/AccountController.cs b/src/IdentityServer4/host/Quickstart/Account/AccountController.cs
@@ -3,6 +3,7 @@
 
 
 using IdentityModel;
+using IdentityServer4;
 using IdentityServer4.Events;
 using IdentityServer4.Extensions;
 using IdentityServer4.Models;
@@ -17,7 +18,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     /// <summary>
     /// This sample controller implements a typical login/logout/provision workflow for local and external accounts.

diff --git a/src/IdentityServer4/host/Quickstart/Account/AccountOptions.cs b/src/IdentityServer4/host/Quickstart/Account/AccountOptions.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class AccountOptions
     {

diff --git a/src/IdentityServer4/host/Quickstart/Account/ExternalController.cs b/src/IdentityServer4/host/Quickstart/Account/ExternalController.cs
@@ -1,4 +1,5 @@
 using IdentityModel;
+using IdentityServer4;
 using IdentityServer4.Events;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
@@ -14,7 +15,7 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     [SecurityHeaders]
     [AllowAnonymous]

diff --git a/src/IdentityServer4/host/Quickstart/Account/ExternalProvider.cs b/src/IdentityServer4/host/Quickstart/Account/ExternalProvider.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class ExternalProvider
     {

diff --git a/src/IdentityServer4/host/Quickstart/Account/LoggedOutViewModel.cs b/src/IdentityServer4/host/Quickstart/Account/LoggedOutViewModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class LoggedOutViewModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Account/LoginInputModel.cs b/src/IdentityServer4/host/Quickstart/Account/LoginInputModel.cs
@@ -4,7 +4,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class LoginInputModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Account/LoginViewModel.cs b/src/IdentityServer4/host/Quickstart/Account/LoginViewModel.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class LoginViewModel : LoginInputModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Account/LogoutInputModel.cs b/src/IdentityServer4/host/Quickstart/Account/LogoutInputModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class LogoutInputModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Account/LogoutViewModel.cs b/src/IdentityServer4/host/Quickstart/Account/LogoutViewModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class LogoutViewModel : LogoutInputModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Account/RedirectViewModel.cs b/src/IdentityServer4/host/Quickstart/Account/RedirectViewModel.cs
@@ -3,7 +3,7 @@
 
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class RedirectViewModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Consent/ConsentController.cs b/src/IdentityServer4/host/Quickstart/Consent/ConsentController.cs
@@ -15,7 +15,7 @@
 using System.Collections.Generic;
 using System;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     /// <summary>
     /// This controller processes the consent UI

diff --git a/src/IdentityServer4/host/Quickstart/Consent/ConsentInputModel.cs b/src/IdentityServer4/host/Quickstart/Consent/ConsentInputModel.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class ConsentInputModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Consent/ConsentOptions.cs b/src/IdentityServer4/host/Quickstart/Consent/ConsentOptions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class ConsentOptions
     {

diff --git a/src/IdentityServer4/host/Quickstart/Consent/ConsentViewModel.cs b/src/IdentityServer4/host/Quickstart/Consent/ConsentViewModel.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class ConsentViewModel : ConsentInputModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Consent/ProcessConsentResult.cs b/src/IdentityServer4/host/Quickstart/Consent/ProcessConsentResult.cs
@@ -4,7 +4,7 @@
 
 using IdentityServer4.Models;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class ProcessConsentResult
     {

diff --git a/src/IdentityServer4/host/Quickstart/Consent/ScopeViewModel.cs b/src/IdentityServer4/host/Quickstart/Consent/ScopeViewModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class ScopeViewModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Device/DeviceAuthorizationInputModel.cs b/src/IdentityServer4/host/Quickstart/Device/DeviceAuthorizationInputModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI.Device
+namespace Host.Quickstart.UI
 {
     public class DeviceAuthorizationInputModel : ConsentInputModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Device/DeviceAuthorizationViewModel.cs b/src/IdentityServer4/host/Quickstart/Device/DeviceAuthorizationViewModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI.Device
+namespace Host.Quickstart.UI
 {
     public class DeviceAuthorizationViewModel : ConsentViewModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Device/DeviceController.cs b/src/IdentityServer4/host/Quickstart/Device/DeviceController.cs
@@ -17,7 +17,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace IdentityServer4.Quickstart.UI.Device
+namespace Host.Quickstart.UI.Device
 {
     [Authorize]
     [SecurityHeaders]

diff --git a/src/IdentityServer4/host/Quickstart/Diagnostics/DiagnosticsController.cs b/src/IdentityServer4/host/Quickstart/Diagnostics/DiagnosticsController.cs
@@ -8,7 +8,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     [SecurityHeaders]
     [Authorize]

diff --git a/src/IdentityServer4/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs b/src/IdentityServer4/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class DiagnosticsViewModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Extensions.cs b/src/IdentityServer4/host/Quickstart/Extensions.cs
@@ -2,7 +2,7 @@
 using IdentityServer4.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public static class Extensions
     {

diff --git a/src/IdentityServer4/host/Quickstart/Grants/GrantsController.cs b/src/IdentityServer4/host/Quickstart/Grants/GrantsController.cs
@@ -12,7 +12,7 @@
 using IdentityServer4.Events;
 using IdentityServer4.Extensions;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     /// <summary>
     /// This sample controller allows a user to revoke grants given to clients

diff --git a/src/IdentityServer4/host/Quickstart/Grants/GrantsViewModel.cs b/src/IdentityServer4/host/Quickstart/Grants/GrantsViewModel.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class GrantsViewModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Home/ErrorViewModel.cs b/src/IdentityServer4/host/Quickstart/Home/ErrorViewModel.cs
@@ -4,7 +4,7 @@
 
 using IdentityServer4.Models;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class ErrorViewModel
     {

diff --git a/src/IdentityServer4/host/Quickstart/Home/HomeController.cs b/src/IdentityServer4/host/Quickstart/Home/HomeController.cs
@@ -10,7 +10,7 @@
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     [SecurityHeaders]
     [AllowAnonymous]

diff --git a/src/IdentityServer4/host/Quickstart/SecurityHeadersAttribute.cs b/src/IdentityServer4/host/Quickstart/SecurityHeadersAttribute.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class SecurityHeadersAttribute : ActionFilterAttribute
     {

diff --git a/src/IdentityServer4/host/Quickstart/TestUsers.cs b/src/IdentityServer4/host/Quickstart/TestUsers.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 
-namespace IdentityServer4.Quickstart.UI
+namespace Host.Quickstart.UI
 {
     public class TestUsers
     {

diff --git a/src/IdentityServer4/host/Startup.cs b/src/IdentityServer4/host/Startup.cs
@@ -6,7 +6,6 @@
 using Host.Configuration;
 using IdentityModel;
 using IdentityServer4;
-using IdentityServer4.Quickstart.UI;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -21,6 +20,7 @@
 using Host.Extensions;
 using Microsoft.AspNetCore.Authentication.Certificate;
 using Microsoft.AspNetCore.HttpOverrides;
+using Host.Quickstart.UI;
 
 namespace Host
 {

diff --git a/src/IdentityServer4/host/Views/Device/UserCodeConfirmation.cshtml b/src/IdentityServer4/host/Views/Device/UserCodeConfirmation.cshtml
@@ -1,4 +1,4 @@
-@model IdentityServer4.Quickstart.UI.Device.DeviceAuthorizationViewModel
+@model DeviceAuthorizationViewModel
 
 <div class="page-device-confirmation">
     <div class="lead">

diff --git a/src/IdentityServer4/host/Views/_ViewImports.cshtml b/src/IdentityServer4/host/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using IdentityServer4.Quickstart.UI
+@using Host.Quickstart.UI
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/IdentityServer4/src/Configuration/IdentityServerApplicationBuilderExtensions.cs b/src/IdentityServer4/src/Configuration/IdentityServerApplicationBuilderExtensions.cs
@@ -11,7 +11,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Microsoft.AspNetCore.Builder

diff --git a/src/IdentityServer4/src/Endpoints/Results/EndSessionCallbackResult.cs b/src/IdentityServer4/src/Endpoints/Results/EndSessionCallbackResult.cs
@@ -12,7 +12,6 @@
 using System;
 using IdentityServer4.Extensions;
 using IdentityServer4.Configuration;
-using System.Collections.Generic;
 
 namespace IdentityServer4.Endpoints.Results
 {

diff --git a/src/IdentityServer4/src/Services/Default/DefaultJwtRequestUriHttpClient.cs b/src/IdentityServer4/src/Services/Default/DefaultJwtRequestUriHttpClient.cs
@@ -25,6 +25,7 @@ public class DefaultJwtRequestUriHttpClient : IJwtRequestUriHttpClient
         /// ctor
         /// </summary>
         /// <param name="client">An HTTP client</param>
+        /// <param name="options">The options.</param>
         /// <param name="loggerFactory">The logger factory</param>
         public DefaultJwtRequestUriHttpClient(HttpClient client, IdentityServerOptions options, ILoggerFactory loggerFactory)
         {

diff --git a/src/IdentityServer4/src/Services/Default/DefaultUserSession.cs b/src/IdentityServer4/src/Services/Default/DefaultUserSession.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using System.Text;
 using System.Threading.Tasks;
 using IdentityModel;
 using IdentityServer4.Configuration;

diff --git a/src/IdentityServer4/src/Validation/Models/ValidatedRequest.cs b/src/IdentityServer4/src/Validation/Models/ValidatedRequest.cs
@@ -10,7 +10,6 @@
 using IdentityModel;
 using System.Linq;
 using System;
-using System.Linq.Expressions;
 
 namespace IdentityServer4.Validation
 {

diff --git a/...er4/test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackEndpointTests.cs b/...er4/test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackEndpointTests.cs
@@ -2,14 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-using System.Threading.Tasks;
-using FluentAssertions;
-using IdentityServer.UnitTests.Common;
 using IdentityServer4.Endpoints;
-using IdentityServer4.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Xunit;
 
 namespace IdentityServer.UnitTests.Endpoints.EndSession
 {

diff --git a/...rver4/test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackResultTests.cs b/...rver4/test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackResultTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;

diff --git a/...yServer4/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs b/...yServer4/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/...erver.UnitTests/Validation/EndSessionRequestValidation/EndSessionRequestValidatorTests.cs b/...erver.UnitTests/Validation/EndSessionRequestValidation/EndSessionRequestValidatorTests.cs
@@ -12,7 +12,6 @@
 using IdentityServer4.Configuration;
 using IdentityServer4.Extensions;
 using IdentityServer4.Models;
-using IdentityServer4.Stores;
 using IdentityServer4.Validation;
 using Xunit;