back to regular OK,BadREquest plain responses and more using AddJsonOptions/options.JsonSerializerOptions.TypeInfoResolverChain combo

ChaosEngine · ChaosEngine · commit 6ade96f828cb · 2023-11-17T22:56:43.000+01:00
diff --git a/src/IdentityManager2/Api/Controllers/MetaController.cs b/src/IdentityManager2/Api/Controllers/MetaController.cs
@@ -55,11 +55,11 @@ public async Task<IActionResult> Get()
                 links["createRole"] = new CreateRoleLink(Url, meta.RoleMetadata);
             }
 
-            return Json(new MetaResult
+            return Ok(new MetaResult
             {
                 Data = data,
                 Links = links
-            }, MetaResult_Context.Default.Options);
+            });
         }
     }
 }
diff --git a/src/IdentityManager2/Api/Controllers/RolesController.cs b/src/IdentityManager2/Api/Controllers/RolesController.cs
@@ -16,7 +16,7 @@ namespace IdentityManager2.Api.Controllers
 {
     [Route(IdentityManagerConstants.RoleRoutePrefix)]
     [Authorize(IdentityManagerConstants.IdMgrAuthPolicy)]
-    [ResponseCache(NoStore=true, Location=ResponseCacheLocation.None)]
+    [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
     public class RolesController : Controller
     {
         private readonly IIdentityManagerService service;
@@ -55,7 +55,7 @@ public async Task<IActionResult> GetRolesAsync(string filter = null, int start =
             {
                 try
                 {
-                    return Json(new RoleQueryResultResource(result.Result, Url, meta.RoleMetadata), RoleQueryResultResource_Context.Default.Options);
+                    return Ok(new RoleQueryResultResource(result.Result, Url, meta.RoleMetadata));
                 }
                 catch (Exception exp)
                 {
@@ -68,7 +68,7 @@ public async Task<IActionResult> GetRolesAsync(string filter = null, int start =
 
         // POST 
         [HttpPost, Route("", Name = IdentityManagerConstants.RouteNames.CreateRole)]
-        public async Task<IActionResult> CreateRoleAsync([FromBody]PropertyValue[] properties)
+        public async Task<IActionResult> CreateRoleAsync([FromBody] PropertyValue[] properties)
         {
             var meta = await GetMetadataAsync();
             if (!meta.RoleMetadata.SupportsCreate)
@@ -95,7 +95,7 @@ public async Task<IActionResult> CreateRoleAsync([FromBody]PropertyValue[] prope
                         Data = new AnonymousSubject { subject = result.Result.Subject },
                         Links = new AnonymousDetail { detail = url }
                     };
-                    return Created(url, JsonSerializer.Serialize(resource, AnonymousCreatedRole_Context.Default.AnonymousCreatedRole));
+                    return Created(url, resource);
                 }
 
                 ModelState.AddModelError("", errors.ToString());
@@ -109,7 +109,7 @@ public async Task<IActionResult> GetRoleAsync(string subject)
         {
             if (IsNullOrWhiteSpace(subject))
             {
-                ModelState["subject.String"].Errors.Clear();
+                ModelState["subject.String"]?.Errors.Clear();
                 ModelState.AddModelError("", Messages.SubjectRequired);
             }
 
@@ -133,9 +133,7 @@ public async Task<IActionResult> GetRoleAsync(string subject)
                     return NotFound();
                 }
 
-                var response = Json(new RoleDetailResource(result.Result, Url, meta.RoleMetadata), RoleDetailResource_Context.Default.Options);
-
-
+                var response = Ok(new RoleDetailResource(result.Result, Url, meta.RoleMetadata));
                 return response;
             }
             return BadRequest(result.ToError());
@@ -169,7 +167,7 @@ public async Task<IActionResult> SetPropertyAsync(string subject, string type)
         {
             if (IsNullOrWhiteSpace(subject))
             {
-                ModelState["subject.String"].Errors.Clear();
+                ModelState["subject.String"]?.Errors.Clear();
                 ModelState.AddModelError("", Messages.SubjectRequired);
             }
 
diff --git a/src/IdentityManager2/Api/Controllers/UsersController.cs b/src/IdentityManager2/Api/Controllers/UsersController.cs
@@ -10,7 +10,6 @@
 using IdentityManager2.Resources;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
 using static System.String;
 
 namespace IdentityManager2.Api.Controllers
@@ -27,7 +26,7 @@ public UsersController(IIdentityManagerService service)
         {
             this.service = service ?? throw new ArgumentNullException(nameof(service));
         }
-        
+
         public async Task<IdentityManagerMetadata> GetMetadataAsync()
         {
             if (metadata == null)
@@ -49,7 +48,7 @@ public async Task<IActionResult> GetUsersAsync(string filter = null, int start =
                 var meta = await GetMetadataAsync();
 
                 var resource = new UserQueryResultResource(result.Result, Url, meta.UserMetadata);
-                return Json(resource, UserQueryResultResource_Context.Default.Options);
+                return Ok(resource);
             }
 
             return BadRequest(result.ToError());
@@ -76,19 +75,19 @@ public async Task<IActionResult> CreateUserAsync([FromBody] PropertyValue[] prop
                 var result = await service.CreateUserAsync(properties);
                 if (result.IsSuccess)
                 {
-                    var url = Url.Link(IdentityManagerConstants.RouteNames.GetUser, new AnonymousSubject {subject = result.Result.Subject});
+                    var url = Url.Link(IdentityManagerConstants.RouteNames.GetUser, new AnonymousSubject { subject = result.Result.Subject });
                     var resource = new AnonymousCreatedUser
                     {
-                        Data = new AnonymousSubject {subject = result.Result.Subject},
-                        Links = new AnonymousDetail {detail = url}
+                        Data = new AnonymousSubject { subject = result.Result.Subject },
+                        Links = new AnonymousDetail { detail = url }
                     };
 
-                    return Created(url, JsonSerializer.Serialize(resource, AnonymousCreatedUser_Context.Default.AnonymousCreatedUser));
+                    return Created(url, resource);
                 }
 
                 ModelState.AddModelError("errors", result.Errors.Aggregate((workingSentence, next) => workingSentence + " " + next));
-                if(result.Errors.Count > 0)
-                    return BadRequest(JsonSerializer.Serialize(ModelState, ModelStateDictionary_Context.Default.ModelStateDictionary));
+                if (result.Errors.Count > 0)
+                    return BadRequest(ModelState);
             }
 
             return BadRequest(400);
@@ -99,7 +98,7 @@ public async Task<IActionResult> GetUserAsync(string subject)
         {
             if (IsNullOrWhiteSpace(subject))
             {
-                ModelState["subject.String"].Errors.Clear();
+                ModelState["subject.String"]?.Errors.Clear();
                 ModelState.AddModelError("", Messages.SubjectRequired);
             }
 
@@ -129,7 +128,7 @@ public async Task<IActionResult> GetUserAsync(string subject)
                     roles = roleResult.Result.Items.ToArray();
                 }
 
-                return Json(new UserDetailResource(result.Result, Url, meta, roles), UserDetailResource_Context.Default.Options);
+                return Ok(new UserDetailResource(result.Result, Url, meta, roles));
             }
 
             return BadRequest(result.ToError());
@@ -146,7 +145,7 @@ public async Task<IActionResult> DeleteUserAsync(string subject)
 
             if (IsNullOrWhiteSpace(subject))
             {
-                ModelState["subject.String"].Errors.Clear();
+                ModelState["subject.String"]?.Errors.Clear();
                 ModelState.AddModelError("", Messages.SubjectRequired);
             }
 
@@ -169,7 +168,7 @@ public async Task<IActionResult> SetPropertyAsync(string subject, string type)
         {
             if (IsNullOrWhiteSpace(subject))
             {
-                ModelState["subject.String"].Errors.Clear();
+                ModelState["subject.String"]?.Errors.Clear();
                 ModelState.AddModelError("", Messages.SubjectRequired);
             }
 
@@ -205,7 +204,7 @@ public async Task<IActionResult> AddClaimAsync(string subject, [FromBody] ClaimV
 
             if (IsNullOrWhiteSpace(subject))
             {
-                ModelState["subject.String"].Errors.Clear();
+                ModelState["subject.String"]?.Errors.Clear();
                 ModelState.AddModelError("", Messages.SubjectRequired);
             }
 
@@ -225,7 +224,7 @@ public async Task<IActionResult> AddClaimAsync(string subject, [FromBody] ClaimV
 
                 ModelState.AddErrors(result);
             }
-            
+
             return BadRequest(ModelState.ToError());
         }
 
diff --git a/src/IdentityManager2/Api/Models/JsonSerializers.cs b/src/IdentityManager2/Api/Models/JsonSerializers.cs
@@ -78,4 +78,20 @@ public partial class AnonymousCreatedUser_Context : JsonSerializerContext { }
 
 [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
 [JsonSerializable(typeof(ModelStateDictionary))]
-public partial class ModelStateDictionary_Context : JsonSerializerContext { }
+public partial class ModelStateDictionary_Context : JsonSerializerContext { }
+
+
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(ErrorModel))]
+public partial class ErrorModel_Context : JsonSerializerContext { }
+
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(List<string>))]
+public partial class ListStringErrors_Context : JsonSerializerContext { }
+
+
+
+
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Microsoft.AspNetCore.Mvc.SerializableError))]
+public partial class SerializableError_Context : JsonSerializerContext { }
diff --git a/src/IdentityManager2/Configuration/DependencyInjection/IdentityManagerServiceCollectionExtensions.cs b/src/IdentityManager2/Configuration/DependencyInjection/IdentityManagerServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Threading.Tasks;
 using IdentityManager2;
 using IdentityManager2.Configuration;
@@ -23,6 +24,18 @@ public static IIdentityManagerBuilder AddIdentityManager(this IServiceCollection
             {
                 options.JsonSerializerOptions.TypeInfoResolverChain.Add(ArrayPropertyValue_Context.Default);
                 options.JsonSerializerOptions.TypeInfoResolverChain.Add(ClaimValue_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(UserQueryResultResource_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(ErrorModel_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(MetaResult_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(UserDetailResource_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(ListStringErrors_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(ModelStateDictionary_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(AnonymousCreatedUser_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(MetaResult_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(RoleQueryResultResource_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(AnonymousCreatedRole_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(RoleDetailResource_Context.Default);
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(SerializableError_Context.Default);
             });
 
             if (!string.IsNullOrEmpty(identityManagerOptions.SecurityConfiguration.AuthenticationScheme))

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ public async Task<IActionResult> Get()`
`55`	`55`	`links["createRole"] = new CreateRoleLink(Url, meta.RoleMetadata);`
`56`	`56`	`}`
`57`	`57`
`58`		`- return Json(new MetaResult`
	`58`	`+ return Ok(new MetaResult`
`59`	`59`	`{`
`60`	`60`	`Data = data,`
`61`	`61`	`Links = links`
`62`		`- }, MetaResult_Context.Default.Options);`
	`62`	`+ });`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace IdentityManager2.Api.Controllers`
`16`	`16`	`{`
`17`	`17`	`[Route(IdentityManagerConstants.RoleRoutePrefix)]`
`18`	`18`	`[Authorize(IdentityManagerConstants.IdMgrAuthPolicy)]`
`19`		`- [ResponseCache(NoStore=true, Location=ResponseCacheLocation.None)]`
	`19`	`+ [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]`
`20`	`20`	`public class RolesController : Controller`
`21`	`21`	`{`
`22`	`22`	`private readonly IIdentityManagerService service;`
`@@ -55,7 +55,7 @@ public async Task<IActionResult> GetRolesAsync(string filter = null, int start =`
`55`	`55`	`{`
`56`	`56`	`try`
`57`	`57`	`{`
`58`		`- return Json(new RoleQueryResultResource(result.Result, Url, meta.RoleMetadata), RoleQueryResultResource_Context.Default.Options);`
	`58`	`+ return Ok(new RoleQueryResultResource(result.Result, Url, meta.RoleMetadata));`
`59`	`59`	`}`
`60`	`60`	`catch (Exception exp)`
`61`	`61`	`{`
`@@ -68,7 +68,7 @@ public async Task<IActionResult> GetRolesAsync(string filter = null, int start =`
`68`	`68`
`69`	`69`	`// POST`
`70`	`70`	`[HttpPost, Route("", Name = IdentityManagerConstants.RouteNames.CreateRole)]`
`71`		`- public async Task<IActionResult> CreateRoleAsync([FromBody]PropertyValue[] properties)`
	`71`	`+ public async Task<IActionResult> CreateRoleAsync([FromBody] PropertyValue[] properties)`
`72`	`72`	`{`
`73`	`73`	`var meta = await GetMetadataAsync();`
`74`	`74`	`if (!meta.RoleMetadata.SupportsCreate)`
`@@ -95,7 +95,7 @@ public async Task<IActionResult> CreateRoleAsync([FromBody]PropertyValue[] prope`
`95`	`95`	`Data = new AnonymousSubject { subject = result.Result.Subject },`
`96`	`96`	`Links = new AnonymousDetail { detail = url }`
`97`	`97`	`};`
`98`		`- return Created(url, JsonSerializer.Serialize(resource, AnonymousCreatedRole_Context.Default.AnonymousCreatedRole));`
	`98`	`+ return Created(url, resource);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`ModelState.AddModelError("", errors.ToString());`
`@@ -109,7 +109,7 @@ public async Task<IActionResult> GetRoleAsync(string subject)`
`109`	`109`	`{`
`110`	`110`	`if (IsNullOrWhiteSpace(subject))`
`111`	`111`	`{`
`112`		`- ModelState["subject.String"].Errors.Clear();`
	`112`	`+ ModelState["subject.String"]?.Errors.Clear();`
`113`	`113`	`ModelState.AddModelError("", Messages.SubjectRequired);`
`114`	`114`	`}`
`115`	`115`
`@@ -133,9 +133,7 @@ public async Task<IActionResult> GetRoleAsync(string subject)`
`133`	`133`	`return NotFound();`
`134`	`134`	`}`
`135`	`135`
`136`		`- var response = Json(new RoleDetailResource(result.Result, Url, meta.RoleMetadata), RoleDetailResource_Context.Default.Options);`
`137`		`-`
`138`		`-`
	`136`	`+ var response = Ok(new RoleDetailResource(result.Result, Url, meta.RoleMetadata));`
`139`	`137`	`return response;`
`140`	`138`	`}`
`141`	`139`	`return BadRequest(result.ToError());`
`@@ -169,7 +167,7 @@ public async Task<IActionResult> SetPropertyAsync(string subject, string type)`
`169`	`167`	`{`
`170`	`168`	`if (IsNullOrWhiteSpace(subject))`
`171`	`169`	`{`
`172`		`- ModelState["subject.String"].Errors.Clear();`
	`170`	`+ ModelState["subject.String"]?.Errors.Clear();`
`173`	`171`	`ModelState.AddModelError("", Messages.SubjectRequired);`
`174`	`172`	`}`
`175`	`173`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`using IdentityManager2.Resources;`
`11`	`11`	`using Microsoft.AspNetCore.Authorization;`
`12`	`12`	`using Microsoft.AspNetCore.Mvc;`
`13`		`-using Microsoft.AspNetCore.Mvc.ModelBinding;`
`14`	`13`	`using static System.String;`
`15`	`14`
`16`	`15`	`namespace IdentityManager2.Api.Controllers`
`@@ -27,7 +26,7 @@ public UsersController(IIdentityManagerService service)`
`27`	`26`	`{`
`28`	`27`	`this.service = service ?? throw new ArgumentNullException(nameof(service));`
`29`	`28`	`}`
`30`		`-`
	`29`	`+`
`31`	`30`	`public async Task<IdentityManagerMetadata> GetMetadataAsync()`
`32`	`31`	`{`
`33`	`32`	`if (metadata == null)`
`@@ -49,7 +48,7 @@ public async Task<IActionResult> GetUsersAsync(string filter = null, int start =`
`49`	`48`	`var meta = await GetMetadataAsync();`
`50`	`49`
`51`	`50`	`var resource = new UserQueryResultResource(result.Result, Url, meta.UserMetadata);`
`52`		`- return Json(resource, UserQueryResultResource_Context.Default.Options);`
	`51`	`+ return Ok(resource);`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`return BadRequest(result.ToError());`
`@@ -76,19 +75,19 @@ public async Task<IActionResult> CreateUserAsync([FromBody] PropertyValue[] prop`
`76`	`75`	`var result = await service.CreateUserAsync(properties);`
`77`	`76`	`if (result.IsSuccess)`
`78`	`77`	`{`
`79`		`- var url = Url.Link(IdentityManagerConstants.RouteNames.GetUser, new AnonymousSubject {subject = result.Result.Subject});`
	`78`	`+ var url = Url.Link(IdentityManagerConstants.RouteNames.GetUser, new AnonymousSubject { subject = result.Result.Subject });`
`80`	`79`	`var resource = new AnonymousCreatedUser`
`81`	`80`	`{`
`82`		`- Data = new AnonymousSubject {subject = result.Result.Subject},`
`83`		`- Links = new AnonymousDetail {detail = url}`
	`81`	`+ Data = new AnonymousSubject { subject = result.Result.Subject },`
	`82`	`+ Links = new AnonymousDetail { detail = url }`
`84`	`83`	`};`
`85`	`84`
`86`		`- return Created(url, JsonSerializer.Serialize(resource, AnonymousCreatedUser_Context.Default.AnonymousCreatedUser));`
	`85`	`+ return Created(url, resource);`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`ModelState.AddModelError("errors", result.Errors.Aggregate((workingSentence, next) => workingSentence + " " + next));`
`90`		`- if(result.Errors.Count > 0)`
`91`		`- return BadRequest(JsonSerializer.Serialize(ModelState, ModelStateDictionary_Context.Default.ModelStateDictionary));`
	`89`	`+ if (result.Errors.Count > 0)`
	`90`	`+ return BadRequest(ModelState);`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`return BadRequest(400);`
`@@ -99,7 +98,7 @@ public async Task<IActionResult> GetUserAsync(string subject)`
`99`	`98`	`{`
`100`	`99`	`if (IsNullOrWhiteSpace(subject))`
`101`	`100`	`{`
`102`		`- ModelState["subject.String"].Errors.Clear();`
	`101`	`+ ModelState["subject.String"]?.Errors.Clear();`
`103`	`102`	`ModelState.AddModelError("", Messages.SubjectRequired);`
`104`	`103`	`}`
`105`	`104`
`@@ -129,7 +128,7 @@ public async Task<IActionResult> GetUserAsync(string subject)`
`129`	`128`	`roles = roleResult.Result.Items.ToArray();`
`130`	`129`	`}`
`131`	`130`
`132`		`- return Json(new UserDetailResource(result.Result, Url, meta, roles), UserDetailResource_Context.Default.Options);`
	`131`	`+ return Ok(new UserDetailResource(result.Result, Url, meta, roles));`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`return BadRequest(result.ToError());`
`@@ -146,7 +145,7 @@ public async Task<IActionResult> DeleteUserAsync(string subject)`
`146`	`145`
`147`	`146`	`if (IsNullOrWhiteSpace(subject))`
`148`	`147`	`{`
`149`		`- ModelState["subject.String"].Errors.Clear();`
	`148`	`+ ModelState["subject.String"]?.Errors.Clear();`
`150`	`149`	`ModelState.AddModelError("", Messages.SubjectRequired);`
`151`	`150`	`}`
`152`	`151`
`@@ -169,7 +168,7 @@ public async Task<IActionResult> SetPropertyAsync(string subject, string type)`
`169`	`168`	`{`
`170`	`169`	`if (IsNullOrWhiteSpace(subject))`
`171`	`170`	`{`
`172`		`- ModelState["subject.String"].Errors.Clear();`
	`171`	`+ ModelState["subject.String"]?.Errors.Clear();`
`173`	`172`	`ModelState.AddModelError("", Messages.SubjectRequired);`
`174`	`173`	`}`
`175`	`174`
`@@ -205,7 +204,7 @@ public async Task<IActionResult> AddClaimAsync(string subject, [FromBody] ClaimV`
`205`	`204`
`206`	`205`	`if (IsNullOrWhiteSpace(subject))`
`207`	`206`	`{`
`208`		`- ModelState["subject.String"].Errors.Clear();`
	`207`	`+ ModelState["subject.String"]?.Errors.Clear();`
`209`	`208`	`ModelState.AddModelError("", Messages.SubjectRequired);`
`210`	`209`	`}`
`211`	`210`
`@@ -225,7 +224,7 @@ public async Task<IActionResult> AddClaimAsync(string subject, [FromBody] ClaimV`
`225`	`224`
`226`	`225`	`ModelState.AddErrors(result);`
`227`	`226`	`}`
`228`		`-`
	`227`	`+`
`229`	`228`	`return BadRequest(ModelState.ToError());`
`230`	`229`	`}`
`231`	`230`