Merge branch 'task/system-text-json-migration' into issue/OCC-245

Lombiq · Jun 14, 2024 · 9757e72 · 9757e72
2 parents fc17d30 + 0dd3850
commit 9757e72
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 36 deletions.
diff --git a/Lombiq.JsonEditor.Test.UI/License.md b/Lombiq.JsonEditor.Test.UI/License.md
diff --git a/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj b/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj
@@ -13,7 +13,7 @@
     <PackageTags>OrchardCore;Lombiq;AspNetCore;JSONEditor</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Orchard-JSON-Editor</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Orchard-JSON-Editor/tree/dev/Lombiq.JSONEditor.Tests.UI</PackageProjectUrl>
-    <PackageLicenseFile>License.md</PackageLicenseFile>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="License.md" Pack="true" PackagePath="" />
     <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
     <None Include="Readme.md" />
   </ItemGroup>

diff --git a/Lombiq.JsonEditor/Controllers/AdminController.cs b/Lombiq.JsonEditor/Controllers/AdminController.cs
@@ -66,6 +66,8 @@ public AdminController(
     [Admin("Contents/ContentItems/{contentItemId}/Edit/Json")]
     public async Task<IActionResult> Edit(string contentItemId)
     {
+        if (!ModelState.IsValid) return BadRequest(ModelState);
+
         if (string.IsNullOrWhiteSpace(contentItemId) ||
             await _contentManager.GetAsync(contentItemId, VersionOptions.Latest) is not { } contentItem ||
             !await CanEditAsync(contentItem))
@@ -95,6 +97,8 @@ public async Task<IActionResult> EditPost(
         [Bind(Prefix = "submit.Publish")] string submitPublish,
         [Bind(Prefix = "submit.Save")] string submitSave)
     {
+        if (!ModelState.IsValid) return BadRequest(ModelState);
+
         if (string.IsNullOrWhiteSpace(contentItemId) ||
             string.IsNullOrWhiteSpace(json) ||
             JsonSerializer.Deserialize<ContentItem>(json) is not { } contentItem)

diff --git a/Lombiq.JsonEditor/License.md b/Lombiq.JsonEditor/License.md
diff --git a/Lombiq.JsonEditor/Lombiq.JsonEditor.csproj b/Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
@@ -17,11 +17,10 @@
     <PackageTags>OrchardCore;Lombiq;AspNetCore;JSONEditor</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Orchard-JSON-Editor</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Orchard-JSON-Editor</PackageProjectUrl>
-    <PackageLicenseFile>License.md</PackageLicenseFile>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="License.md" Pack="true" PackagePath="" />
     <None Include="..\Readme.md" Link="Readme.md" />
     <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
   </ItemGroup>

diff --git a/Lombiq.JsonEditor/Models/JsonEditorOptions.cs b/Lombiq.JsonEditor/Models/JsonEditorOptions.cs
@@ -46,7 +46,7 @@ public JsonEditorMode Mode
         set => ModeString = GetModeString(value);
     }
 
-    public IEnumerable<string> Modes { get; set; } = new[] { "tree", "view", "form", "code", "text", "preview" };
+    public IEnumerable<string> Modes { get; set; } = ["tree", "view", "form", "code", "text", "preview"];
 
     /// <summary>
     /// Gets or sets the JSON Schema to validate against. A JSON schema describes the structure that a JSON object must
@@ -117,8 +117,8 @@ private static string GetModeString(JsonEditorMode mode) =>
     public static JsonEditorOptions GetSample(IHtmlLocalizer localizer) =>
         new()
         {
-            Templates = new[]
-            {
+            Templates =
+            [
                 new JsonEditorTemplate
                 {
                     Field = "aTechnicalNameThatHasToBeUnique",
@@ -128,6 +128,6 @@ public static JsonEditorOptions GetSample(IHtmlLocalizer localizer) =>
                         .Value,
                     Value = new { YourObject = "goes here" },
                 },
-            },
+            ],
         };
 }
diff --git a/Lombiq.JsonEditor/Services/JsonEditorContentSecurityPolicyProvider.cs b/Lombiq.JsonEditor/Services/JsonEditorContentSecurityPolicyProvider.cs
@@ -1,4 +1,4 @@
-using Lombiq.HelpfulLibraries.AspNetCore.Security;
+using Lombiq.HelpfulLibraries.AspNetCore.Security;
 using Lombiq.JsonEditor.Constants;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,7 +18,7 @@ public class JsonEditorContentSecurityPolicyProvider : ResourceManagerContentSec
 {
     protected override string ResourceType => "script";
     protected override string ResourceName => ResourceNames.Library;
-    protected override IReadOnlyCollection<string> DirectiveNameChain { get; } = new[] { WorkerSrc, ScriptSrc };
+    protected override IReadOnlyCollection<string> DirectiveNameChain { get; } = [WorkerSrc, ScriptSrc];
     protected override string DirectiveValue => $"{Blob} {Data}";
 
     protected override ValueTask ThenUpdateAsync(