moved FindUploadedFiles in RequestEvent

tools/router/event.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/pocketbase/pocketbase/tools/filesystem"
 	"github.com/pocketbase/pocketbase/tools/hook"
 	"github.com/pocketbase/pocketbase/tools/picker"
 	"github.com/pocketbase/pocketbase/tools/store"
@@ -126,6 +127,34 @@ func (e *Event) UnsafeRealIP() string {
 	return e.RemoteIP()
 }
 
+// FindUploadedFiles extracts all form files of "key" from a http request
+// and returns a slice with filesystem.File instances (if any).
+func (e *Event) FindUploadedFiles(key string) ([]*filesystem.File, error) {
+	if e.Request.MultipartForm == nil {
+		err := e.Request.ParseMultipartForm(DefaultMaxMemory)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if e.Request.MultipartForm == nil || e.Request.MultipartForm.File == nil || len(e.Request.MultipartForm.File[key]) == 0 {
+		return nil, http.ErrMissingFile
+	}
+
+	result := make([]*filesystem.File, 0, len(e.Request.MultipartForm.File[key]))
+
+	for _, fh := range e.Request.MultipartForm.File[key] {
+		file, err := filesystem.NewFileFromMultipart(fh)
+		if err != nil {
+			return nil, err
+		}
+
+		result = append(result, file)
+	}
+
+	return result, nil
+}
+
 // Store
 // -------------------------------------------------------------------
 

tools/router/event_test.go

@@ -13,6 +13,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 	"testing"
@@ -277,6 +278,79 @@ func TestEventUnsafeRealIP(t *testing.T) {
 	}
 }
 
+func TestFindUploadedFiles(t *testing.T) {
+	scenarios := []struct {
+		filename        string
+		expectedPattern string
+	}{
+		{"ab.png", `^ab\w{10}_\w{10}\.png$`},
+		{"test", `^test_\w{10}\.txt$`},
+		{"a b c d!@$.j!@$pg", `^a_b_c_d_\w{10}\.jpg$`},
+		{strings.Repeat("a", 150), `^a{100}_\w{10}\.txt$`},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.filename, func(t *testing.T) {
+			// create multipart form file body
+			body := new(bytes.Buffer)
+			mp := multipart.NewWriter(body)
+			w, err := mp.CreateFormFile("test", s.filename)
+			if err != nil {
+				t.Fatal(err)
+			}
+			w.Write([]byte("test"))
+			mp.Close()
+			// ---
+
+			req := httptest.NewRequest(http.MethodPost, "/", body)
+			req.Header.Add("Content-Type", mp.FormDataContentType())
+
+			event := router.Event{Request: req}
+
+			result, err := event.FindUploadedFiles("test")
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if len(result) != 1 {
+				t.Fatalf("Expected 1 file, got %d", len(result))
+			}
+
+			if result[0].Size != 4 {
+				t.Fatalf("Expected the file size to be 4 bytes, got %d", result[0].Size)
+			}
+
+			pattern, err := regexp.Compile(s.expectedPattern)
+			if err != nil {
+				t.Fatalf("Invalid filename pattern %q: %v", s.expectedPattern, err)
+			}
+			if !pattern.MatchString(result[0].Name) {
+				t.Fatalf("Expected filename to match %s, got filename %s", s.expectedPattern, result[0].Name)
+			}
+		})
+	}
+}
+
+func TestFindUploadedFilesMissing(t *testing.T) {
+	body := new(bytes.Buffer)
+	mp := multipart.NewWriter(body)
+	mp.Close()
+
+	req := httptest.NewRequest(http.MethodPost, "/", body)
+	req.Header.Add("Content-Type", mp.FormDataContentType())
+
+	event := router.Event{Request: req}
+
+	result, err := event.FindUploadedFiles("test")
+	if err == nil {
+		t.Error("Expected error, got nil")
+	}
+
+	if result != nil {
+		t.Errorf("Expected result to be nil, got %v", result)
+	}
+}
+
 func TestEventSetGet(t *testing.T) {
 	event := router.Event{}