Merge pull request #284 from weni-ai/fix/media-upload

fix: extract filename from URL path to avoid query params in media upload

Author: Robi9

WENI-CHANGELOG.md

@@ -1,3 +1,7 @@
+1.57.1
+----------
+ * fix: extract filename from URL path to avoid query params in media upload
+
 1.57.0
 ----------
  * refactor: Update wacOrderDetails structure to make Order field optional and adjust order handling logic for improved flexibility

handlers/facebookapp/facebookapp.go

@@ -13,7 +13,7 @@ import (
 	"net/http"
 	"net/textproto"
 	"net/url"
-	"path/filepath"
+	"path"
 	"regexp"
 	"strconv"
 	"strings"
@@ -4363,7 +4363,11 @@ func requestWACMediaUpload(file []byte, mediaURL string, requestUrl string, mime
 	writer := multipart.NewWriter(body)
 
 	fileType := http.DetectContentType(file)
-	fileName := filepath.Base(mediaURL)
+	u, err := url.Parse(mediaURL)
+	if err != nil {
+		return "", logs, errors.Wrap(err, "invalid media URL")
+	}
+	fileName := path.Base(u.Path)
 
 	if fileType != mimeType || fileType == "application/octet-stream" || fileType == "application/zip" {
 		fileType = mimetype.Detect(file).String()

handlers/facebookapp/facebookapp_test.go

@@ -1717,6 +1717,30 @@ var CachedSendTestCasesWAC = []ChannelSendTestCase{
 			},
 		},
 		SendPrep: setSendURL},
+	{Label: "Image Send with URL query params - filename should not contain params",
+		Text:   "image caption",
+		URN:    "whatsapp:250788123123",
+		Status: "W", ExternalID: "157b5e14568e8",
+		Attachments: []string{"image/jpeg:https://foo.bar/image.jpg?token=abc123&expires=9999"},
+		Responses: map[MockedRequest]MockedResponse{
+			{
+				Method:       "POST",
+				Path:         "/12345_ID/media",
+				BodyContains: `filename="image.jpg"`,
+			}: {
+				Status: 201,
+				Body:   `{"id":"157b5e14568e8"}`,
+			},
+			{
+				Method: "POST",
+				Path:   "/12345_ID/messages",
+				Body:   `{"messaging_product":"whatsapp","recipient_type":"individual","to":"250788123123","type":"image","image":{"id":"157b5e14568e8","caption":"image caption"}}`,
+			}: {
+				Status: 201,
+				Body:   `{ "messages": [{"id": "157b5e14568e8"}] }`,
+			},
+		},
+		SendPrep: setSendURL},
 }
 
 var FailingCachedSendTestCasesWAC = []ChannelSendTestCase{