From da31e36f931236dd0dbaa83b3998787ca609fa69 Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Fri, 27 Mar 2020 10:59:31 +0300
Subject: [PATCH] api/handler/rpc: process all methods and merge url params to
 json body (#1427)

* api/handler/rpc: process all methods and merge url params to json body

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

* add merge json test

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 rpc.go      | 22 +++++++++++++++++++++-
 rpc_test.go | 17 +++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/rpc.go b/rpc.go
index 3059207..13c4207 100644
--- a/rpc.go
+++ b/rpc.go
@@ -8,6 +8,7 @@ import (
 	"strconv"
 	"strings"
 
+	jsonpatch "github.com/evanphx/json-patch/v5"
 	"github.com/joncalhoun/qson"
 	"github.com/micro/go-micro/v2/api"
 	"github.com/micro/go-micro/v2/api/handler"
@@ -273,13 +274,32 @@ func requestPayload(r *http.Request) ([]byte, error) {
 		if len(r.URL.RawQuery) > 0 {
 			return qson.ToJSON(r.URL.RawQuery)
 		}
-	case "PATCH", "POST":
+	case "PATCH", "POST", "PUT", "DELETE":
+		urlParams := []byte("{}")
+		bodyParams := []byte("{}")
+		var err error
+		if len(r.URL.RawQuery) > 0 {
+			if urlParams, err = qson.ToJSON(r.URL.RawQuery); err != nil {
+				return nil, err
+			}
+		}
+
 		buf := bufferPool.Get()
 		defer bufferPool.Put(buf)
 		if _, err := buf.ReadFrom(r.Body); err != nil {
 			return nil, err
 		}
+		if b := buf.Bytes(); len(b) > 0 {
+			bodyParams = b
+		}
+
+		if out, err := jsonpatch.MergeMergePatches(urlParams, bodyParams); err == nil {
+			return out, nil
+		}
+
+		//fallback to previous unknown behaviour
 		return buf.Bytes(), nil
+
 	}
 
 	return []byte{}, nil
diff --git a/rpc_test.go b/rpc_test.go
index ba943a4..1b602f8 100644
--- a/rpc_test.go
+++ b/rpc_test.go
@@ -27,6 +27,23 @@ func TestRequestPayloadFromRequest(t *testing.T) {
 		t.Fatal("Failed to marshal proto to JSON ", err)
 	}
 
+	jsonUrlBytes := []byte(`{"key1":"val1","key2":"val2","name":"Test"}`)
+
+	t.Run("extracting a json from a POST request with url params", func(t *testing.T) {
+		r, err := http.NewRequest("POST", "http://localhost/my/path?key1=val1&key2=val2", bytes.NewReader(jsonBytes))
+		if err != nil {
+			t.Fatalf("Failed to created http.Request: %v", err)
+		}
+
+		extByte, err := requestPayload(r)
+		if err != nil {
+			t.Fatalf("Failed to extract payload from request: %v", err)
+		}
+		if string(extByte) != string(jsonUrlBytes) {
+			t.Fatalf("Expected %v and %v to match", string(extByte), jsonUrlBytes)
+		}
+	})
+
 	t.Run("extracting a proto from a POST request", func(t *testing.T) {
 		r, err := http.NewRequest("POST", "http://localhost/my/path", bytes.NewReader(protoBytes))
 		if err != nil {