more fixes

Author: StuartFerguson

SecurityService.UnitTests/SecurityServiceManagerTestData.cs

@@ -1,13 +1,14 @@
 namespace SecurityService.UnitTests
 {
+    using BusinessLogic.Requests;
+    using DataTransferObjects;
+    using Microsoft.AspNetCore.Identity;
+    using SecurityService.BusinessLogic;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Security.Claims;
     using System.Threading.Tasks;
-    using BusinessLogic.Requests;
-    using DataTransferObjects;
-    using Microsoft.AspNetCore.Identity;
 
     public class TestData{
         public static String UserName = "00000001";
@@ -57,22 +58,22 @@ public class TestData{
 
         public static String User3Id = "da6ce793-1ed5-4116-af89-2878b075ec5a";
 
-        public static List<IdentityUser> UserList = new List<IdentityUser>{
-                                                                              new IdentityUser{
+        public static List<ApplicationUser> UserList = new List<ApplicationUser>{
+                                                                              new ApplicationUser{
                                                                                                   UserName = "00000001",
                                                                                                   NormalizedUserName = "00000001",
                                                                                                   Email = "00000001@testemail.com",
                                                                                                   NormalizedEmail = "00000001@testemail.com",
                                                                                                   Id = TestData.User1Id
                                                                                               },
-                                                                              new IdentityUser{
+                                                                              new ApplicationUser{
                                                                                                   UserName = "00000002",
                                                                                                   NormalizedUserName = "00000002",
                                                                                                   Email = "00000002@testemail.com",
                                                                                                   NormalizedEmail = "00000002@testemail.com",
                                                                                                   Id = TestData.User2Id
                                                                                               },
-                                                                              new IdentityUser{
+                                                                              new ApplicationUser{
                                                                                                   UserName = "00000003",
                                                                                                   NormalizedUserName = "00000003",
                                                                                                   Email = "00000003@testemail.com",

SecurityService.UserInterface/Pages/Account/Login/Index.cshtml.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using SecurityService.BusinessLogic;
 
 namespace IdentityServerHost.Pages.Login;
 
@@ -18,8 +19,8 @@ namespace IdentityServerHost.Pages.Login;
 [AllowAnonymous]
 public class Index : PageModel
 {
-    private readonly UserManager<IdentityUser> _userManager;
-    private readonly SignInManager<IdentityUser> _signInManager;
+    private readonly UserManager<ApplicationUser> _userManager;
+    private readonly SignInManager<ApplicationUser> _signInManager;
     private readonly IIdentityServerInteractionService _interaction;
     private readonly IEventService _events;
     private readonly IAuthenticationSchemeProvider _schemeProvider;
@@ -35,8 +36,8 @@ public Index(
         IAuthenticationSchemeProvider schemeProvider,
         IIdentityProviderStore identityProviderStore,
         IEventService events,
-        UserManager<IdentityUser> userManager,
-        SignInManager<IdentityUser> signInManager)
+        UserManager<ApplicationUser> userManager,
+        SignInManager<ApplicationUser> signInManager)
     {
         _userManager = userManager;
         _signInManager = signInManager;

SecurityService.UserInterface/Pages/Account/Logout/Index.cshtml.cs

@@ -10,20 +10,21 @@
 
 namespace IdentityServerHost.Pages.Logout;
 
+using SecurityService.BusinessLogic;
 using System.Threading.Tasks;
 
 [SecurityHeaders]
 [AllowAnonymous]
 public class Index : PageModel
 {
-    private readonly SignInManager<IdentityUser> _signInManager;
+    private readonly SignInManager<ApplicationUser> _signInManager;
     private readonly IIdentityServerInteractionService _interaction;
     private readonly IEventService _events;
 
     [BindProperty] 
     public string LogoutId { get; set; }
 
-    public Index(SignInManager<IdentityUser> signInManager, IIdentityServerInteractionService interaction, IEventService events)
+    public Index(SignInManager<ApplicationUser> signInManager, IIdentityServerInteractionService interaction, IEventService events)
     {
         _signInManager = signInManager;
         _interaction = interaction;

SecurityService.UserInterface/Pages/ExternalLogin/Callback.cshtml.cs

@@ -1,4 +1,3 @@
-using System.Security.Claims;
 using Duende.IdentityServer;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
@@ -8,21 +7,23 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Security.Claims;
 
 namespace IdentityServerHost.Pages.ExternalLogin;
 
+using Microsoft.Extensions.Logging;
+using SecurityService.BusinessLogic;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 
 [AllowAnonymous]
 [SecurityHeaders]
 public class Callback : PageModel
 {
-    private readonly UserManager<IdentityUser> _userManager;
-    private readonly SignInManager<IdentityUser> _signInManager;
+    private readonly UserManager<ApplicationUser> _userManager;
+    private readonly SignInManager<ApplicationUser> _signInManager;
     private readonly IIdentityServerInteractionService _interaction;
     private readonly ILogger<Callback> _logger;
     private readonly IEventService _events;
@@ -31,8 +32,8 @@ public Callback(
         IIdentityServerInteractionService interaction,
         IEventService events,
         ILogger<Callback> logger,
-        UserManager<IdentityUser> userManager,
-        SignInManager<IdentityUser> signInManager)
+        UserManager<ApplicationUser> userManager,
+        SignInManager<ApplicationUser> signInManager)
     {
         _userManager = userManager;
         _signInManager = signInManager;
@@ -112,11 +113,11 @@ public async Task<IActionResult> OnGet()
         return Redirect(returnUrl);
     }
 
-    private async Task<IdentityUser> AutoProvisionUserAsync(string provider, string providerUserId, IEnumerable<Claim> claims)
+    private async Task<ApplicationUser> AutoProvisionUserAsync(string provider, string providerUserId, IEnumerable<Claim> claims)
     {
         var sub = Guid.NewGuid().ToString();
 
-        var user = new IdentityUser()
+        var user = new ApplicationUser()
         {
             Id = sub,
             UserName = sub, // don't need a username, since the user will be using an external provider to login