Removing invalid [FromForm] from TenantApiController.Setup (#16439)

OrchardCMS · Jul 14, 2024 · 29cd5fb · 29cd5fb
1 parent be2d46b
commit 29cd5fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs
@@ -295,7 +295,7 @@ public async Task<IActionResult> Remove(string tenantName)
 
         [HttpPost]
         [Route("setup")]
-        public async Task<ActionResult> Setup(SetupApiViewModel model, [FromForm] IFormFile recipe = null)
+        public async Task<ActionResult> Setup(SetupApiViewModel model)
         {
             if (!_currentShellSettings.IsDefaultShell())
             {
@@ -393,17 +393,14 @@ public async Task<ActionResult> Setup(SetupApiViewModel model, [FromForm] IFormF
 
             if (string.IsNullOrEmpty(recipeName))
             {
-                if (recipe == null)
+                if (model.Recipe == null)
                 {
                     return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
                 }
 
                 var tempFilename = Path.GetTempFileName();
 
-                using (var fs = System.IO.File.Create(tempFilename))
-                {
-                    await recipe.CopyToAsync(fs);
-                }
+                await System.IO.File.WriteAllTextAsync(tempFilename, model.Recipe);
 
                 var fileProvider = new PhysicalFileProvider(Path.GetDirectoryName(tempFilename));
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/SetupApiViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/SetupApiViewModel.cs
@@ -25,8 +25,16 @@ public class SetupApiViewModel
         [DataType(DataType.Password)]
         public string Password { get; set; }
 
+        /// <summary>
+        /// The name of a recipe available in the app.
+        /// </summary>
         public string RecipeName { get; set; }
 
+        /// <summary>
+        /// A JSON string representing a custom recipe.
+        /// </summary>
+        public string Recipe { get; set; }
+
         public string SiteTimeZone { get; set; }
 
         public string Schema { get; set; }