Added newtonsoft JSON

Author: scottbrady91

src/IdentityManager2/Api/Controllers/PageController.cs

@@ -21,15 +21,17 @@ public PageController(IdentityManagerOptions config)
 
         [HttpGet]
         [Route("", Name = IdentityManagerConstants.RouteNames.Home)]
-        public IActionResult Index()
+        public async Task<IActionResult> Index()
         {
+            var authResult = await HttpContext.AuthenticateAsync(config.SecurityConfiguration.HostAuthenticationType);
+
             return View("/Areas/IdentityManager/Pages/Index.cshtml", new PageModel
             {
                 PathBase = Request.PathBase,
                 Model = JsonConvert.SerializeObject(new
                 {
                     PathBase = Request.PathBase,
-                    ShowLoginButton = User.Identity.IsAuthenticated
+                    ShowLoginButton = !authResult.Succeeded
                 })
             });
         }
@@ -39,10 +41,10 @@ public IActionResult Index()
         [Route("api/login", Name = IdentityManagerConstants.RouteNames.Login)]
         public async Task<IActionResult> Login(string returnUrl)
         {
-            var result = await HttpContext.AuthenticateAsync(config.SecurityConfiguration.HostAuthenticationType);
-            if (result.Succeeded)
+            var authResult = await HttpContext.AuthenticateAsync(config.SecurityConfiguration.HostAuthenticationType);
+            if (authResult.Succeeded)
             {
-                await HttpContext.SignInAsync(IdentityManagerConstants.LocalApiScheme, result.Principal);
+                await HttpContext.SignInAsync(IdentityManagerConstants.LocalApiScheme, authResult.Principal);
                 return Redirect(returnUrl);
             }
 

src/IdentityManager2/Api/Controllers/UsersController.cs

@@ -16,7 +16,7 @@
 namespace IdentityManager2.Api.Controllers
 {
     [Route(IdentityManagerConstants.UserRoutePrefix)]
-    [Authorize(IdentityManagerConstants.IdMgrAuthPolicy)] // TODO: Ensure schemes configurable (e.g. re-add OAuth)
+    [Authorize(IdentityManagerConstants.IdMgrAuthPolicy)]
     [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
     public class UsersController : Controller
     {

src/IdentityManager2/Assets/Scripts/Bundle.js

@@ -25,7 +25,8 @@ public static IIdentityManagerBuilder AddIdentityManager(this IServiceCollection
 
             var builder = services.AddIdentityManagerBuilder();
 
-            builder.Services.AddControllersWithViews();
+            builder.Services.AddControllersWithViews()
+                .AddNewtonsoftJson();
 
             builder.Services.AddOptions();
             builder.Services.AddSingleton(identityManagerOptions);

src/IdentityManager2/Configuration/DependencyInjection/IdentityManagerServiceCollectionExtensions.cs

@@ -52,6 +52,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="AutoMapper" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.0" />