Updating namespaces

Author: damienbod

content/StsServerIdentity/Controllers/AccountController.cs

@@ -10,86 +10,85 @@
 using StsServerIdentity.Filters;
 using StsServerIdentity.Models;
 
-namespace StsServerIdentity.Controllers
+namespace StsServerIdentity.Controllers;
+
+/// <summary>
+/// This sample controller allows a user to revoke grants given to clients
+/// </summary>
+[SecurityHeaders]
+[Authorize]
+public class GrantsController : Controller
 {
+    private readonly IIdentityServerInteractionService _interaction;
+    private readonly IClientStore _clients;
+    private readonly IResourceStore _resources;
+    private readonly IEventService _events;
+
+    public GrantsController(IIdentityServerInteractionService interaction,
+        IClientStore clients,
+        IResourceStore resources,
+        IEventService events)
+    {
+        _interaction = interaction;
+        _clients = clients;
+        _resources = resources;
+        _events = events;
+    }
+
     /// <summary>
-    /// This sample controller allows a user to revoke grants given to clients
+    /// Show list of grants
     /// </summary>
-    [SecurityHeaders]
-    [Authorize]
-    public class GrantsController : Controller
+    [HttpGet]
+    public async Task<IActionResult> Index()
     {
-        private readonly IIdentityServerInteractionService _interaction;
-        private readonly IClientStore _clients;
-        private readonly IResourceStore _resources;
-        private readonly IEventService _events;
-
-        public GrantsController(IIdentityServerInteractionService interaction,
-            IClientStore clients,
-            IResourceStore resources,
-            IEventService events)
-        {
-            _interaction = interaction;
-            _clients = clients;
-            _resources = resources;
-            _events = events;
-        }
+        return View("Index", await BuildViewModelAsync());
+    }
 
-        /// <summary>
-        /// Show list of grants
-        /// </summary>
-        [HttpGet]
-        public async Task<IActionResult> Index()
-        {
-            return View("Index", await BuildViewModelAsync());
-        }
+    /// <summary>
+    /// Handle postback to revoke a client
+    /// </summary>
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Revoke(string clientId)
+    {
+        await _interaction.RevokeUserConsentAsync(clientId);
+        await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
 
-        /// <summary>
-        /// Handle postback to revoke a client
-        /// </summary>
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Revoke(string clientId)
-        {
-            await _interaction.RevokeUserConsentAsync(clientId);
-            await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
+        return RedirectToAction("Index");
+    }
 
-            return RedirectToAction("Index");
-        }
+    private async Task<GrantsViewModel> BuildViewModelAsync()
+    {
+        var grants = await _interaction.GetAllUserGrantsAsync();
 
-        private async Task<GrantsViewModel> BuildViewModelAsync()
+        var list = new List<GrantViewModel>();
+        foreach (var grant in grants)
         {
-            var grants = await _interaction.GetAllUserGrantsAsync();
-
-            var list = new List<GrantViewModel>();
-            foreach (var grant in grants)
+            var client = await _clients.FindClientByIdAsync(grant.ClientId);
+            if (client != null)
             {
-                var client = await _clients.FindClientByIdAsync(grant.ClientId);
-                if (client != null)
-                {
-                    var resources = await _resources.FindResourcesByScopeAsync(grant.Scopes);
+                var resources = await _resources.FindResourcesByScopeAsync(grant.Scopes);
 
-                    var item = new GrantViewModel()
-                    {
-                        ClientId = client.ClientId,
-                        ClientName = client.ClientName ?? client.ClientId,
-                        ClientLogoUrl = client.LogoUri,
-                        ClientUrl = client.ClientUri,
-                        Description = grant.Description,
-                        Created = grant.CreationTime,
-                        Expires = grant.Expiration,
-                        IdentityGrantNames = resources.IdentityResources.Select(x => x.DisplayName ?? x.Name).ToArray(),
-                        ApiGrantNames = resources.ApiScopes.Select(x => x.DisplayName ?? x.Name).ToArray()
-                    };
+                var item = new GrantViewModel()
+                {
+                    ClientId = client.ClientId,
+                    ClientName = client.ClientName ?? client.ClientId,
+                    ClientLogoUrl = client.LogoUri,
+                    ClientUrl = client.ClientUri,
+                    Description = grant.Description,
+                    Created = grant.CreationTime,
+                    Expires = grant.Expiration,
+                    IdentityGrantNames = resources.IdentityResources.Select(x => x.DisplayName ?? x.Name).ToArray(),
+                    ApiGrantNames = resources.ApiScopes.Select(x => x.DisplayName ?? x.Name).ToArray()
+                };
 
-                    list.Add(item);
-                }
+                list.Add(item);
             }
-
-            return new GrantsViewModel
-            {
-                Grants = list
-            };
         }
+
+        return new GrantsViewModel
+        {
+            Grants = list
+        };
     }
 }

content/StsServerIdentity/Controllers/ConsentController.cs

@@ -3,38 +3,37 @@
 using IdentityServer4.Services;
 using StsServerIdentity.Models;
 
-namespace StsServerIdentity.Controllers
+namespace StsServerIdentity.Controllers;
+
+public class HomeController : Controller
 {
-    public class HomeController : Controller
+    private readonly IIdentityServerInteractionService _interaction;
+
+    public HomeController(IIdentityServerInteractionService interaction)
     {
-        private readonly IIdentityServerInteractionService _interaction;
+        _interaction = interaction;
+    }
 
-        public HomeController(IIdentityServerInteractionService interaction)
-        {
-            _interaction = interaction;
-        }
+    public IActionResult Index()
+    {
+        return View();
+    }
 
-        public IActionResult Index()
-        {
-            return View();
-        }
 
+    /// <summary>
+    /// Shows the error page
+    /// </summary>
+    public async Task<IActionResult> Error(string errorId)
+    {
+        var vm = new ErrorViewModel();
 
-        /// <summary>
-        /// Shows the error page
-        /// </summary>
-        public async Task<IActionResult> Error(string errorId)
+        // retrieve error details from identityserver
+        var message = await _interaction.GetErrorContextAsync(errorId);
+        if (message != null)
         {
-            var vm = new ErrorViewModel();
-
-            // retrieve error details from identityserver
-            var message = await _interaction.GetErrorContextAsync(errorId);
-            if (message != null)
-            {
-                vm.Error = message;
-            }
-
-            return View("Error", vm);
+            vm.Error = message;
         }
+
+        return View("Error", vm);
     }
-}
+}