JSON Content Editor

Lombiq.JsonEditor.Test.UI/Extensions/TestCaseUITestContextExtensions.cs

@@ -25,7 +25,6 @@ public static class TestCaseUITestContextExtensions
 
     public static async Task TestJsonEditorBehaviorAsync(this UITestContext context)
     {
-        await context.EnableJsonEditorFeatureAsync();
         await context.EnableJsonContentEditorFeatureAsync();
 
         await context.ExecuteJsonEditorSampleRecipeDirectlyAsync();

Lombiq.JsonEditor/Controllers/AdminController.cs

@@ -32,7 +32,7 @@ public class AdminController : Controller
     private readonly INotifier _notifier;
     private readonly IPageTitleBuilder _pageTitleBuilder;
     private readonly IShapeFactory _shapeFactory;
-    private readonly IStringLocalizer<ApiController> _apiStringLocalizer;
+    private readonly Lazy<ApiController> _contentApiControllerLazy;
     private readonly IStringLocalizer<AdminController> T;
     private readonly IHtmlLocalizer<AdminController> H;
 
@@ -43,7 +43,7 @@ public AdminController(
         IPageTitleBuilder pageTitleBuilder,
         IShapeFactory shapeFactory,
         IOrchardServices<AdminController> services,
-        IStringLocalizer<ApiController> apiStringLocalizer)
+        Lazy<ApiController> contentApiControllerLazy)
     {
         _authorizationService = services.AuthorizationService.Value;
         _contentManager = services.ContentManager.Value;
@@ -52,7 +52,7 @@ public AdminController(
         _notifier = notifier;
         _pageTitleBuilder = pageTitleBuilder;
         _shapeFactory = shapeFactory;
-        _apiStringLocalizer = apiStringLocalizer;
+        _contentApiControllerLazy = contentApiControllerLazy;
         T = services.StringLocalizer.Value;
         H = services.HtmlLocalizer.Value;
     }
@@ -132,21 +132,23 @@ private Task<bool> CanEditAsync(ContentItem contentItem) =>
 
     private async Task<IActionResult> UpdateContentAsync(ContentItem contentItem, bool isDraft)
     {
+        // The Content API Controller requires the AccessContentApi permission. As this isn't an external API request it
+        // doesn't make sense to require this permission. So we create a temporary claims principal and explicitly grant
+        // the permission
         var currentUser = User;
         HttpContext.User = new ClaimsPrincipal(new ClaimsIdentity(User.Claims.Concat(Permissions.AccessContentApi)));
 
         try
         {
-            using var contentApiController = new ApiController(
-                _contentManager,
-                _contentDefinitionManager,
-                _authorizationService,
-                _apiStringLocalizer);
+            // Here the API controller is called directly. The behavior is the same as if we sent a POST request using a
+            // HTTP client (except the permission bypass above), but it's faster and more resource efficient.
+            var contentApiController = _contentApiControllerLazy.Value;
             contentApiController.ControllerContext.HttpContext = HttpContext;
             return await contentApiController.Post(contentItem, isDraft);
         }
         finally
         {
+            // Ensure that the original claims principal is restored, just in case.
             HttpContext.User = currentUser;
         }
     }

Lombiq.JsonEditor/Startup.cs

@@ -1,6 +1,5 @@
 using Lombiq.HelpfulLibraries.OrchardCore.DependencyInjection;
 using Lombiq.JsonEditor.Constants;
-using Lombiq.JsonEditor.Controllers;
 using Lombiq.JsonEditor.Drivers;
 using Lombiq.JsonEditor.Fields;
 using Lombiq.JsonEditor.Settings;
@@ -12,12 +11,15 @@
 using OrchardCore.Admin;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
+using OrchardCore.Contents.Controllers;
 using OrchardCore.ContentTypes.Editors;
 using OrchardCore.Modules;
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.ResourceManagement;
 using System;
 
+using AdminController = Lombiq.JsonEditor.Controllers.AdminController;
+
 namespace Lombiq.JsonEditor;
 
 public class Startup : StartupBase
@@ -43,6 +45,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IContentDisplayDriver, EditJsonActionsMenuContentDisplayDriver>();
         services.AddOrchardServices();
+        services.AddScoped<ApiController>();
     }
 
     public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) =>

Lombiq.JsonEditor/Views/Admin/Edit.cshtml

@@ -7,7 +7,7 @@
 
     var warning = new HtmlString(" ").Join(
         T["Be careful while editing a content item as any typo can lead to a loss of functionality."],
-        T["The submitted JSON will be deserialized and published so a properties may be altered or regenerated at that step."]);
+        T["The submitted JSON will be deserialized and published so properties may be altered or regenerated at that step."]);
 }
 
 <p class="alert alert-warning">@warning</p>

Readme.md

@@ -10,7 +10,7 @@ Do you want to quickly try out this project and see it in action? Check it out i
 
 ## Documentation
 
-### JSON editor
+### JSON Editor
 
 You can use the JSON editor either as a content field by adding a _Json Field_ to your content type, or by invoking the "JsonEditor" shape with the below tag helper:
 
@@ -39,7 +39,7 @@ The properties are:
 
 All attributes are optional. If neither content nor json is set, an empty object is taken as the content.
 
-### JSON content editor
+### JSON Content Editor
 
 The module also provides an editor for content items. This can be used to directly edit a content item as JSON data. This tool can be useful to inspect how the content item is serialized in the YesSql database without directly accessing the database or exporting the content item via deployment. It can also be used to edit properties that currently don't have an editor.