Merge pull request #12 from ChaosEngine/No-NewtonsoftJson

Removed use of Newtonsoft.Json

Author: scottbrady91

src/IdentityManager2/Api/Controllers/PageController.cs

@@ -1,12 +1,12 @@
 using System;
+using System.Text.Json;
 using System.Threading.Tasks;
 using IdentityManager2.Api.Models;
 using IdentityManager2.Configuration;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
 
 namespace IdentityManager2.Api.Controllers
 {
@@ -29,7 +29,7 @@ public async Task<IActionResult> Index()
             return View("/Areas/IdentityManager/Pages/Index.cshtml", new PageModel
             {
                 PathBase = Request.PathBase,
-                Model = JsonConvert.SerializeObject(new
+                Model = JsonSerializer.Serialize(new PageModelParams
                 {
                     PathBase = Request.PathBase,
                     ShowLoginButton = !authResult.Succeeded

src/IdentityManager2/Api/Models/PageModel.cs

@@ -5,4 +5,11 @@ public class PageModel
         public string PathBase { get; set; }
         public string Model { get; set; }
     }
+
+    class PageModelParams
+    {
+        public string PathBase { get; set; }
+        public bool ShowLoginButton { get; set; }
+        public string TitleNavBarLinkTarget { get; set; }
+    }
 }

src/IdentityManager2/Api/Models/RoleQueryResultResource.cs

@@ -29,10 +29,8 @@ public RoleQueryResultResource(QueryResult<RoleSummary> result, IUrlHelper url,
         }
     }
 
-    public class RoleQueryResultResourceData : QueryResult<RoleSummary>
+    public class RoleQueryResultResourceData : QueryResult<RoleResultResource>
     {
-        public new IEnumerable<RoleResultResource> Items { get; set; }
-
         public RoleQueryResultResourceData(QueryResult<RoleSummary> result, IUrlHelper url, RoleMetadata meta)
         {
             if (result == null) throw new ArgumentNullException(nameof(result));

src/IdentityManager2/Api/Models/UserQueryResultResource.cs

@@ -30,10 +30,8 @@ public UserQueryResultResource(QueryResult<UserSummary> result, IUrlHelper url,
         }
     }
 
-    public class UserQueryResultResourceData : QueryResult<UserSummary>
+    public class UserQueryResultResourceData : QueryResult<UserResultResource>
     {
-        public new IEnumerable<UserResultResource> Items { get; set; }
-
         public UserQueryResultResourceData(QueryResult<UserSummary> result, IUrlHelper url, UserMetadata meta)
         {
             if (result == null) throw new ArgumentNullException(nameof(result));

src/IdentityManager2/Assets/EmbeddedHtmlResult.cs

@@ -1,9 +1,10 @@
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
+using IdentityManager2.Api.Models;
 using IdentityManager2.Configuration;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
 
 namespace IdentityManager2.Assets
 {
@@ -26,7 +27,7 @@ public async Task ExecuteResultAsync(ActionContext context)
                 new
                 {
                     pathBase = path,
-                    model = JsonConvert.SerializeObject(new
+                    model = JsonSerializer.Serialize(new PageModelParams
                     {
                         PathBase = path,
                         ShowLoginButton = securityConfiguration.ShowLoginButton

src/IdentityManager2/Assets/Scripts/App/ttIdmUsers.js

@@ -85,7 +85,7 @@
                 var props = properties.map(function (item) {
                     return {
                         type: item.meta.type,
-                        value: item.data
+                        value: item.data.toString()
                     };
                 });
                 idmUsers.createUser(props)

src/IdentityManager2/Assets/Scripts/Bundle.js

@@ -16,9 +16,8 @@ public static IIdentityManagerBuilder AddIdentityManager(this IServiceCollection
             var identityManagerOptions = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityManagerOptions>>().Value;
             identityManagerOptions.Validate();
 
-            services.AddControllersWithViews()
-                .AddNewtonsoftJson();
-            
+            services.AddControllersWithViews();
+
             // IdentityManager API authentication scheme
             services.AddAuthentication()
                 .AddCookie(IdentityManagerConstants.LocalApiScheme, options =>

src/IdentityManager2/Configuration/DependencyInjection/IdentityManagerServiceCollectionExtensions.cs

@@ -37,8 +37,6 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>