From 590ca4ef56750caf7ede081e014da0cbfbcb1be4 Mon Sep 17 00:00:00 2001
From: cypherbeerus <ayushjain9501@gmail.com>
Date: Tue, 20 Jul 2021 20:30:20 +0530
Subject: [PATCH] add support for uploading multiple files to server

---
 .../Controllers/ServerController.Storage.cs   | 43 +++++++++++++------
 BTCPayServer/Views/Server/Files.cshtml        | 10 ++---
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/BTCPayServer/Controllers/ServerController.Storage.cs b/BTCPayServer/Controllers/ServerController.Storage.cs
index 495a884a9..5ac8f4eed 100644
--- a/BTCPayServer/Controllers/ServerController.Storage.cs
+++ b/BTCPayServer/Controllers/ServerController.Storage.cs
@@ -148,23 +148,42 @@ namespace BTCPayServer.Controllers
 
 
         [HttpPost("server/files/upload")]
-        public async Task<IActionResult> CreateFile(IFormFile file)
+        public async Task<IActionResult> CreateFile(List<IFormFile> files)
         {
-            if (!file.FileName.IsValidFileName())
+            if (files.Count > 0)
             {
-                this.TempData.SetStatusMessageModel(new StatusMessageModel()
+                List<string> fileIds = new List<string>();
+                foreach (IFormFile file in files)
                 {
-                    Message = "Invalid file name",
-                    Severity = StatusMessageModel.StatusSeverity.Error
-                });
+                    if (!file.FileName.IsValidFileName())
+                    {
+                        this.TempData.SetStatusMessageModel(new StatusMessageModel()
+                        {
+                            Message = "Invalid file name",
+                            Severity = StatusMessageModel.StatusSeverity.Error
+                        });
+                        continue;
+                    }
+                    var newFile = await _FileService.AddFile(file, GetUserId());
+                    fileIds.Add(newFile.Id);
+                }
+                if (fileIds.Count == 1)
+                {
+                    return RedirectToAction(nameof(Files), new
+                    {
+                        statusMessage = "File added!",
+                        fileId = fileIds[0]
+                    });
+                }
+                else
+                {
+                    return RedirectToAction(nameof(Files));
+                }
+            }
+            else
+            {
                 return RedirectToAction(nameof(Files));
             }
-            var newFile = await _FileService.AddFile(file, GetUserId());
-            return RedirectToAction(nameof(Files), new
-            {
-                statusMessage = "File added!",
-                fileId = newFile.Id
-            });
         }
 
         private string GetUserId()
diff --git a/BTCPayServer/Views/Server/Files.cshtml b/BTCPayServer/Views/Server/Files.cshtml
index 3388ec306..e82b46eaa 100644
--- a/BTCPayServer/Views/Server/Files.cshtml
+++ b/BTCPayServer/Views/Server/Files.cshtml
@@ -92,9 +92,9 @@ else
 
 @if (Model.StorageConfigured)
 {
-    <form asp-action="CreateFile" method="post" enctype="multipart/form-data">
-        <h4 class="mt-5 mb-3">Upload File</h4>
-        <input type="file" class="form-control mb-3" name="file" id="file" required>
-        <button class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Upload file</button>
-    </form>
+<form asp-action="CreateFile" method="post" enctype="multipart/form-data">
+    <h4 class="mt-5 mb-3">Upload Files</h4>
+    <input multiple type="file" class="form-control mb-3" name="files" id="file" required>
+    <button class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Upload files</button>
+</form>
 }