Merge pull request #4 from hookdeck/cli_text_body_fix

fix: Fix to send data in string_data in case the content-type is text/plain or x-wwww-form-urlencoded

Author: alexbouchardd

pkg/proxy/proxy.go

@@ -5,12 +5,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
 	"os/signal"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -206,7 +208,9 @@ func (p *Proxy) processAttempt(msg websocket.IncomingMessage) {
 		client := &http.Client{
 			Timeout: time.Duration(timeout) * time.Millisecond,
 		}
-		req, err := http.NewRequest(webhookEvent.Body.Request.Method, url, bytes.NewBuffer(webhookEvent.Body.Request.Data))
+		fmt.Println(bytes.NewBuffer(webhookEvent.Body.Request.Headers));
+
+		req, err := http.NewRequest(webhookEvent.Body.Request.Method, url, nil)
 		if err != nil {
 			fmt.Printf("Error: %s\n", err)
 			return
@@ -217,10 +221,26 @@ func (p *Proxy) processAttempt(msg websocket.IncomingMessage) {
 			fmt.Printf("Error: %s\n", err)
 			return
 		}
+
+		bodyIsText := false
+
 		for key, value := range x {
 			unquoted_value, _ := strconv.Unquote(string(value))
 			req.Header.Set(key, unquoted_value)
+			
+			if(strings.EqualFold(strings.ToLower(key), strings.ToLower("content-type"))) {
+				if(strings.Contains(strings.ToLower(string(value)), strings.ToLower("www-form-urlencoded")) || strings.Contains(strings.ToLower(string(value)), strings.ToLower("text/plain"))) {
+					bodyIsText = true
+				}				
+			}
 		}
+
+		if bodyIsText {
+			req.Body = ioutil.NopCloser(strings.NewReader(webhookEvent.Body.Request.DataString))
+		} else {
+			req.Body = io.NopCloser(bytes.NewBuffer(webhookEvent.Body.Request.Data))
+		}
+
 		res, err := client.Do(req)
 		if err != nil {
 			color := ansi.Color(os.Stdout)

pkg/websocket/attempt_messages.go

@@ -5,10 +5,11 @@ import (
 )
 
 type AttemptRequest struct {
-	Method  string          `json:"method"`
-	Timeout int64           `json:"timeout"`
-	Data    json.RawMessage `json:"data"`
-	Headers json.RawMessage `json:"headers"`
+	Method  		string          `json:"method"`
+	Timeout 		int64           `json:"timeout"`
+	Data    		json.RawMessage `json:"data"`
+	DataString	string      		`json:"data_string"`
+	Headers 		json.RawMessage `json:"headers"`
 }
 
 type AttemptBody struct {